summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaromil <jaromil@dyne.org>2011-03-28 16:52:34 (GMT)
committer Jaromil <jaromil@dyne.org>2011-03-28 16:52:34 (GMT)
commit5fab722dc38accfc3ca9e74fc293194246ce4d15 (patch)
tree55058bb5efba8065a5d693cfdfd88f472d9b5b87
parent4cac1689a0133dca3e83083c1b7a972a56ccfdad (diff)
parent6b3b97f9ba8e7edbe99221e7c390f1bd9e6ec067 (diff)
Merge branch 'master' into sound
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac27
-rw-r--r--qt/Makefile.am55
-rw-r--r--qt/QqWidget.cpp2
-rw-r--r--qt/main.cpp2
-rw-r--r--qt/qOpacity.cpp4
-rw-r--r--qt/qfreej.cpp4
-rw-r--r--qt/specialeventget.cpp2
-rw-r--r--qt/ui_qfreej.ui (renamed from qt/qfreej.ui)0
-rw-r--r--scripts/python/gtkgui/main.py2
10 files changed, 92 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am
index 3aaa5a5..4b2f01e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,7 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-ruby --enable-python
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = freej.pc
-SUBDIRS = lib src qt doc bindings scripts tests
+SUBDIRS = lib src doc bindings scripts tests $(EXTRA_DIRS)
ACLOCAL_AMFLAGS = -I m4
diff --git a/configure.ac b/configure.ac
index 25ab602..2833885 100644
--- a/configure.ac
+++ b/configure.ac
@@ -765,6 +765,17 @@ AC_DEFINE(WITH_JAVASCRIPT,1,[Define if using libmozjs for spidermonkey javascrip
AM_CONDITIONAL([BUILD_JAVASCRIPT], [test x$have_mozjs = xno])
+dnl ==============================================================
+dnl QT lib
+dnl ==============================================================
+AC_ARG_ENABLE(qt-gui,
+ AS_HELP_STRING([--enable-qt-gui],[build our Qt graphical user interface]),
+[
+ PKG_CHECK_MODULES(QTGUI,QtGui, have_qtgui=yes, have_qtgui=no)
+ if test x$have_qtgui = xyes; then
+ AC_DEFINE(WITH_QTGUI,1,[Define if to link QtGui and build])
+ QTGUI_DIRS=qt
+ fi ])
dnl ==============================================================
dnl unicap lib
@@ -948,6 +959,9 @@ AC_SUBST(CFLAGS)
CXXFLAGS="$GLOBAL_CFLAGS $CXXFLAGS"
AC_SUBST(CXXFLAGS)
+EXTRA_DIRS="$QTGUI_DIRS"
+AC_SUBST([EXTRA_DIRS])
+
dnl ==============================================================
dnl freej specific flags, explanation:
dnl STATIC_CFLAGS cflags regarding static libraries from lib/
@@ -972,6 +986,7 @@ FREEJ_CFLAGS="\$(FREEJ_STATIC_CFLAGS) \
\$(LIBLO_CFLAGS) \
\$(MOZJS_CFLAGS) \
\$(OPENCV_CFLAGS) \
+ \$(QTGUI_CFLAGS) \
\$(SDL_CFLAGS) \
\$(SDLGFX_CFLAGS) \
\$(SDLIMAGE_CFLAGS) \
@@ -1003,6 +1018,7 @@ FREEJ_LIBS="-lpthread -lm -lrt $DL_LIBS \
\$(LIBLO_LIBS) \
\$(MOZJS_LIBS) \
\$(OPENCV_LIBS) \
+ \$(QTGUI_LIBS) \
\$(SAMPLERATE_LIBS) \
\$(SDLGFX_LIBS) \
\$(SDLIMAGE_LIBS) \
@@ -1050,6 +1066,7 @@ lib/javascript/GNUmakefile
scripts/Makefile
src/Makefile
src/include/Makefile
+qt/Makefile
tests/Makefile
])
AC_OUTPUT
@@ -1214,6 +1231,16 @@ else
INFO(no)
fi
+INFO_N([= Qt GUI : ])
+if test x$have_qtgui = xyes; then
+ INFO(yes)
+VRB([ LIBS : $QTGUI_LIBS])
+VRB([ CFLAGS: $QTGUI_CFLAGS])
+else
+ INFO(no)
+fi
+
+
INFO_N([= unicap library : ])
if test x$have_unicap = xyes; then
INFO(yes)
diff --git a/qt/Makefile.am b/qt/Makefile.am
new file mode 100644
index 0000000..8b92c88
--- /dev/null
+++ b/qt/Makefile.am
@@ -0,0 +1,55 @@
+AM_CXXFLAGS = -I$(top_srcdir)/src/include $(SDL_CFLAGS) \
+ $(QTGUI_CFLAGS) -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED \
+ -DPREFIX="\"$(prefix)\"" -DDATADIR="\"$(datadir)\""
+
+ui_%.h: %.ui
+ uic -o $@ $<
+ui_%.cpp: %.ui
+ uic -o $@ -impl $*.h $<
+# This rule lets GNU make create any moc_*.cpp from the equivalent *.h
+# You have one .h file, it's called myapp.h. Therefore, here I list
+# its mocced name, moc_myapp.cpp.
+moc_%.cpp: %.h
+ moc $< -o $@
+
+ui_qfreej.h:
+ uic -o $(top_srcdir)/qt/ui_qfreej.h $(top_srcdir)/qt/ui_qfreej.ui
+
+
+BUILT_SOURCES = ui_qfreej.h \
+ moc_qfreej.cpp \
+ moc_QqComboBlit.cpp \
+ moc_QqWidget.cpp \
+ moc_QqComboFilter.cpp \
+ moc_QqFiltersApplied.cpp \
+ moc_QqTabWidget.cpp \
+ moc_Sound.cpp \
+ moc_qJackClient.cpp \
+ moc_qOpacity.cpp \
+ moc_qEncoder.cpp
+
+
+SOURCES = main.cpp \
+ qfreej.cpp \
+ QqComboBlit.cpp \
+ QqWidget.cpp \
+ QqComboFilter.cpp \
+ QqFiltersApplied.cpp \
+ specialeventget.cpp \
+ FakeWindow.cpp \
+ QqTabWidget.cpp \
+ Sound.cpp \
+ qJackClient.cpp \
+ qOpacity.cpp \
+ qEncoder.cpp \
+ $(BUILT_SOURCES)
+
+
+bin_PROGRAMS = qfreej
+qfreej_SOURCES = $(SOURCES)
+qfreej_LDADD = $(top_builddir)/src/libfreej.la $(SDL_LIBS) $(QTGUI_LIBS)
+
+clean:
+ rm -f qfreej *.o
+ rm -f moc_*.cpp moc_*.h
+ rm -f ui_*.h \ No newline at end of file
diff --git a/qt/QqWidget.cpp b/qt/QqWidget.cpp
index cc3a8bc..c346d87 100644
--- a/qt/QqWidget.cpp
+++ b/qt/QqWidget.cpp
@@ -22,7 +22,7 @@
#include <iostream>
#include <QTabWidget>
#include <QMessageBox>
-#include "qfreej.h"
+#include <qfreej.h>
#include <QqComboBlit.h>
#include <QqComboFilter.h>
#include <QDebug>
diff --git a/qt/main.cpp b/qt/main.cpp
index 19ea53a..7d70247 100644
--- a/qt/main.cpp
+++ b/qt/main.cpp
@@ -18,7 +18,7 @@
#include <QtGui/QApplication>
-#include "qfreej.h"
+#include <qfreej.h>
QSize viewSize;
diff --git a/qt/qOpacity.cpp b/qt/qOpacity.cpp
index 8bc986a..91e3b37 100644
--- a/qt/qOpacity.cpp
+++ b/qt/qOpacity.cpp
@@ -1,4 +1,4 @@
-#include "qOpacity.h"
+#include <qOpacity.h>
QOpacity::QOpacity(Qfreej *qfreej) : QWidget()
{
@@ -27,4 +27,4 @@ void QOpacity::changeOpacity(int val)
m_opacity = (double)val / 100.0;
if (m_QfreejPtr)
m_QfreejPtr->setWindowOpacity(m_opacity);
-} \ No newline at end of file
+}
diff --git a/qt/qfreej.cpp b/qt/qfreej.cpp
index 0275142..a92de91 100644
--- a/qt/qfreej.cpp
+++ b/qt/qfreej.cpp
@@ -18,8 +18,8 @@
-#include "qfreej.h"
-#include "ui_qfreej.h"
+#include <qfreej.h>
+#include <ui_qfreej.h>
#include <QFileDialog>
#include <QMessageBox>
#include <QTextEdit>
diff --git a/qt/specialeventget.cpp b/qt/specialeventget.cpp
index 876751f..7a2dcdf 100644
--- a/qt/specialeventget.cpp
+++ b/qt/specialeventget.cpp
@@ -17,7 +17,7 @@
*/
-#include "specialeventget.h"
+#include <specialeventget.h>
#include <QMouseEvent>
#include <QDebug>
#include <QWidget>
diff --git a/qt/qfreej.ui b/qt/ui_qfreej.ui
index f9478bc..f9478bc 100644
--- a/qt/qfreej.ui
+++ b/qt/ui_qfreej.ui
diff --git a/scripts/python/gtkgui/main.py b/scripts/python/gtkgui/main.py
index a2a2a0d..49e505e 100644
--- a/scripts/python/gtkgui/main.py
+++ b/scripts/python/gtkgui/main.py
@@ -79,6 +79,8 @@ class MyConsole(freej.ConsoleController):
def refresh(self, msg):
print " X*", msg
+ def old_printlog(self, msg):
+ self.advance(self.infoicon, msg)
# -----------------------------------------------------