- add video loop option

- allow multiple instances of a video

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2260 b956fd51-792f-4845-bead-9b4dfca2ff2c

1 files changed, 25 insertions, 14 deletions

diff --git a/src/base/UMusic.pas b/src/base/UMusic.pas
index 5d816c9a..e349bd1f 100644
--- a/src/base/UMusic.pas
+++ b/src/base/UMusic.pas
@@ -324,28 +324,33 @@ type
   IGenericPlayback = Interface
   ['{63A5EBC3-3F4D-4F23-8DFB-B5165FCE33DD}']
       function GetName: String;
+  end;
 
-      function Open(const Filename: IPath): boolean; // true if succeed
-      procedure Close;
-
+  IVideo = interface
+  ['{58DFC674-9168-41EA-B59D-A61307242B80}']
       procedure Play;
       procedure Pause;
       procedure Stop;
 
+      procedure SetLoop(Enable: boolean);
+      function GetLoop(): boolean;
+
       procedure SetPosition(Time: real);
       function GetPosition: real;
 
+      procedure GetFrame(Time: Extended);
+      procedure DrawGL(Screen: integer);
+
+      property Loop: boolean read GetLoop write SetLoop;
       property Position: real read GetPosition write SetPosition;
   end;
 
   IVideoPlayback = Interface( IGenericPlayback )
   ['{3574C40C-28AE-4201-B3D1-3D1F0759B131}']
-    function Init(): boolean;
-    function Finalize: boolean;
-
-    procedure GetFrame(Time: Extended); // WANT TO RENAME THESE TO BE MORE GENERIC
-    procedure DrawGL(Screen: integer);  // WANT TO RENAME THESE TO BE MORE GENERIC
+      function Init(): boolean;
+      function Finalize: boolean;
 
+      function Open(const FileName : IPath): IVideo;
   end;
 
   IVideoVisualization = Interface( IVideoPlayback )
@@ -370,6 +375,18 @@ type
       function  Finished: boolean;
       function  Length: real;
 
+      function Open(const Filename: IPath): boolean; // true if succeed
+      procedure Close;
+
+      procedure Play;
+      procedure Pause;
+      procedure Stop;
+
+      procedure SetPosition(Time: real);
+      function GetPosition: real;
+
+      property Position: real read GetPosition write SetPosition;
+
       // Sounds
       // TODO:
       // add a TMediaDummyPlaybackStream implementation that will
@@ -814,12 +831,6 @@ begin
   if (AudioInput <> nil) then
     AudioInput.CaptureStop;
 
-  if (VideoPlayback <> nil) then
-    VideoPlayback.Close;
-
-  if (Visualization <> nil) then
-    Visualization.Close;
-
   UnloadMediaModules();
 end;