[Debconf-video-commits] r343 - in package/trunk: conf src

[benh at alioth.debian.org]

Author: benh
Date: 2009-03-20 04:02:44 +0000 (Fri, 20 Mar 2009)
New Revision: 343

Modified:
   package/trunk/conf/default
   package/trunk/src/dc-do-transcoding
Log:
Move publication data to configuration.


Modified: package/trunk/conf/default
===================================================================
--- package/trunk/conf/default	2009-03-20 04:01:32 UTC (rev 342)
+++ package/trunk/conf/default	2009-03-20 04:02:44 UTC (rev 343)
@@ -2,6 +2,10 @@
 CONFERENCE_NAME='DebConf8'
 VENUE_NAME="unknown venue"
 ROOM_NAME="unknown room"
+# Publication details
+PUBLISH_AUTHOR='DebConf video team'
+PUBLISH_ORG='DebConf'
+PUBLISH_LICENSE='DebConf video licence: http://meetings-archive.debian.net/pub/debian-meetings/LICENCE'
 # Sources and sinks
 SOURCES="firewire:localhost"
 SINKS="file:localhost"

Modified: package/trunk/src/dc-do-transcoding
===================================================================
--- package/trunk/src/dc-do-transcoding	2009-03-20 04:01:32 UTC (rev 342)
+++ package/trunk/src/dc-do-transcoding	2009-03-20 04:02:44 UTC (rev 343)
@@ -10,11 +10,6 @@
     sys.path.insert(0, '/usr/share/debconf-video-store')
 from debconfvideo import config, database
 
-# metadata
-author = 'DebConf video team'
-organisation = 'DebConf'
-licence = 'DebConf video licence: http://meetings-archive.debian.net/pub/debian-meetings/LICENCE'
-
 class Job(object):
     pass
 
@@ -130,12 +125,12 @@
             argv.extend(['-c', str(job.audio_channel_count)])
         argv.extend(['-A', str(job.audio_bit_rate // 1000)])
         # metadata
-        argv.extend(['--artist', author,
+        argv.extend(['--artist', config['PUBLISH_AUTHOR'],
                      '--location', config['VENUE_NAME'],
                      '--date', str(job.recording_time)[:10], # ugh
-                     '--organization', organisation,
-                     '--copyright', author,
-                     '--license', licence])
+                     '--organization', config['PUBLISH_ORG'],
+                     '--copyright', config['PUBLISH_AUTHOR'],
+                     '--license', config['PUBLISH_LICENSE']])
     else:
         argv = ['ffmpeg']
         # input, output