Merge pull request #42 from projectM-visualizer/qt

Qt5+pulseaudio support from @deltaoscarmike

Author: revmischa

.travis.yml

@@ -4,18 +4,19 @@ before_script: ./autogen.sh
 before_install:
   - eval "${MATRIX_EVAL}"
 
+# TODO: test different combinations of flags, --enable-sdl, --enable-qt, etc
 script:
-  - ./configure --enable-sdl --prefix=$PWD/local && make -j8 && make install  # build from checkoout
-  - make dist && tar -zxf projectM-*.tar.gz && cd projectM-* && ./configure --enable-sdl --prefix=$PWD/local && make -j8 && make install  # build from dist\
+  - ./configure --enable-sdl --prefix=$PWD/local && make -j8 && make install  # build from checkout
+  - make dist && tar -zxf projectM-*.tar.gz && cd projectM-* && ./configure --enable-sdl --prefix=$PWD/dist_install && make -j8 && make install  # build from dist
   - echo "PWD $PWD"
   - ls .
   - test -e src/projectM-sdl/projectMSDL
   - test -e src/libprojectM/libprojectM.la
-  - test -e local/share/projectM/fonts/Vera.ttf
-  - test -e local/share/projectM/shaders/blur.cg
-  - test -d local/share/projectM/presets
-  - test -e local/lib/libprojectM.la
-  - test -e local/include/projectM.hpp
+  - test -e dist_install/share/projectM/fonts/Vera.ttf
+  - test -e dist_install/share/projectM/shaders/blur.cg
+  - test -d dist_install/share/projectM/presets
+  - test -e dist_install/lib/libprojectM.la
+  - test -e dist_install/include/projectM.hpp
 
 # test on GCC and Clang
 matrix:

Makefile.am

@@ -22,7 +22,7 @@ install-data-local:
 	find "$(PRESETSDIR)" -type f -exec $(INSTALL_DATA) {} $(pm_presets_dir) \;
 
 # from https://stackoverflow.com/questions/30897170/ac-subst-does-not-expand-variable answer: https://stackoverflow.com/a/30960268
-# ptomato https://stackoverflow.com/users/172999/ptomato 
+# ptomato https://stackoverflow.com/users/172999/ptomato
 
 src/libprojectM/config.inp: src/libprojectM/config.inp.in Makefile
 	$(AM_V_GEN)rm -f $@ $@.tmp && \

configure.ac

@@ -11,18 +11,6 @@ AX_CHECK_GL
 
 AC_CHECK_LIB(c, dlopen, LIBDL="", AC_CHECK_LIB(dl, dlopen, LIBDL="-ldl"))
 
-dnl SDL
-AC_ARG_ENABLE([sdl],
-  AS_HELP_STRING([--enable-sdl], [Build SDL2 app]),
-  [], [enable_sdl=no])
-AS_IF([test "x$enable_sdl" = "xyes"], [
-  m4_include([m4/sdl2.m4])
-  SDL_VERSION=2.0.5
-  AS_IF([test "$TRAVIS"], [SDL_VERSION=2.0.2])  # travis has old SDL, we don't care
-  AM_PATH_SDL2($SDL_VERSION, :, AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]))
-  AC_CONFIG_FILES([src/projectM-sdl/Makefile])
-])
-
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([
   Makefile
@@ -32,20 +20,60 @@ AC_CONFIG_FILES([
   src/libprojectM/NativePresetFactory/Makefile
   src/libprojectM/MilkdropPresetFactory/Makefile
   src/NativePresets/Makefile
+  src/projectM-sdl/Makefile
+  src/projectM-qt/Makefile
+  src/projectM-pulseaudio/Makefile
 ])
 
-dnl from https://stackoverflow.com/questions/30897170/ac-subst-does-not-expand-variable answer: https://stackoverflow.com/a/30960268
-dnl ptomato https://stackoverflow.com/users/172999/ptomato 
+dnl SDL
+AC_ARG_ENABLE([sdl],
+  AS_HELP_STRING([--enable-sdl], [Build SDL2 app]),
+  [], [enable_sdl=no])
+AS_IF([test "x$enable_sdl" = "xyes"], [
+  m4_include([m4/sdl2.m4])
+  SDL_VERSION=2.0.5
+  AS_IF([test "$TRAVIS"], [SDL_VERSION=2.0.2])  # travis has old SDL, we don't care
+  AM_PATH_SDL2($SDL_VERSION, :, AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]))
+])
 
+dnl from https://stackoverflow.com/questions/30897170/ac-subst-does-not-expand-variable answer: https://stackoverflow.com/a/30960268
+dnl ptomato https://stackoverflow.com/users/172999/ptomato
 AC_SUBST([PACKAGE])
 AC_PROG_SED
 AC_CONFIG_FILES([src/libprojectM/config.inp.in])
 
-
 AC_PREFIX_DEFAULT([/usr/local])
 
 AC_PROG_MKDIR_P
 
