Reorganized source tree and fixed some code to make the frontend compile again.

Author: kblaschke

Diff for: CMakeLists.txt

@@ -0,0 +1,33 @@
+# First try to use PKG_CONFIG to find JACK.
+find_package(PkgConfig QUIET)
+if(PKG_CONFIG_FOUND)
+    pkg_check_modules(JACK jack QUIET)
+endif()
+
+if(NOT JACK_INCLUDEDIR OR NOT JACK_LIBRARIES)
+    find_path(JACK_INCLUDEDIR
+            jack/jack.h
+            )
+
+    find_library(JACK_LIBRARIES
+            jack
+            )
+endif()
+
+include(FindPackageHandleStandardArgs)
+
+find_package_handle_standard_args(JACK
+        REQUIRED_VARS JACK_LIBRARIES JACK_INCLUDEDIR
+        VERSION_VAR JACK_VERSION
+        )
+
+if(JACK_FOUND AND NOT TARGET JACK::JACK)
+    add_library(JACK::JACK INTERFACE IMPORTED)
+
+    set_target_properties(JACK::JACK PROPERTIES
+            INTERFACE_LINK_LIBRARIES "${JACK_LIBRARIES}"
+            INTERFACE_LINK_DIRECTORIES "${JACK_LIBRARY_DIRS}"
+            INTERFACE_INCLUDE_DIRECTORIES "${JACK_INCLUDEDIR}"
+            INTERFACE_COMPILE_OPTIONS "${JACK_CFLAGS}"
+            )
+endif()

Diff for: cmake/FindJACK.cmake

@@ -0,0 +1,44 @@
+# First try to use PKG_CONFIG to find Pulseaudio.
+find_package(PkgConfig QUIET)
+if(PKG_CONFIG_FOUND)
+    pkg_check_modules(PULSEAUDIO libpulse QUIET)
+endif()
+
+if(NOT PULSEAUDIO_INCLUDEDIR OR NOT PULSEAUDIO_LIBRARIES)
+    find_path(PULSEAUDIO_INCLUDEDIR
+            pulse/pulseaudio.h
+            )
+
+    find_library(PULSEAUDIO_LIBRARIES
+            pulse
+            )
+
+    if(PULSEAUDIO_INCLUDEDIR AND EXISTS "${PULSEAUDIO_INCLUDEDIR}/pulse/version.h")
+        file(STRINGS "${PULSEAUDIO_INCLUDEDIR}/pulse/version.h" pulseaudio_version_str
+                REGEX "pa_get_headers_version\(\)"
+                )
+        if(pulseaudio_version_str AND "${pulseaudio_version_str}" MATCHES "\\(\"([0-9.]+)\"\\)")
+            set(PULSEAUDIO_VERSION "${CMAKE_MATCH_1}")
+        endif()
+    endif()
+
+    set(PULSEAUDIO_CFLAGS "-D_REENTRANT")
+endif()
+
+include(FindPackageHandleStandardArgs)
+
+find_package_handle_standard_args(Pulseaudio
+        REQUIRED_VARS PULSEAUDIO_LIBRARIES PULSEAUDIO_INCLUDEDIR
+        VERSION_VAR PULSEAUDIO_VERSION
+        )
+
+if(Pulseaudio_FOUND AND NOT TARGET Pulseaudio::Pulseaudio)
+    add_library(Pulseaudio::Pulseaudio INTERFACE IMPORTED)
+
+    set_target_properties(Pulseaudio::Pulseaudio PROPERTIES
+            INTERFACE_LINK_LIBRARIES "${PULSEAUDIO_LIBRARIES}"
+            INTERFACE_LINK_DIRECTORIES "${PULSEAUDIO_LIBRARY_DIRS}"
+            INTERFACE_INCLUDE_DIRECTORIES "${PULSEAUDIO_INCLUDEDIR}"
+            INTERFACE_COMPILE_OPTIONS "${PULSEAUDIO_CFLAGS}"
+            )
+endif()

Diff for: cmake/FindPulseaudio.cmake

@@ -0,0 +1,3 @@
+add_subdirectory(common)
+add_subdirectory(ui-jack)
+add_subdirectory(ui-pulseaudio)

Diff for: src/CMakeLists.txt

