From db951c89d367d62eccb646ce9eb1c5bf6a9b110e Mon Sep 17 00:00:00 2001
From: Bent Bisballe Nyeng <deva@aasimon.org>
Date: Fri, 19 Sep 2014 19:07:11 +0200
Subject: Add sub project code and linker arguments for libaudioin and lrtp.

---
 Makefile.am     | 2 +-
 autogen.sh      | 2 ++
 configure.ac    | 2 ++
 src/Makefile.am | 1 +
 src/v4l.cc      | 1 +
 5 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index f9a9e9e..a59c531 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 AUTOMAKE_OPTIONS = gnu
-SUBDIRS = src icons tools
+SUBDIRS = libaudioin lrtp src icons tools
 DISTDIRS = src icons tools
 
 EXTRA_DIST =
diff --git a/autogen.sh b/autogen.sh
index 0b7d48d..9142bef 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -13,3 +13,5 @@
 
 # Now run autoreconf
 ${AUTORECONF:-autoreconf} -fiv
+(cd lrtp; ./autogen.sh)
+(cd libaudioin; ./autogen.sh)
\ No newline at end of file
diff --git a/configure.ac b/configure.ac
index f413a2f..00f54d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,6 +61,8 @@ AC_SUBST(CPPFLAGS)
 AC_SUBST(CXXFLAGS)
 AC_SUBST(LDFLAGS)
 
+AC_CONFIG_SUBDIRS([lrtp])
+AC_CONFIG_SUBDIRS([libaudioin])
 
 AC_OUTPUT(
 	Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 197647c..e407edc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,7 @@
 bin_PROGRAMS = simplertp
 
 simplertp_LDADD = $(QT_LIBS) $(AO_LIBS) $(V4LC_LIBS) -ljpeg \
+	$(top_srcdir)/lrtp/src/liblrtp.la $(top_srcdir)/libaudioin/src/libaudioin.la \
 	$(shell ../tools/MocList o ) qrc_simplertp.o 
 
 simplertp_CXXFLAGS = $(QT_CFLAGS) $(AO_CFLAGS) $(V4LC_CFLAGS)
diff --git a/src/v4l.cc b/src/v4l.cc
index f220403..38f53b7 100644
--- a/src/v4l.cc
+++ b/src/v4l.cc
@@ -95,6 +95,7 @@ static int xioctl(int fh, int request, void *arg)
 /*
  * In typical computer APIs, "YUV" actually means YCbCr, and "YUYV" means
  * "YCbCr 4:2:2" stored as Y0, Cb01, Y1, Cr01, Y2 ...
+ * From: http://stackoverflow.com/questions/16390783/how-to-save-yuyv-raw-data-to-jpeg-using-libjpeg
  */
 static void toJpeg(int quality, unsigned char *yuyv,
                    int image_width, int image_height,
-- 
cgit v1.2.3