Changeset 364

Show
Ignore:
Timestamp:
10/21/08 17:52:54 (3 months ago)
Author:
andy
Message:

removed old templates

latest template is plumi.template, which using 'playList' syntax to show a video thumbnail
then the FLV file.

removed 'html-quoted' version of template , moved this functionality into python code
where it can happen dynamically, and thus stay in sync automatically

Location:
indytube/branches/plumi-0.2.x
Files:
3 removed
3 modified

Legend:

Unmodified
Added
Removed

  • indytube/branches/plumi-0.2.x/indytube.conf

    r351 r364  
    44DO_ENCODING=True 
    55NUMBER_OF_PARALLEL_ENCODERS=1 
    6 ENCODER_LOCKFILE_BASE=/opt/indytube/plumidemo-encoder.lock 
     6ENCODER_LOCKFILE_BASE=/opt/indytube/plumidemo-testing-encoder.lock 
    77POLLTIME=60 
    88 
    99 
    1010[mencoder] 
    11 MENCODER_LOCATION=/usr/bin/mencoder 
     11MENCODER_LOCATION=/usr/local/bin/mencoder 
    1212 
    1313# for older versions of MEncoder. 
    … …  
    2525 
    2626[paths] 
    27 VIDEO_FILE_DIRECTORY=/opt/instances/PlumiDemoLive/var/files/Members 
    28 FLV_FILE_DIRECTORY=/var/www/plumi-flv-files/ 
    29 INCLUDE_FILE_DIRECTORY=/opt/instances/PlumiDemoLive/var/files/Members 
     27VIDEO_FILE_DIRECTORY=/opt/tebet-instances/testing.plumi.org/var/files/Members 
     28FLV_FILE_DIRECTORY=/var/www/plumi-testing-flv-files/ 
     29INCLUDE_FILE_DIRECTORY=/opt/tebet-instances/testing.plumi.org/var/files/Members 
    3030INCLUDE_FILE_SUFFIX=.flv.inc 
    31 INCLUDE_TEMPLATE=/opt/indytube/template.include 
     31INCLUDE_TEMPLATE=/opt/indytube/include.template.testing.plumi 
    3232 
    3333[urls] 
    3434FLOWPLAYER_LOCATION=http://flv.plumi.org/flowplayer/FlowPlayer.swf 
    3535VIDEO_SERVER_URL=http://flv.plumi.org/ 
    36 SPLASH_IMAGE_BASE=http://demo.plumi.org/flowplayer/ 
     36SPLASH_IMAGE_BASE=http://testing.plumi.org/Members/ 
    3737SPLASH_IMAGE_FILE=indytube.jpg 
    3838 
    3939[logging] 
    40 LOG_FILE=/opt/indytube/plumi-wetube.log 
     40LOG_FILE=/opt/indytube/plumi-testing-wetube.log 
    4141LOG_LEVEL=logging.INFO 

  • indytube/branches/plumi-0.2.x/indytube.py

    r353 r364  
    167167                                                                        'videobaseurl':self.VIDEO_SERVER_URL,  
    168168                                                                        'splashbaseurl':self.SPLASH_IMAGE_BASE,  
    169                                                                         'splashfile':self.SPLASH_IMAGE_FILE,  
     169                                                                        'splashfile': relative_directory + '/'+f, 
    170170                                                                        'cortado_location':self.CORTADO_LOCATION,  
    171171                                                                        'oggfile':stem+".ogg",  

  • indytube/branches/plumi-0.2.x/plumi.template

    r194 r364  
    1  
    21<object type="application/x-shockwave-flash" data="$flowplayer_location"  
    32width="320" height="263" id="FlowPlayer"> 
    4 <param name="allowScriptAccess" value="sameDomain" /> 
     3<param name="allowScriptAccess" value="always" /> 
    54<param name="movie" value="$flowplayer_location" /> 
    65<param name="quality" value="high" /> 
    76<param name="scale" value="noScale" /> 
    87<param name="wmode" value="transparent" /> 
    9 <param name="flashvars" value="config={splashImageFile: '$splashfile', videoFile: '$videofile', baseURL: '$videobaseurl', autoPlay: false , autoBuffering: false, loop:false, fullScreenScriptURL: '$videobaseurl/fullscreen.js' } " /> 
     8<param name="flashvars" value="config={playList:[{url:'$splashbaseurl/$splashfile/thumbnailImage',type:'jpg'},{url:'$videobaseurl/$videofile'}], autoPlay: false , autoBuffering: false, loop:false, fullScreenScriptURL: '$videobaseurl/fullscreen.js' } " /> 
    109</object> 
    11  
    12 <div style="width:320px;margin-top:5px;">Copy the following to embed the movie into another web page:</div> 
    13 <form> 
    14 <textarea style="overflow-x:auto;width:320px;" onclick="this.focus();this.select();"> 
    15 &lt;object type="application/x-shockwave-flash" data="$flowplayer_location" width="320" height="263" id="FlowPlayer">&lt;param name="allowScriptAccess" value="sameDomain" />&lt;param name="movie" value="FlowPlayer.swf" />&lt;param name="quality" value="high" />&lt;param name="scale" value="noScale" />&lt;param name="wmode" value="transparent" />&lt;param name="flashvars" value="config={splashImageFile: '$splashfile', videoFile: '$videofile', baseURL: '$videobaseurl', autoPlay: false , autoBuffering: false, loop:false, fullScreenScriptURL: '$videobaseurl/fullscreen.js'} " />&lt;/object> 
    16 </textarea> 
    17 </form>