[cvs] commit: incubator/oscar/admin process.php view.php incubator/oscar/lib Convert.php Oscar.php incubator/oscar/lib/Convert ffmpeg.php mplayer.php incubator/oscar/scripts/sql oscar.sql incubator/oscar/templates/admin ...

[Michael Rubinsky]

mrubinsk    2007-09-13 15:44:34 EDT

  Modified files:
    oscar/admin          process.php view.php 
    oscar/lib            Convert.php Oscar.php 
    oscar/lib/Convert    ffmpeg.php mplayer.php 
    oscar/scripts/sql    oscar.sql 
    oscar/templates/admin view.php 
    oscar/videos         edit.php 
  Log:
  some major changes here:
  
  - keep video in tmp directory until all processing is done and 'view' action is performed then video (and optionally original) file is moved to VFS.
  - thumbnails are generated in tmp directory then moved to VFS.
  - used the existing flash player from templates/video for the admin 'view' action and fixed path to video
  - some supportive changes (new video_temp_filename field in db to persist the filename until processing is complete, Convert::thumbnails() now needs the $id passed in (so we can get the correct VFS directory).
  
  Probably a few cs changes to boot as well...
  
  Revision  Changes    Path
  1.5       +2 -1      incubator/oscar/admin/process.php
  1.4       +2 -2      incubator/oscar/admin/view.php
  1.4       +1 -1      incubator/oscar/lib/Convert.php
  1.7       +12 -2     incubator/oscar/lib/Convert/ffmpeg.php
  1.7       +14 -3     incubator/oscar/lib/Convert/mplayer.php
  1.25      +45 -46    incubator/oscar/lib/Oscar.php
  1.12      +1 -0      incubator/oscar/scripts/sql/oscar.sql
  1.3       +1 -1      incubator/oscar/templates/admin/view.php
  1.6       +2 -3      incubator/oscar/videos/edit.php

  Chora Links:
  http://cvs.horde.org/diff.php/incubator/oscar/admin/process.php?r1=1.4&r2=1.5&ty=u
  http://cvs.horde.org/diff.php/incubator/oscar/admin/view.php?r1=1.3&r2=1.4&ty=u
  http://cvs.horde.org/diff.php/incubator/oscar/lib/Convert.php?r1=1.3&r2=1.4&ty=u
  http://cvs.horde.org/diff.php/incubator/oscar/lib/Convert/ffmpeg.php?r1=1.6&r2=1.7&ty=u
  http://cvs.horde.org/diff.php/incubator/oscar/lib/Convert/mplayer.php?r1=1.6&r2=1.7&ty=u
  http://cvs.horde.org/diff.php/incubator/oscar/lib/Oscar.php?r1=1.24&r2=1.25&ty=u
  http://cvs.horde.org/diff.php/incubator/oscar/scripts/sql/oscar.sql?r1=1.11&r2=1.12&ty=u
  http://cvs.horde.org/diff.php/incubator/oscar/templates/admin/view.php?r1=1.2&r2=1.3&ty=u
  http://cvs.horde.org/diff.php/incubator/oscar/videos/edit.php?r1=1.5&r2=1.6&ty=u