Skip to content

Commit

Permalink
MSVC: Fix Xpressive instrument
Browse files Browse the repository at this point in the history
  • Loading branch information
lukas-w committed Jul 28, 2018
1 parent d4f4500 commit 1c5e374
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 16 deletions.
1 change: 0 additions & 1 deletion plugins/CMakeLists.txt
Expand Up @@ -93,7 +93,6 @@ IF(MSVC)
LadspaEffect
sid
#VstEffect
Xpressive
zynaddsubfx
)
message(WARNING "Compiling with MSVC. The following plugins are not available: ${MSVC_INCOMPATIBLE_PLUGINS}")
Expand Down
2 changes: 2 additions & 0 deletions plugins/Xpressive/CMakeLists.txt
Expand Up @@ -12,6 +12,8 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WERROR_FLAGS} -fexceptions")

IF(LMMS_BUILD_WIN32 AND NOT MSVC)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wa,-mbig-obj -Dexprtk_disable_enhanced_features")
ELSEIF(LMMS_BUILD_WIN32 AND MSVC)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
ENDIF()

BUILD_PLUGIN(xpressive
Expand Down
7 changes: 0 additions & 7 deletions plugins/Xpressive/Xpressive.cpp
Expand Up @@ -807,8 +807,6 @@ void XpressiveView::usrWaveClicked() {
Engine::getSong()->setModified();
}

XpressiveHelpView* XpressiveHelpView::s_instance=0;

QString XpressiveHelpView::s_helpText=
"<b>O1, O2</b> - Two output waves. Panning is controled by PN1 and PN2.<br>"
"<b>W1, W2, W3</b> - Wave samples evaluated by expression. In these samples, t variable ranges [0,1).<br>"
Expand Down Expand Up @@ -876,11 +874,6 @@ void XpressiveView::helpClicked() {

}

__attribute__((destructor)) static void module_destroy()
{
XpressiveHelpView::finalize();
}

extern "C" {

// necessary for getting instance out of shared lib
Expand Down
10 changes: 2 additions & 8 deletions plugins/Xpressive/Xpressive.h
Expand Up @@ -206,22 +206,16 @@ class XpressiveHelpView: public QTextEdit
public:
static XpressiveHelpView* getInstance()
{
if (!s_instance)
{
s_instance = new XpressiveHelpView();
}
return s_instance;
static XpressiveHelpView instance;
return &instance;
}
static void finalize()
{
if (s_instance) { delete s_instance; }
}

private:
XpressiveHelpView();
static XpressiveHelpView *s_instance;
static QString s_helpText;

};

#endif

0 comments on commit 1c5e374

Please sign in to comment.