Code cleanup - moving source code

Moving source code into an src directory

79 files changed, 22 insertions, 17 deletions

diff --git a/SConstruct b/SConstruct
index 347e854..de0de0b 100644
--- a/SConstruct
+++ b/SConstruct
@@ -163,7 +163,7 @@ def CheckPKG(context, name):
 
 conf = Configure(
     env, 
-    config_h="config.h",
+    config_h="src/config.h",
     custom_tests = {
     'CheckPKGConfig' : CheckPKGConfig,
     'CheckPKG' : CheckPKG
@@ -368,21 +368,8 @@ if GetOption("enable_nls"):
         }
         env.Alias('install', env.InstallAs("%s/minidlna.mo"%localedir, mo_file))
 
-minidlna_sources = [
-    "minidlna.c", "upnphttp.c", "upnpdescgen.c", "upnpsoap.c",
-    "upnpreplyparse.c", "minixml.c", 
-    "getifaddr.c", "daemonize.c", "upnpglobalvars.c", 
-    "options.c", "minissdp.c", "uuid.c", "upnpevents.c", 
-    "sql.c", "utils.c", "metadata.c", "scanner.c", "inotify.c", 
-    "tivo_utils.c", "tivo_beacon.c", "tivo_commands.c", 
-    "tagutils/textutils.c", "tagutils/misc.c", "tagutils/tagutils.c",
-    "playlist.c", "image_utils.c", "albumart.c", "log.c"
-]
-testupnpdescgen_sources = [ "testupnpdescgen.c", "upnpdescgen.c" ]
-
-minidlna = env.Program(target = "minidlna", source = minidlna_sources);
-testupnpdescgen = env.Program(target = "testupnpdescgen", source = testupnpdescgen_sources);
-
-env.Install(bindir, [minidlna, testupnpdescgen])
+o = env.SConscript('src/SConscript', exports=['env', 'bindir'])
+
+env.Install(bindir, o)
 
 env.Alias('install', bindir)
diff --git a/src/SConscript b/src/SConscript
new file mode 100644
index 0000000..36c5cd9
--- /dev/null
+++ b/src/SConscript
@@ -0,0 +1,18 @@
+Import('env', 'bindir');
+
+minidlna_sources = [
+    "minidlna.c", "upnphttp.c", "upnpdescgen.c", "upnpsoap.c",
+    "upnpreplyparse.c", "minixml.c",
+    "getifaddr.c", "daemonize.c", "upnpglobalvars.c",
+    "options.c", "minissdp.c", "uuid.c", "upnpevents.c",
+    "sql.c", "utils.c", "metadata.c", "scanner.c", "inotify.c",
+    "tivo_utils.c", "tivo_beacon.c", "tivo_commands.c",
+    "tagutils/textutils.c", "tagutils/misc.c", "tagutils/tagutils.c",
+    "playlist.c", "image_utils.c", "albumart.c", "log.c"
+]
+testupnpdescgen_sources = [ "testupnpdescgen.c", "upnpdescgen.c" ]
+
+minidlna = env.Program(target = "minidlna", source = minidlna_sources);
+testupnpdescgen = env.Program(target = "testupnpdescgen", source = testupnpdescgen_sources);
+
+Return('minidlna', 'testupnpdescgen')
diff --git a/albumart.c b/src/albumart.c
index 9ba5c8f..9ba5c8f 100644
--- a/albumart.c
+++ b/src/albumart.c
diff --git a/albumart.h b/src/albumart.h
index 00193d7..00193d7 100644
--- a/albumart.h
+++ b/src/albumart.h
diff --git a/codelength.h b/src/codelength.h
index 8a5f495..8a5f495 100644
--- a/codelength.h
+++ b/src/codelength.h
diff --git a/daemonize.c b/src/daemonize.c
index 57edbec..57edbec 100644
--- a/daemonize.c
+++ b/src/daemonize.c
diff --git a/daemonize.h b/src/daemonize.h
index 0d83626..0d83626 100644
--- a/daemonize.h
+++ b/src/daemonize.h
diff --git a/getifaddr.c b/src/getifaddr.c
index f0cbdfc..f0cbdfc 100644
--- a/getifaddr.c
+++ b/src/getifaddr.c
diff --git a/getifaddr.h b/src/getifaddr.h
index 331a051..331a051 100644
--- a/getifaddr.h
+++ b/src/getifaddr.h
diff --git a/icons.c b/src/icons.c
index df4ed29..df4ed29 100644
--- a/icons.c
+++ b/src/icons.c
diff --git a/image_utils.c b/src/image_utils.c
index 79b4625..79b4625 100644
--- a/image_utils.c
+++ b/src/image_utils.c
diff --git a/image_utils.h b/src/image_utils.h
index 40ffaea..40ffaea 100644
--- a/image_utils.h
+++ b/src/image_utils.h
diff --git a/inotify.c b/src/inotify.c
index 6667f5c..6667f5c 100644
--- a/inotify.c
+++ b/src/inotify.c
diff --git a/inotify.h b/src/inotify.h
index 91db6f6..91db6f6 100644
--- a/inotify.h
+++ b/src/inotify.h
diff --git a/log.c b/src/log.c
index 8f45876..8f45876 100644
--- a/log.c
+++ b/src/log.c
diff --git a/log.h b/src/log.h
index ca951ac..ca951ac 100644
--- a/log.h
+++ b/src/log.h
diff --git a/metadata.c b/src/metadata.c
index 8e5ac40..8e5ac40 100644
--- a/metadata.c
+++ b/src/metadata.c
diff --git a/metadata.h b/src/metadata.h
index 5e9344d..5e9344d 100644
--- a/metadata.h
+++ b/src/metadata.h
diff --git a/minidlna.c b/src/minidlna.c
index 4ed4cff..4ed4cff 100644
--- a/minidlna.c
+++ b/src/minidlna.c
diff --git a/minidlnapath.h b/src/minidlnapath.h
index 0501531..0501531 100644
--- a/minidlnapath.h
+++ b/src/minidlnapath.h
diff --git a/minidlnatypes.h b/src/minidlnatypes.h
index 9acb030..9acb030 100644
--- a/minidlnatypes.h
+++ b/src/minidlnatypes.h
diff --git a/minissdp.c b/src/minissdp.c
index b7f1fd0..b7f1fd0 100644
--- a/minissdp.c
+++ b/src/minissdp.c
diff --git a/minissdp.h b/src/minissdp.h
index bcc7ff4..bcc7ff4 100644
--- a/minissdp.h
+++ b/src/minissdp.h
diff --git a/minixml.c b/src/minixml.c
index b335b68..b335b68 100644
--- a/minixml.c
+++ b/src/minixml.c
diff --git a/minixml.h b/src/minixml.h
index 91e5fdf..91e5fdf 100644
--- a/minixml.h
+++ b/src/minixml.h
diff --git a/options.c b/src/options.c
index 6fcde05..6fcde05 100644
--- a/options.c
+++ b/src/options.c
diff --git a/options.h b/src/options.h
index 146dcf8..146dcf8 100644
--- a/options.h
+++ b/src/options.h
diff --git a/playlist.c b/src/playlist.c
index fadd4e3..fadd4e3 100644
--- a/playlist.c
+++ b/src/playlist.c
diff --git a/playlist.h b/src/playlist.h
index 8abcb17..8abcb17 100644
--- a/playlist.h
+++ b/src/playlist.h
diff --git a/scanner.c b/src/scanner.c
index 7517bd0..7517bd0 100644
--- a/scanner.c
+++ b/src/scanner.c
diff --git a/scanner.h b/src/scanner.h
index a57eedd..a57eedd 100644
--- a/scanner.h
+++ b/src/scanner.h
diff --git a/sql.c b/src/sql.c
index 6311e1e..6311e1e 100644
--- a/sql.c
+++ b/src/sql.c
diff --git a/sql.h b/src/sql.h
index e2e9661..e2e9661 100644
--- a/sql.h
+++ b/src/sql.h
diff --git a/tagutils/misc.c b/src/tagutils/misc.c
index 08e00ae..08e00ae 100644
--- a/tagutils/misc.c
+++ b/src/tagutils/misc.c
diff --git a/tagutils/misc.h b/src/tagutils/misc.h
index c7642fe..c7642fe 100644
--- a/tagutils/misc.h
+++ b/src/tagutils/misc.h
diff --git a/tagutils/tagutils-aac.c b/src/tagutils/tagutils-aac.c
index 4224d5f..4224d5f 100644
--- a/tagutils/tagutils-aac.c
+++ b/src/tagutils/tagutils-aac.c
diff --git a/tagutils/tagutils-aac.h b/src/tagutils/tagutils-aac.h
index 901b571..901b571 100644
--- a/tagutils/tagutils-aac.h
+++ b/src/tagutils/tagutils-aac.h
diff --git a/tagutils/tagutils-asf.c b/src/tagutils/tagutils-asf.c
index 11da1ae..11da1ae 100644
--- a/tagutils/tagutils-asf.c
+++ b/src/tagutils/tagutils-asf.c
diff --git a/tagutils/tagutils-asf.h b/src/tagutils/tagutils-asf.h
index 5fd2942..5fd2942 100644
--- a/tagutils/tagutils-asf.h
+++ b/src/tagutils/tagutils-asf.h
diff --git a/tagutils/tagutils-flc.c b/src/tagutils/tagutils-flc.c
index b8f41d4..b8f41d4 100644
--- a/tagutils/tagutils-flc.c
+++ b/src/tagutils/tagutils-flc.c
diff --git a/tagutils/tagutils-flc.h b/src/tagutils/tagutils-flc.h
index 4aeba60..4aeba60 100644
--- a/tagutils/tagutils-flc.h
+++ b/src/tagutils/tagutils-flc.h
diff --git a/tagutils/tagutils-misc.c b/src/tagutils/tagutils-misc.c
index 9934e7a..9934e7a 100644
--- a/tagutils/tagutils-misc.c
+++ b/src/tagutils/tagutils-misc.c
diff --git a/tagutils/tagutils-mp3.c b/src/tagutils/tagutils-mp3.c
index 643b349..643b349 100644
--- a/tagutils/tagutils-mp3.c
+++ b/src/tagutils/tagutils-mp3.c
diff --git a/tagutils/tagutils-mp3.h b/src/tagutils/tagutils-mp3.h
index c6ce036..c6ce036 100644
--- a/tagutils/tagutils-mp3.h
+++ b/src/tagutils/tagutils-mp3.h
diff --git a/tagutils/tagutils-ogg.c b/src/tagutils/tagutils-ogg.c
index ed9de40..ed9de40 100644
--- a/tagutils/tagutils-ogg.c
+++ b/src/tagutils/tagutils-ogg.c
diff --git a/tagutils/tagutils-ogg.h b/src/tagutils/tagutils-ogg.h
index 16b82c7..16b82c7 100644
--- a/tagutils/tagutils-ogg.h
+++ b/src/tagutils/tagutils-ogg.h
diff --git a/tagutils/tagutils-pcm.c b/src/tagutils/tagutils-pcm.c
index ce64ed5..ce64ed5 100644
--- a/tagutils/tagutils-pcm.c
+++ b/src/tagutils/tagutils-pcm.c
diff --git a/tagutils/tagutils-pcm.h b/src/tagutils/tagutils-pcm.h
index eca180e..eca180e 100644
--- a/tagutils/tagutils-pcm.h
+++ b/src/tagutils/tagutils-pcm.h
diff --git a/tagutils/tagutils-plist.c b/src/tagutils/tagutils-plist.c
index feaaaff..feaaaff 100644
--- a/tagutils/tagutils-plist.c
+++ b/src/tagutils/tagutils-plist.c
diff --git a/tagutils/tagutils-wav.c b/src/tagutils/tagutils-wav.c
index c23f1ac..c23f1ac 100644
--- a/tagutils/tagutils-wav.c
+++ b/src/tagutils/tagutils-wav.c
diff --git a/tagutils/tagutils-wav.h b/src/tagutils/tagutils-wav.h
index c50b4c1..c50b4c1 100644
--- a/tagutils/tagutils-wav.h
+++ b/src/tagutils/tagutils-wav.h
diff --git a/tagutils/tagutils.c b/src/tagutils/tagutils.c
index 7e147e7..7e147e7 100644
--- a/tagutils/tagutils.c
+++ b/src/tagutils/tagutils.c
diff --git a/tagutils/tagutils.h b/src/tagutils/tagutils.h
index 0d5f362..0d5f362 100644
--- a/tagutils/tagutils.h
+++ b/src/tagutils/tagutils.h
diff --git a/tagutils/textutils.c b/src/tagutils/textutils.c
index 6cffa17..6cffa17 100644
--- a/tagutils/textutils.c
+++ b/src/tagutils/textutils.c
diff --git a/tagutils/textutils.h b/src/tagutils/textutils.h
index fb926bf..fb926bf 100644
--- a/tagutils/textutils.h
+++ b/src/tagutils/textutils.h
diff --git a/testupnpdescgen.c b/src/testupnpdescgen.c
index 18be48e..18be48e 100644
--- a/testupnpdescgen.c
+++ b/src/testupnpdescgen.c
diff --git a/tivo_beacon.c b/src/tivo_beacon.c
index ea728d4..ea728d4 100644
--- a/tivo_beacon.c
+++ b/src/tivo_beacon.c
diff --git a/tivo_beacon.h b/src/tivo_beacon.h
index fa6c3ea..fa6c3ea 100644
--- a/tivo_beacon.h
+++ b/src/tivo_beacon.h
diff --git a/tivo_commands.c b/src/tivo_commands.c
index 7c7afbd..7c7afbd 100644
--- a/tivo_commands.c
+++ b/src/tivo_commands.c
diff --git a/tivo_commands.h b/src/tivo_commands.h
index f88bb61..f88bb61 100644
--- a/tivo_commands.h
+++ b/src/tivo_commands.h
diff --git a/tivo_utils.c b/src/tivo_utils.c
index a370f42..a370f42 100644
--- a/tivo_utils.c
+++ b/src/tivo_utils.c
diff --git a/tivo_utils.h b/src/tivo_utils.h
index 1830ea9..1830ea9 100644
--- a/tivo_utils.h
+++ b/src/tivo_utils.h
diff --git a/upnpdescgen.c b/src/upnpdescgen.c
index 497a250..497a250 100644
--- a/upnpdescgen.c
+++ b/src/upnpdescgen.c
diff --git a/upnpdescgen.h b/src/upnpdescgen.h
index 83f2a52..83f2a52 100644
--- a/upnpdescgen.h
+++ b/src/upnpdescgen.h
diff --git a/upnpdescstrings.h b/src/upnpdescstrings.h
index 39a828e..39a828e 100644
--- a/upnpdescstrings.h
+++ b/src/upnpdescstrings.h
diff --git a/upnpevents.c b/src/upnpevents.c
index f4c5564..f4c5564 100644
--- a/upnpevents.c
+++ b/src/upnpevents.c
diff --git a/upnpevents.h b/src/upnpevents.h
index c9748af..c9748af 100644
--- a/upnpevents.h
+++ b/src/upnpevents.h
diff --git a/upnpglobalvars.c b/src/upnpglobalvars.c
index b40e5f3..b40e5f3 100644
--- a/upnpglobalvars.c
+++ b/src/upnpglobalvars.c
diff --git a/upnpglobalvars.h b/src/upnpglobalvars.h
index 87b8590..87b8590 100644
--- a/upnpglobalvars.h
+++ b/src/upnpglobalvars.h
diff --git a/upnphttp.c b/src/upnphttp.c
index 41585a1..41585a1 100644
--- a/upnphttp.c
+++ b/src/upnphttp.c
diff --git a/upnphttp.h b/src/upnphttp.h
index 65d4e6d..65d4e6d 100644
--- a/upnphttp.h
+++ b/src/upnphttp.h
diff --git a/upnpreplyparse.c b/src/upnpreplyparse.c
index 5bf5311..5bf5311 100644
--- a/upnpreplyparse.c
+++ b/src/upnpreplyparse.c
diff --git a/upnpreplyparse.h b/src/upnpreplyparse.h
index 34f0473..34f0473 100644
--- a/upnpreplyparse.h
+++ b/src/upnpreplyparse.h
diff --git a/upnpsoap.c b/src/upnpsoap.c
index d28086a..d28086a 100644
--- a/upnpsoap.c
+++ b/src/upnpsoap.c
diff --git a/upnpsoap.h b/src/upnpsoap.h
index d235466..d235466 100644
--- a/upnpsoap.h
+++ b/src/upnpsoap.h
diff --git a/utils.c b/src/utils.c
index 136fbda..136fbda 100644
--- a/utils.c
+++ b/src/utils.c
diff --git a/utils.h b/src/utils.h
index 05ebb13..05ebb13 100644
--- a/utils.h
+++ b/src/utils.h
diff --git a/uuid.c b/src/uuid.c
index bdb4abc..bdb4abc 100644
--- a/uuid.c
+++ b/src/uuid.c
diff --git a/uuid.h b/src/uuid.h
index 51242f4..51242f4 100644
--- a/uuid.h
+++ b/src/uuid.h