Install qt5 soundsources to a different folder to avoid crashes, fixe…

…s lp1774639
mixxxdj · Jun 1, 2018 · a489e77 · a489e77
1 parent 7586b02
commit a489e77
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 9 deletions.
diff --git a/src/SConscript b/src/SConscript
@@ -378,9 +378,14 @@ if build.platform_is_linux or build.platform_is_bsd:
                         os.path.join(unix_lib_path, 'mixxx', 'plugins', 'vamp'),
                         libmixxxminimal_vamp_plugin)
 
-                soundsource_plugins = env.Install(
-                        os.path.join(unix_lib_path, 'mixxx', 'plugins', 'soundsource'),
-                        soundsource_plugin_files)
+                if qt5:
+                    soundsource_plugins = env.Install(
+                            os.path.join(unix_lib_path, 'mixxx', 'plugins', 'soundsourceqt5'),
+                            soundsource_plugin_files)
+                else: 
+                    soundsource_plugins = env.Install(
+                            os.path.join(unix_lib_path, 'mixxx', 'plugins', 'soundsource'),
+                            soundsource_plugin_files)           
                 controllermappings = env.Install(os.path.join(unix_share_path, 'mixxx', 'controllers'), controllermappings_files)
                 translations = env.Install(os.path.join(unix_share_path, 'mixxx', 'translations'), translation_files)
                 keyboardmappings = env.Install(os.path.join(unix_share_path, 'mixxx', 'keyboard'), keyboardmappings_files)
@@ -554,8 +559,12 @@ if build.platform_is_windows:
         docs = env.Install(os.path.join(base_dist_dir, "doc/"), docs_files)
         #icon = env.Install(base_dist_dir+"", icon_files)
         dlls = env.Install(base_dist_dir+"/", dll_files)
-        soundsource_plugins = env.Install(os.path.join(base_dist_dir, "plugins", "soundsource/"),
-                                          soundsource_plugin_files)
+        if qt5:
+            soundsource_plugins = env.Install(os.path.join(base_dist_dir, "plugins", "soundsourceqt5/"),
+                                              soundsource_plugin_files)
+        else:
+            soundsource_plugins = env.Install(os.path.join(base_dist_dir, "plugins", "soundsource/"),
+                                              soundsource_plugin_files)
         vamp_plugins = env.Install(os.path.join(base_dist_dir, "plugins", "vamp/"),
                                    libmixxxminimal_vamp_plugin)
         binary = env.Install(base_dist_dir+"/", binary_files)

diff --git a/src/sources/soundsourceproxy.cpp b/src/sources/soundsourceproxy.cpp
@@ -51,6 +51,13 @@ const QStringList SOUND_SOURCE_PLUGIN_FILENAME_PATTERN; // empty
 #endif
 
 QList<QDir> getSoundSourcePluginDirectories() {
+
+    #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+        QString soundsourceDir = "soundsourceqt5";
+    #else
+        QString soundsourceDir = "soundsource";
+    #endif
+
     QList<QDir> pluginDirs;
 
     const QString& pluginPath = CmdlineArgs::Instance().getPluginPath();
@@ -68,12 +75,12 @@ QList<QDir> getSoundSourcePluginDirectories() {
     // 'bin' folder of $PREFIX, so we just traverse
     // ../lib/mixxx/plugins/soundsource.
     QDir libPluginDir(UNIX_LIB_PATH);
-    if (libPluginDir.cd("plugins") && libPluginDir.cd("soundsource")) {
+    if (libPluginDir.cd("plugins") && libPluginDir.cd(soundsourceDir)) {
         pluginDirs << libPluginDir;
     }
 
     QDir dataPluginDir(dataLocation);
-    if (dataPluginDir.cd("plugins") && dataPluginDir.cd("soundsource")) {
+    if (dataPluginDir.cd("plugins") && dataPluginDir.cd(soundsourceDir)) {
         pluginDirs << dataPluginDir;
     }
 
@@ -88,7 +95,7 @@ QList<QDir> getSoundSourcePluginDirectories() {
     }
 #elif __WINDOWS__
     QDir appPluginDir(applicationPath);
-    if (appPluginDir.cd("plugins") && appPluginDir.cd("soundsource")) {
+    if (appPluginDir.cd("plugins") && appPluginDir.cd(soundsourceDir)) {
         pluginDirs << appPluginDir;
     }
 #elif __APPLE__
@@ -112,7 +119,7 @@ QList<QDir> getSoundSourcePluginDirectories() {
     }
 
     QDir dataPluginDir(dataLocation);
-    if (dataPluginDir.cd("Plugins") && dataPluginDir.cd("soundsource")) {
+    if (dataPluginDir.cd("Plugins") && dataPluginDir.cd(soundsourceDir)) {
         pluginDirs << dataPluginDir;
     }
 #endif