+dnl Qt
+AC_ARG_ENABLE([qt],
+  AS_HELP_STRING([--enable-qt], [Build Qt]),
+  [], [enable_qt=no])
+AS_IF([test "x$enable_qt" = "xyes"], [
+  PKG_CHECK_MODULES(QT, [Qt5Core, Qt5Gui, Qt5Widgets Qt5OpenGL], [], [AC_MSG_ERROR([Qt libraries are required.])])
+  qt_CPPFLAGS="`$PKG_CONFIG --cflags-only-I Qt5Core Qt5Gui Qt5Widgets Qt5OpenGL` $CPPFLAGS"
+  qt_LDFLAGS="`$PKG_CONFIG --libs-only-L Qt5Core Qt5Gui Qt5Widgets Qt5OpenGL` $LDFLAGS"
+  qt_LIBS="`$PKG_CONFIG --libs-only-l Qt5Core Qt5Gui Qt5Widgets Qt5OpenGL` $LIBS"
+
+  if ! `$PKG_CONFIG --atleast-version=5.0.0 Qt5Core`; then
+    AC_MSG_ERROR([Qt >= 5.0.0 is required. Try installing qtdeclarative5-dev])
+  fi
+
+  AC_CHECK_PROGS(MOC, [moc-qt5 moc])
+  AC_CHECK_PROGS(UIC, [uic-qt5 uic])
+  AC_CHECK_PROGS(RCC, [rcc])
+  if test -z "$MOC" || test -z "$UIC" || test -z "$RCC"; then
+    AC_MSG_ERROR([Qt utility programs moc, uic, and rcc are required.])
+  fi
+
+  PKG_CHECK_MODULES(LIBPULSE, [libpulse], [], [AC_MSG_ERROR([Pulseaudio library libpulse is required.])])
+])
+
+AM_CONDITIONAL([ENABLE_SDL], [test "$enable_sdl" = yes])
+AM_CONDITIONAL([ENABLE_QT], [test "$enable_qt" = yes])
+
+
 my_CFLAGS="-Wall -Wchar-subscripts -Wformat-security -Wmissing-declarations -Wpointer-arith -Wshadow -Wsign-compare -Wtype-limits "
 AC_SUBST([my_CFLAGS])
 
@@ -82,9 +110,12 @@ compiler:               ${CC}
 cflags:                 ${CFLAGS}
 ldflags:                ${LDFLAGS}
 
+- - -
 
 Applications:
 =====
 
+libprojectM:            yes
 SDL:                    ${enable_sdl}
+Qt & Pulseaudio:        ${enable_qt}
 ])

src/Makefile.am

@@ -1 +1,9 @@
-SUBDIRS=libprojectM projectM-sdl NativePresets
+if ENABLE_SDL
+  PROJECTM_SDL_SUBDIR = projectM-sdl
+endif
+
+if ENABLE_QT
+  PROJECTM_QT_SUBDIR = projectM-qt projectM-pulseaudio
+endif
+
+SUBDIRS=libprojectM NativePresets ${PROJECTM_SDL_SUBDIR} ${PROJECTM_QT_SUBDIR}

src/projectM-pulseaudio/Makefile.am

@@ -0,0 +1,66 @@
+SUFFIXES = .hpp .cpp _moc.cpp _qrc.qrc
+
+projectM_pulseaudio_qtheaders = \
+	QPulseAudioDeviceChooser.hpp \
+	QPulseAudioDeviceModel.hpp \
+	QPulseAudioThread.hpp
+
+nodist_projectM_pulseaudio_moc_sources = $(projectM_pulseaudio_qtheaders:.hpp=_moc.cpp)
+
+.hpp_moc.cpp:
+	@MOC@ -o$@ $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) $(MOC_CPPFLAGS)\
+	$(qt_CPPFLAGS) $(qt_LDFLAGS) $(qt_LIBS) $<
+
+ui_PulseDeviceChooserDialog.h: PulseDeviceChooserDialog.ui
+	@UIC@ -o $@ $<
+
+AM_CPPFLAGS = \
+	-include $(top_builddir)/config.h \
+	-DSYSCONFDIR=\""$(sysconfdir)"\" \
+	-DPROJECTM_PREFIX=\""${prefix}"\" \
+	-I${top_srcdir}/src/libprojectM \
+	-I${top_srcdir}/src/libprojectM/Renderer \
+	-I${top_srcdir}/src/projectM-qt \
+	${QT_CFLAGS} \
+	${LIBPULSE_CFLAGS} \
+	-fPIC
+
+AM_CFLAGS = ${my_CFLAGS} \
+	-fvisibility=hidden \
+	-ffunction-sections \
+	-fdata-sections
+
+bin_PROGRAMS = projectM-pulseaudio
+
+projectM_pulseaudio_SOURCES = \
+	qprojectM-pulseaudio.cpp \
+	QPulseAudioDeviceChooser.cpp \
+	QPulseAudioDeviceModel.cpp \
+	QPulseAudioThread.cpp \
+	PulseDeviceChooserDialog.ui \
+	$(projectM_pulseaudio_qtheaders)
+
+nodist_projectM_pulseaudio_SOURCES = \
+	$(nodist_projectM_pulseaudio_moc_sources)
+
+projectM_pulseaudio_LDADD = \
+	${QT_LIBS} \
+	${LIBPULSE_LIBS} \
+	${top_srcdir}/src/projectM-qt/libprojectM_qt.a \
+	${top_srcdir}/src/libprojectM/libprojectM.la
+
+projectM_pulseaudio_LDFLAGS = -static
+
+projectM_pulseaudio_PROGRAM = projectM-pulseaudio
+
+BUILT_SOURCES =               \
+    ui_PulseDeviceChooserDialog.h
+
+CLEANFILES = \
+	${BUILT_SOURCES} \
+	${nodist_projectM_pulseaudio_moc_sources}
+
+desktopdir = $(datadir)/applications
+dist_desktop_DATA = projectM-pulseaudio.desktop
+
+dist_man_MANS = projectM-pulseaudio.1

