Split miav server and client apart. Port client to Qt4. Replace libraw1994 with libiec61883. Add unit tests for multiplexer and fix some bugs in it.

1 files changed, 40 insertions, 18 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 3ccf9d2..ef5b746 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,16 +1,22 @@
-AM_CXXFLAGS := $(CXXFLAGS) $(EXTRA_CXXFLAGS) -I../include $(QT_CXXFLAGS) \
-	-DQT_THREAD_SUPPORT \
-	-DPIXMAPS=\"$(datadir)/pixmaps\" \
+SUBDIRS = icons
+DISTDIRS = icons
+
+bin_PROGRAMS = miav miavd
+
+# This is needed for XXXX.moc.o compilation
+AM_CXXFLAGS = $(QT_CFLAGS)
+
+miav_CXXFLAGS = $(SDL_CFLAGS) $(DV_CFLAGS) $(IEC61883_CFLAGS) $(QT_CFLAGS) \
+	-I../include -DPIXMAPS=\"$(datadir)/pixmaps\" \
 	-DETC=\"$(prefix)/etc/miav\"
 
-bin_PROGRAMS = miav
+miav_LDADD = $(shell ../tools/MocList o) $(QT_LIBS) $(IEC61883_LIBS) \
+	$(SDL_LIBS) $(DV_LIBS)
 
-miav_SOURCES = $(shell  if [ $QT_CXXFLAGS ] ; then ../tools/MocList cc; fi ) \
+miav_SOURCES = \
 	aboutwindow.cc \
-	audio_encoder.cc \
 	camera.cc \
 	cprquerydialog.cc \
-	daemon.cc \
 	decoder.cc \
 	dv1394.cc \
 	dvfile.cc \
@@ -18,18 +24,39 @@ miav_SOURCES = $(shell  if [ $QT_CXXFLAGS ] ; then ../tools/MocList cc; fi ) \
 	file.cc \
 	frame.cc \
 	historywidget.cc \
+	info.cc \
+	info_gui.cc \
+	mainwindow.cc \
+	messagebox.cc \
+	miav.cc \
+	miav_config.cc \
+	network.cc \
+	player.cc \
+	socket.cc \
+	thread.cc \
+	util.cc \
+	videowidget.cc \
+	yuv_draw.cc
+
+miavd_CXXFLAGS = $(JPEG_CFLAGS) $(FAME_CFLAGS) $(LAME_CFLAGS) $(DV_CFLAGS) \
+	 $(PTHREAD_CFLAGS) -I../include -DETC=\"$(prefix)/etc/miav\"
+
+miavd_LDADD = $(JPEG_LIBS) $(FAME_LIBS) $(LAME_LIBS) $(DV_LIBS) $(PTHREAD_LIBS)
+
+miavd_SOURCES = \
+	miavd.cc \
+	audio_encoder.cc \
+	daemon.cc \
+	file.cc \
+	frame.cc \
 	img_encoder.cc \
 	info.cc \
 	info_console.cc \
-	info_gui.cc \
 	info_simple.cc \
 	jpeg_mem_dest.cc \
 	libfame_wrapper.cc \
 	liblame_wrapper.cc \
 	libmplex_wrapper.cc \
-	mainwindow.cc \
-	messagebox.cc \
-	miav.cc \
 	miav_daemon.cc \
 	miav_config.cc \
 	mov_encoder.cc \
@@ -40,7 +67,6 @@ miav_SOURCES = $(shell  if [ $QT_CXXFLAGS ] ; then ../tools/MocList cc; fi ) \
 	multiplexer.cc \
 	mutex.cc \
 	network.cc \
-	player.cc \
 	server.cc \
 	server_status.cc \
 	semaphore.cc \
@@ -49,9 +75,7 @@ miav_SOURCES = $(shell  if [ $QT_CXXFLAGS ] ; then ../tools/MocList cc; fi ) \
 	threadsafe_queue.cc \
 	threadsafe_queue_fifo.cc \
 	threadsafe_queue_priority.cc \
-	util.cc \
-	videowidget.cc \
-	yuv_draw.cc
+	util.cc
 
 EXTRA_DIST = \
 	aboutwindow.h \
@@ -110,8 +134,6 @@ EXTRA_DIST = \
 	videowidget.h \
 	yuv_draw.h
 
-miav_LDADD := $(shell  if [ $QT_CXXFLAGS ] ; then ../tools/MocList o; fi )
-
 miav_MOC = $(shell  if [ $QT_CXXFLAGS ] ; then ../tools/MocList cc; fi )
 
 BUILT_SOURCES = $(miav_MOC)
@@ -119,7 +141,7 @@ BUILT_SOURCES = $(miav_MOC)
 CLEANFILES = $(BUILT_SOURCES)
 
 %.moc.cc: %.h
-	$(MOC) -o $@ $<
+	moc -o $@ $<
 
 %.h: %.ui
 	$(UIC) -o $@ $<