# HG changeset patch # User ymh # Date 1369430871 -7200 # Node ID 665f520f23ae51477b7bbbb5b6e842c6ff12e714 # Parent b94866be0f53b912cb09ca8092334b4735885faf# Parent daeaf144418250308f31b45aa970f1b42cf7d4c7 Merge with daeaf144418250308f31b45aa970f1b42cf7d4c7 diff -r daeaf1444182 -r 665f520f23ae .hgtags --- a/.hgtags Fri May 24 17:31:16 2013 +0200 +++ b/.hgtags Fri May 24 23:27:51 2013 +0200 @@ -32,3 +32,5 @@ d027f7adad037575e353d87f8946bd872e8e5054 V02.08.13 ad105f4a95221d09bf58dbf62c31aaf3290d8e09 V02.08.14 8d3948b137812ffd826fba490ba0c92f6d7a9ab3 V02.08.15 +989b403c7205e9531435b714ade4e5860d95806d V02.09 +ebe38cd5ad6395963d201fad75baec331262e6fa V02.09.01 diff -r daeaf1444182 -r 665f520f23ae sbin/sync/config.py.tmpl --- a/sbin/sync/config.py.tmpl Fri May 24 17:31:16 2013 +0200 +++ b/sbin/sync/config.py.tmpl Fri May 24 23:27:51 2013 +0200 @@ -74,6 +74,7 @@ 'email_port' : 0, 'forbidden_stream_url' : "rtmp://media.iri.centrepompidou.fr/ddc_player/mp4:video/forbidden_stream.mp4?old_path=", 'secret_key' : ''.join([choice('abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*(-_=+)') for i in range(50)]), + 'audio_record_url' : "rtmp://server.url/app_name", }, } diff -r daeaf1444182 -r 665f520f23ae src/ldtplatform/__init__.py --- a/src/ldtplatform/__init__.py Fri May 24 17:31:16 2013 +0200 +++ b/src/ldtplatform/__init__.py Fri May 24 23:27:51 2013 +0200 @@ -1,4 +1,4 @@ -VERSION = (2, 8, 15, "final", 0) +VERSION = (2, 9, 1, "final", 0) VERSION_STR = unicode(".".join(map(lambda i:"%02d" % (i,), VERSION[:2]))) diff -r daeaf1444182 -r 665f520f23ae src/ldtplatform/config.py.tmpl --- a/src/ldtplatform/config.py.tmpl Fri May 24 17:31:16 2013 +0200 +++ b/src/ldtplatform/config.py.tmpl Fri May 24 23:27:51 2013 +0200 @@ -159,6 +159,8 @@ FORBIDDEN_STREAM_URL = "%(forbidden_stream_url)s" +AUDIO_RECORD_URL = "%(audio_record_url)s" + FRONT_TAG_LIST = [u"Enmi 2011", u"film", u"conférence"] HAYSTACK_CONNECTIONS = { diff -r daeaf1444182 -r 665f520f23ae src/requirement.txt --- a/src/requirement.txt Fri May 24 17:31:16 2013 +0200 +++ b/src/requirement.txt Fri May 24 23:27:51 2013 +0200 @@ -1,2 +1,2 @@ -ldt (==1.46.10) +ldt (==1.49.2) hashcut (==0.10)