src/projectM-qt/Makefile.am

@@ -0,0 +1,77 @@
+SUFFIXES = .hpp .cpp _moc.cpp _qrc.qrc
+
+projectM_qt_qtheaders = qprojectm_mainwindow.hpp \
+	qpresetfiledialog.hpp \
+	qplaylistfiledialog.hpp \
+	qplaylistmodel.hpp \
+	qprojectmconfigdialog.hpp \
+	qplaylisttableview.hpp \
+	qpresettextedit.hpp \
+	qpreseteditordialog.hpp \
+	qprojectm.hpp \
+	qprojectmwidget.hpp
+
+nodist_projectM_qt_moc_sources = $(projectM_qt_qtheaders:.hpp=_moc.cpp)
+
+.hpp_moc.cpp:
+	@MOC@ -o$@ $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) $(MOC_CPPFLAGS)\
+	$(qt_CPPFLAGS) $(qt_LDFLAGS) $(qt_LIBS) $<
+
+ui_qprojectm_mainwindow.h: qprojectm_mainwindow.ui
+	@UIC@ -o $@ $<
+
+ui_qpreseteditordialog.h: qpreseteditordialog.ui
+	@UIC@ -o $@ $<
+
+ui_qprojectmconfigdialog.h: qprojectmconfigdialog.ui
+	@UIC@ -o $@ $<
+
+application_qrc.cpp: application.qrc
+	@RCC@ -o $@ $<
+
+
+BUILT_SOURCES =               \
+    ui_qprojectm_mainwindow.h \
+    ui_qpreseteditordialog.h \
+    ui_qprojectmconfigdialog.h
+
+noinst_LIBRARIES = libprojectM_qt.a
+
+libprojectM_qt_a_SOURCES = \
+	qprojectm_mainwindow.cpp \
+	configfile.hpp configfile.cpp \
+	qplaylistfiledialog.cpp \
+	qplaylistmodel.cpp \
+	qprojectmconfigdialog.cpp \
+	qpresettextedit.cpp \
+	qpreseteditordialog.cpp \
+	qprojectm_mainwindow.ui \
+	qpreseteditordialog.ui \
+	qprojectmconfigdialog.ui \
+	$(projectM_qt_qtheaders) \
+	qxmlplaylisthandler.hpp \
+	nullable.hpp \
+	application.qrc \
+	images/*
+
+nodist_libprojectM_qt_a_SOURCES = \
+	application_qrc.cpp \
+	$(nodist_projectM_qt_moc_sources)
+
+AM_CPPFLAGS = \
+	-include $(top_builddir)/config.h \
+	-DSYSCONFDIR=\""$(sysconfdir)"\" \
+	-I${top_srcdir}/src/libprojectM \
+	-I${top_srcdir}/src/libprojectM/Renderer \
+	${QT_CFLAGS} \
+	-fPIC
+
+AM_CFLAGS = ${my_CFLAGS} \
+	-fvisibility=hidden \
+	-ffunction-sections \
+	-fdata-sections
+
+CLEANFILES = \
+	application_qrc.cpp \
+	${BUILT_SOURCES} \
+	${nodist_projectM_qt_moc_sources}

src/projectM-qt/libprojectM-qt.pc.in

@@ -38,6 +38,8 @@
 #include "nullable.hpp"
 #include "qprojectmwidget.hpp"
 
+extern int qInitResources();
+
 class PlaylistWriteFunctor {
 	public:
 		PlaylistWriteFunctor(const QVector<QProjectM_MainWindow::PlaylistItemMetaData*>::iterator & begin,
@@ -77,7 +79,7 @@ QProjectM_MainWindow::QProjectM_MainWindow ( const std::string & config_file, QM
 		configDialog(0), hHeader(0), vHeader(0), _menuVisible(true), _menuAndStatusBarsVisible(true),
 activePresetIndex(new Nullable<long>), playlistItemCounter(0), m_QPresetEditorDialog(0)
 {
-
+	qInitResources();
 
 	ui = new Ui::QProjectM_MainWindow();
 	ui->setupUi ( this );