Replace everything with new "slxmix" (work in progress)

1 files changed, 21 insertions, 45 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7e4effe..d7ff79a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,67 +1,43 @@
-include_directories(
-    ${PULSE_INCLUDE_DIRS}
-    ${GLIB_INCLUDE_DIRS}
-)
+#include_directories(
+#    ${PULSE_INCLUDE_DIRS}
+#    ${GLIB_INCLUDE_DIRS}
+#)
+
+add_subdirectory(PulseAudioQt)
+
+find_package(Qt5Widgets ${QT_MINIMUM_VERSION} REQUIRED)
+find_package(Qt5Core ${QT_MINIMUM_VERSION} REQUIRED)
+#find_package(Qt5LinguistTools ${QT_MINIMUM_VERSION} REQUIRED)
 
 set(pavucontrol-qt_HDRS
-    pavucontrol.h
+    main.h
     mainwindow.h
-    cardwidget.h
-    channel.h
-    devicewidget.h
-    minimalstreamwidget.h
-    rolewidget.h
-    sinkinputwidget.h
-    sinkwidget.h
-    sourceoutputwidget.h
-    sourcewidget.h
-    streamwidget.h
-    elidinglabel.h
-    helper.h
+    slxoutput.h
 )
 
 set(pavucontrol-qt_SRCS
-    pavucontrol.cc
-    mainwindow.cc
-    cardwidget.cc
-    channel.cc
-    devicewidget.cc
-    minimalstreamwidget.cc
-    rolewidget.cc
-    sinkinputwidget.cc
-    sinkwidget.cc
-    sourceoutputwidget.cc
-    sourcewidget.cc
-    streamwidget.cc
-    elidinglabel.cc
-    helper.cc
+    main.cpp
+    mainwindow.cpp
+    slxoutput.cpp
 )
 
 set(pavucontrol-qt_UI
-    cardwidget.ui
-    devicewidget.ui
     mainwindow.ui
-    streamwidget.ui
+    slxoutput.ui
 )
 
-# Translations
+qt5_add_resources(pavucontrol-qt_RCS resources.qrc)
 
 add_executable(pavucontrol-qt
     ${pavucontrol-qt_SRCS}
-    ${pavucontrol-qt_QM_FILES}
-    ${pavucontrol-qt_QM_LOADER}
-    ${DESKTOP_FILES}
-)
-set_property(
-     TARGET pavucontrol-qt APPEND
-     PROPERTY COMPILE_DEFINITIONS
-     PAVUCONTROL_QT_DATA_DIR="${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}"
+    ${pavucontrol-qt_RCS}
 )
 
+#    ${PULSE_LDFLAGS}
+#    ${GLIB_LDFLAGS}
 target_link_libraries(pavucontrol-qt
     Qt5::Widgets
-    ${PULSE_LDFLAGS}
-    ${GLIB_LDFLAGS}
+    KF5PulseAudioQt
 )
 
 install(TARGETS