Move src to src/lib, include to src/include, test to src/test.

diff --git a/AirTV-Qt/AirTV.pro b/AirTV-Qt/AirTV.pro
index cfe3b4f19f5ca82538f074cccace8e71bcb013be..bdfe3a88266627129f4eead18cad3d6bd29a3170 100644 (file)
--- a/AirTV-Qt/AirTV.pro
+++ b/AirTV-Qt/AirTV.pro
@@ -24,34 +24,34 @@ macx {
     QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5
 }
 
-INCLUDEPATH += ../include/
+INCLUDEPATH += ../src/include/
 SOURCES += main.cpp\
-    ../src/utils.c \
-    ../src/sdp.c \
-    ../src/rsapem.c \
-    ../src/rsakey.c \
-    ../src/raop.c \
-    ../src/raop_rtp.c \
-    ../src/raop_buffer.c \
-    ../src/netutils.c \
-    ../src/httpd.c \
-    ../src/http_response.c \
-    ../src/http_request.c \
-    ../src/http_parser.c \
-    ../src/dnssd.c \
-    ../src/base64.c \
-    ../src/alac/alac.c \
-    ../src/crypto/sha1.c \
-    ../src/crypto/rc4.c \
-    ../src/crypto/md5.c \
-    ../src/crypto/hmac.c \
-    ../src/crypto/bigint.c \
-    ../src/crypto/aes.c \
+    ../src/lib/utils.c \
+    ../src/lib/sdp.c \
+    ../src/lib/rsapem.c \
+    ../src/lib/rsakey.c \
+    ../src/lib/raop.c \
+    ../src/lib/raop_rtp.c \
+    ../src/lib/raop_buffer.c \
+    ../src/lib/netutils.c \
+    ../src/lib/httpd.c \
+    ../src/lib/http_response.c \
+    ../src/lib/http_request.c \
+    ../src/lib/http_parser.c \
+    ../src/lib/dnssd.c \
+    ../src/lib/base64.c \
+    ../src/lib/alac/alac.c \
+    ../src/lib/crypto/sha1.c \
+    ../src/lib/crypto/rc4.c \
+    ../src/lib/crypto/md5.c \
+    ../src/lib/crypto/hmac.c \
+    ../src/lib/crypto/bigint.c \
+    ../src/lib/crypto/aes.c \
+    ../src/lib/logger.c \
     audiooutput.cpp \
     raopservice.cpp \
     mainapplication.cpp \
-    raopcallbackhandler.cpp \
-    ../src/logger.c
+    raopcallbackhandler.cpp
 
 HEADERS  += \
     audiooutput.h \

diff --git a/Makefile b/Makefile
index e162dc84c1f66d0fd915916d4740306077ada579..68e0132292a2bff986c3a99f46fcc171004ca121 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,12 @@
-CFLAGS:=-g -Wall -Iinclude/
+CFLAGS:=-g -Wall -Isrc/include/
 LDFLAGS:=-lm
-LIB_OBJS=src/alac/alac.o src/crypto/aes.o src/crypto/bigint.o src/crypto/hmac.o src/crypto/md5.o src/crypto/rc4.o src/crypto/sha1.o src/sdp.o src/raop_buffer.o src/raop_rtp.o src/http_response.o src/http_request.o src/http_parser.o src/httpd.o src/raop.o src/rsakey.o src/rsapem.o src/dnssd.o src/netutils.o src/utils.o src/base64.o src/logger.o
+LIB_OBJS=src/lib/alac/alac.o src/lib/crypto/aes.o src/lib/crypto/bigint.o src/lib/crypto/hmac.o src/lib/crypto/md5.o src/lib/crypto/rc4.o src/lib/crypto/sha1.o src/lib/sdp.o src/lib/raop_buffer.o src/lib/raop_rtp.o src/lib/http_response.o src/lib/http_request.o src/lib/http_parser.o src/lib/httpd.o src/lib/raop.o src/lib/rsakey.o src/lib/rsapem.o src/lib/dnssd.o src/lib/netutils.o src/lib/utils.o src/lib/base64.o src/lib/logger.o
 
 
 all: example
 
-example: test/example.o $(LIB_OBJS)
-       $(CC) $(CFLAGS) test/example.o $(LIB_OBJS) -o $@ $(LDFLAGS)
+example: src/test/example.o $(LIB_OBJS)
+       $(CC) $(CFLAGS) src/test/example.o $(LIB_OBJS) -o $@ $(LDFLAGS)
 
 clean:
