[Debconf-video-commits] r338 - in package/branches/pycon09: conf src

[benh at alioth.debian.org]

Author: benh
Date: 2009-03-20 03:30:48 +0000 (Fri, 20 Mar 2009)
New Revision: 338

Modified:
   package/branches/pycon09/conf/default
   package/branches/pycon09/src/dc-do-transcoding
Log:
Move publication data to configuration.
Specify agreed license for PyCon 2009.


Modified: package/branches/pycon09/conf/default
===================================================================
--- package/branches/pycon09/conf/default	2009-03-20 03:24:15 UTC (rev 337)
+++ package/branches/pycon09/conf/default	2009-03-20 03:30:48 UTC (rev 338)
@@ -2,6 +2,10 @@
 CONFERENCE_NAME='PyCon 2009'
 VENUE_NAME="Hyatt Regency O'Hare Hotel, Chicago, USA"
 ROOM_NAME="unknown room"
+# Publication details
+PUBLISH_AUTHOR='PyCon video team'
+PUBLISH_ORG='Python Software Foundation'
+PUBLISH_LICENSE='Creative Commons Attribution-Share Alike 3.0 <http://creativecommons.org/licenses/by-sa/3.0/>'
 # Sources and sinks
 SOURCES="firewire:localhost"
 SINKS="file:localhost"

Modified: package/branches/pycon09/src/dc-do-transcoding
===================================================================
--- package/branches/pycon09/src/dc-do-transcoding	2009-03-20 03:24:15 UTC (rev 337)
+++ package/branches/pycon09/src/dc-do-transcoding	2009-03-20 03:30:48 UTC (rev 338)
@@ -10,11 +10,6 @@
     sys.path.insert(0, '/usr/share/debconf-video-store')
 from debconfvideo import config, database
 
-# metadata
-author = 'PyCon video team'
-organisation = 'Python Software Foundation'
-licence = '' # TODO
-
 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