@@ -1,13 +1,4 @@
-if(NOT ENABLE_QT)
-    return()
-endif()
-
-# Automatically create .moc files and run the UIC and resource compilers
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
-
-add_library(projectM-qt STATIC
+add_library(projectM-Qt-Common STATIC
         application.qrc
         configfile.cpp
         configfile.hpp
@@ -34,19 +25,19 @@ add_library(projectM-qt STATIC
         qxmlplaylisthandler.hpp
         )
 
-set_target_properties(projectM-qt PROPERTIES
+set_target_properties(projectM-Qt-Common PROPERTIES
         C_VISIBILITY_PRESET default
         CXX_VISIBILITY_PRESET default
         VISIBILITY_INLINES_HIDDEN OFF
         )
 
-target_include_directories(projectM-qt
+target_include_directories(projectM-Qt-Common
         PUBLIC
         "${CMAKE_CURRENT_SOURCE_DIR}"
         )
 
-target_link_libraries(projectM-qt
+target_link_libraries(projectM-Qt-Common
         PUBLIC
-        projectM::libprojectM
+        libprojectM::$<IF:$<BOOL:ENABLE_SHARED_LINKING>,shared,static>
         ${QT_LINK_TARGETS}
         )

Diff for: src/projectM-qt/.gitignore renamed to src/common/.gitignore

@@ -19,7 +19,7 @@
  *
  */
 
-#include "projectM.h"
+#include <libprojectM/projectM.h>
 
 #include <QIcon>
 #include <QXmlStreamReader>

Diff for: src/projectM-qt/CMakeLists.txt renamed to src/common/CMakeLists.txt

@@ -26,7 +26,6 @@
 #include <QAbstractTableModel>
 #include <QVector>
 
-#include <projectM.hpp>
 #include <QStringList>
 #include <QtDebug>
 

Diff for: src/projectM-jack/COPYING renamed to src/common/COPYING

@@ -28,7 +28,6 @@
 #include <QMainWindow>
 #include <QCloseEvent>
 #include <cassert>
-#include <projectM.hpp>
 
 #include <iostream>
 #include <QFileDialog>

Diff for: src/projectM-qt/ReadMe renamed to src/common/ReadMe

@@ -22,7 +22,7 @@
 #ifndef QPROJECTM_HPP
 #define QPROJECTM_HPP
 
-#include "projectM.h"
+#include <libprojectM/projectM.h>
 
 #include <QObject>
 #include <QString>
@@ -34,7 +34,7 @@ Q_OBJECT
 
 public:
     explicit QProjectM(const QString& config_file)
-        : _projectM(projectm_create(config_file.toLocal8Bit().data(), projectM::FLAG_DISABLE_PLAYLIST_LOAD))
+        : _projectM(projectm_create(config_file.toLocal8Bit().data(), projectm_flags::PROJECTM_FLAG_DISABLE_PLAYLIST_LOAD))
     {
         projectm_set_preset_switched_event_callback(_projectM, &QProjectM::presetSwitchedEvent, this);
         projectm_set_preset_switch_failed_event_callback(_projectM, &QProjectM::presetSwitchFailedEvent, this);

Diff for: src/projectM-qt/application.qrc renamed to src/common/application.qrc

@@ -19,24 +19,25 @@
  *
  */
 
-#include <QtWidgets>
-#include "qprojectm_mainwindow.hpp"
-#include "qpresetfiledialog.hpp"
+#include "configfile.hpp"
+#include "nullable.hpp"
 #include "qplaylistfiledialog.hpp"
-#include <QTextStream>
-#include <QCloseEvent>
-#include <QFileDialog>
-
 #include "qplaylistmodel.hpp"
+#include "qpreseteditordialog.hpp"
+#include "qpresetfiledialog.hpp"
 #include "qpresettextedit.hpp"
-#include "ui_qprojectm_mainwindow.h"
+#include "qprojectm_mainwindow.hpp"
 #include "qprojectmconfigdialog.hpp"
-#include "qpreseteditordialog.hpp"
-#include "ui_qpreseteditordialog.h"
-#include "configfile.hpp"
-#include "qxmlplaylisthandler.hpp"
-#include "nullable.hpp"
 #include "qprojectmwidget.hpp"
+#include "qxmlplaylisthandler.hpp"
+#include "ui_qpreseteditordialog.h"
+#include "ui_qprojectm_mainwindow.h"
+
+#include <QtWidgets>
+#include <QTextStream>
+#include <QCloseEvent>
+#include <QFileDialog>
+
 
 class PlaylistWriteFunctor {
 	public:
@@ -1290,7 +1291,7 @@ void QProjectM_MainWindow::updateFilteredPlaylist ( const QString & text )
 }
 
 
-void QProjectM_MainWindow::presetRatingChanged( unsigned int index, int rating, PresetRatingType ratingType)
+void QProjectM_MainWindow::presetRatingChanged( unsigned int index, int rating, projectm_preset_rating_type ratingType)
 {
 	Q_UNUSED(ratingType);
 

Diff for: src/projectM-qt/configfile.cpp renamed to src/common/configfile.cpp

@@ -23,6 +23,8 @@
 #define QPROJECTM_MAINWINDOW_H
 #define CONFIG_FILE "/share/projectM/config.inp"
 
+#include <libprojectM/projectM.h>
+
 #include <QMainWindow>
 #include <QCloseEvent>
 #include <cassert>
@@ -31,9 +33,8 @@
 #include <QtDebug>
 #include <QMutex>
 
-#include "projectM.hpp"
-
 #include <QModelIndexList>
+
 class QHeaderView;
 class QAction;
 class QMenu;
@@ -118,7 +119,7 @@ class QProjectM_MainWindow:public QMainWindow
 
 private slots:
 void dockLocationChanged(Qt::DockWidgetArea area);
-void presetRatingChanged(unsigned int, int, PresetRatingType);
+void presetRatingChanged(unsigned int, int, projectm_preset_rating_type);
 void handleFailedPresetSwitch(const bool isHardCut, const unsigned int index,
 		const QString & message);