-       rm -f example test/*.o $(LIB_OBJS)
+       rm -f example src/test/*.o $(LIB_OBJS)

diff --git a/include/dnssd.h b/src/include/dnssd.h
similarity index 100%
rename from include/dnssd.h
rename to src/include/dnssd.h

diff --git a/include/raop.h b/src/include/raop.h
similarity index 100%
rename from include/raop.h
rename to src/include/raop.h

diff --git a/src/alac/alac.c b/src/lib/alac/alac.c
similarity index 100%
rename from src/alac/alac.c
rename to src/lib/alac/alac.c

diff --git a/src/alac/alac.h b/src/lib/alac/alac.h
similarity index 100%
rename from src/alac/alac.h
rename to src/lib/alac/alac.h

diff --git a/src/alac/stdint_win.h b/src/lib/alac/stdint_win.h
similarity index 100%
rename from src/alac/stdint_win.h
rename to src/lib/alac/stdint_win.h

diff --git a/src/base64.c b/src/lib/base64.c
similarity index 100%
rename from src/base64.c
rename to src/lib/base64.c

diff --git a/src/base64.h b/src/lib/base64.h
similarity index 100%
rename from src/base64.h
rename to src/lib/base64.h

diff --git a/src/compat.h b/src/lib/compat.h
similarity index 100%
rename from src/compat.h
rename to src/lib/compat.h

diff --git a/src/crypto/aes.c b/src/lib/crypto/aes.c
similarity index 100%
rename from src/crypto/aes.c
rename to src/lib/crypto/aes.c

diff --git a/src/crypto/bigint.c b/src/lib/crypto/bigint.c
similarity index 100%
rename from src/crypto/bigint.c
rename to src/lib/crypto/bigint.c

diff --git a/src/crypto/bigint.h b/src/lib/crypto/bigint.h
similarity index 100%
rename from src/crypto/bigint.h
rename to src/lib/crypto/bigint.h

diff --git a/src/crypto/bigint_impl.h b/src/lib/crypto/bigint_impl.h
similarity index 100%
rename from src/crypto/bigint_impl.h
rename to src/lib/crypto/bigint_impl.h

diff --git a/src/crypto/config.h b/src/lib/crypto/config.h
similarity index 100%
rename from src/crypto/config.h
rename to src/lib/crypto/config.h

diff --git a/src/crypto/crypto.h b/src/lib/crypto/crypto.h
similarity index 100%
rename from src/crypto/crypto.h
rename to src/lib/crypto/crypto.h

diff --git a/src/crypto/hmac.c b/src/lib/crypto/hmac.c
similarity index 100%
rename from src/crypto/hmac.c
rename to src/lib/crypto/hmac.c

diff --git a/src/crypto/md5.c b/src/lib/crypto/md5.c
similarity index 100%
rename from src/crypto/md5.c
rename to src/lib/crypto/md5.c

diff --git a/src/crypto/os_port.h b/src/lib/crypto/os_port.h
similarity index 100%
rename from src/crypto/os_port.h
rename to src/lib/crypto/os_port.h

diff --git a/src/crypto/rc4.c b/src/lib/crypto/rc4.c
similarity index 100%
rename from src/crypto/rc4.c
rename to src/lib/crypto/rc4.c

diff --git a/src/crypto/sha1.c b/src/lib/crypto/sha1.c
similarity index 100%
rename from src/crypto/sha1.c
rename to src/lib/crypto/sha1.c

diff --git a/src/dnssd.c b/src/lib/dnssd.c
similarity index 100%
rename from src/dnssd.c
rename to src/lib/dnssd.c

diff --git a/src/dnssd.m b/src/lib/dnssd.m
similarity index 100%
rename from src/dnssd.m
rename to src/lib/dnssd.m

diff --git a/src/dnssdint.h b/src/lib/dnssdint.h
similarity index 100%
rename from src/dnssdint.h
rename to src/lib/dnssdint.h

diff --git a/src/global.h b/src/lib/global.h
similarity index 100%
rename from src/global.h
rename to src/lib/global.h

diff --git a/src/http_parser.c b/src/lib/http_parser.c
similarity index 100%
rename from src/http_parser.c
rename to src/lib/http_parser.c

diff --git a/src/http_parser.h b/src/lib/http_parser.h
similarity index 100%
rename from src/http_parser.h
rename to src/lib/http_parser.h

diff --git a/src/http_request.c b/src/lib/http_request.c
similarity index 100%
rename from src/http_request.c
rename to src/lib/http_request.c

diff --git a/src/http_request.h b/src/lib/http_request.h
similarity index 100%
rename from src/http_request.h
rename to src/lib/http_request.h

diff --git a/src/http_response.c b/src/lib/http_response.c
similarity index 100%
rename from src/http_response.c
rename to src/lib/http_response.c

diff --git a/src/http_response.h b/src/lib/http_response.h
similarity index 100%
rename from src/http_response.h
rename to src/lib/http_response.h

diff --git a/src/httpd.c b/src/lib/httpd.c
similarity index 100%
rename from src/httpd.c
rename to src/lib/httpd.c

diff --git a/src/httpd.h b/src/lib/httpd.h
similarity index 100%
rename from src/httpd.h
rename to src/lib/httpd.h

diff --git a/src/logger.c b/src/lib/logger.c
similarity index 100%
rename from src/logger.c
rename to src/lib/logger.c

diff --git a/src/logger.h b/src/lib/logger.h
similarity index 100%
rename from src/logger.h
rename to src/lib/logger.h

diff --git a/src/memalign.h b/src/lib/memalign.h
similarity index 100%
rename from src/memalign.h
rename to src/lib/memalign.h

diff --git a/src/netutils.c b/src/lib/netutils.c
similarity index 100%
rename from src/netutils.c
rename to src/lib/netutils.c

diff --git a/src/netutils.h b/src/lib/netutils.h
similarity index 100%
rename from src/netutils.h
rename to src/lib/netutils.h

diff --git a/src/raop.c b/src/lib/raop.c
similarity index 100%
rename from src/raop.c
rename to src/lib/raop.c

diff --git a/src/raop_buffer.c b/src/lib/raop_buffer.c
similarity index 100%
rename from src/raop_buffer.c
rename to src/lib/raop_buffer.c

diff --git a/src/raop_buffer.h b/src/lib/raop_buffer.h
similarity index 100%
rename from src/raop_buffer.h
rename to src/lib/raop_buffer.h

diff --git a/src/raop_rtp.c b/src/lib/raop_rtp.c
similarity index 99%
rename from src/raop_rtp.c
rename to src/lib/raop_rtp.c
index 0ef47c42614ffb88c3f4f04573c91c9c24563905..03ae5023cf1fd3387e39b5d7002920b3d9fb6f98 100644 (file)
--- a/src/raop_rtp.c
+++ b/src/lib/raop_rtp.c
@@ -179,7 +179,7 @@ raop_rtp_thread_udp(void *arg)
 
        while(1) {
                int volume_changed;
-               float volume;
+               float volume = 0.0;
                int flush;
 
                fd_set rfds;
@@ -308,7 +308,7 @@ raop_rtp_thread_tcp(void *arg)
 
        while (1) {
                int volume_changed;
-               float volume;
+               float volume = 0.0;
 
                fd_set rfds;
                struct timeval tv;

diff --git a/src/raop_rtp.h b/src/lib/raop_rtp.h
similarity index 100%
rename from src/raop_rtp.h
rename to src/lib/raop_rtp.h

diff --git a/src/rsakey.c b/src/lib/rsakey.c
similarity index 100%
rename from src/rsakey.c
rename to src/lib/rsakey.c

diff --git a/src/rsakey.h b/src/lib/rsakey.h
similarity index 100%
rename from src/rsakey.h
rename to src/lib/rsakey.h

diff --git a/src/rsapem.c b/src/lib/rsapem.c
similarity index 100%
rename from src/rsapem.c
rename to src/lib/rsapem.c

diff --git a/src/rsapem.h b/src/lib/rsapem.h
similarity index 100%
rename from src/rsapem.h
rename to src/lib/rsapem.h

diff --git a/src/sdp.c b/src/lib/sdp.c
similarity index 100%
rename from src/sdp.c
rename to src/lib/sdp.c

diff --git a/src/sdp.h b/src/lib/sdp.h
similarity index 100%
rename from src/sdp.h
rename to src/lib/sdp.h

diff --git a/src/sockets.h b/src/lib/sockets.h
similarity index 100%
rename from src/sockets.h
rename to src/lib/sockets.h

diff --git a/src/threads.h b/src/lib/threads.h
similarity index 100%
rename from src/threads.h
rename to src/lib/threads.h

diff --git a/src/utils.c b/src/lib/utils.c
similarity index 100%
rename from src/utils.c
rename to src/lib/utils.c

diff --git a/src/utils.h b/src/lib/utils.h
similarity index 100%
rename from src/utils.h
rename to src/lib/utils.h

diff --git a/test/dnssd_test.c b/src/test/dnssd_test.c
similarity index 100%
rename from test/dnssd_test.c
rename to src/test/dnssd_test.c

diff --git a/test/dnssd_test.m b/src/test/dnssd_test.m
similarity index 100%
rename from test/dnssd_test.m
rename to src/test/dnssd_test.m

diff --git a/test/example.c b/src/test/example.c
similarity index 100%
rename from test/example.c
rename to src/test/example.c

diff --git a/test/main.c b/src/test/main.c
similarity index 100%
rename from test/main.c
rename to src/test/main.c