diff options
author | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2009-12-29 14:04:52 +0000 |
---|---|---|
committer | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2009-12-29 14:04:52 +0000 |
commit | 1b38db896c698b754ff145931e432f4f3ee05345 (patch) | |
tree | aa5cf670d668f7e53cb9432945e9bedb6296f8d2 /src | |
parent | b9848dd7f2a9b2de721176a4b777b8d06c53df27 (diff) | |
download | usdx-1b38db896c698b754ff145931e432f4f3ee05345.tar.gz usdx-1b38db896c698b754ff145931e432f4f3ee05345.tar.xz usdx-1b38db896c698b754ff145931e432f4f3ee05345.zip |
revert submission 2051. leeds to crash on 2nd song.
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2056 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'src')
-rw-r--r-- | src/base/UMusic.pas | 12 | ||||
-rw-r--r-- | src/media/UAudioPlaybackBase.pas | 4 | ||||
-rw-r--r-- | src/media/UMedia_dummy.pas | 4 | ||||
-rw-r--r-- | src/screens/UScreenSing.pas | 4 |
4 files changed, 12 insertions, 12 deletions
diff --git a/src/base/UMusic.pas b/src/base/UMusic.pas index e1184da8..5d816c9a 100644 --- a/src/base/UMusic.pas +++ b/src/base/UMusic.pas @@ -188,8 +188,8 @@ type end; type - ISyncSource = interface - function GetClock(): real; + TSyncSource = class + function GetClock(): real; virtual; abstract; end; TAudioProcessingStream = class; @@ -250,7 +250,7 @@ type TAudioPlaybackStream = class(TAudioProcessingStream) protected - SyncSource: ISyncSource; + SyncSource: TSyncSource; AvgSyncDiff: double; SourceStream: TAudioSourceStream; @@ -282,7 +282,7 @@ type procedure AddSoundEffect(Effect: TSoundEffect); virtual; abstract; procedure RemoveSoundEffect(Effect: TSoundEffect); virtual; abstract; - procedure SetSyncSource(SyncSource: ISyncSource); + procedure SetSyncSource(SyncSource: TSyncSource); function GetSourceStream(): TAudioSourceStream; property Status: TStreamStatus read GetStatus; @@ -364,7 +364,7 @@ type procedure SetLoop(Enabled: boolean); procedure FadeIn(Time: real; TargetVolume: single); - procedure SetSyncSource(SyncSource: ISyncSource); + procedure SetSyncSource(SyncSource: TSyncSource); procedure Rewind; function Finished: boolean; @@ -978,7 +978,7 @@ begin Result := SourceStream; end; -procedure TAudioPlaybackStream.SetSyncSource(SyncSource: ISyncSource); +procedure TAudioPlaybackStream.SetSyncSource(SyncSource: TSyncSource); begin Self.SyncSource := SyncSource; AvgSyncDiff := -1; diff --git a/src/media/UAudioPlaybackBase.pas b/src/media/UAudioPlaybackBase.pas index 228a438f..de2d5563 100644 --- a/src/media/UAudioPlaybackBase.pas +++ b/src/media/UAudioPlaybackBase.pas @@ -60,7 +60,7 @@ type procedure Stop; procedure FadeIn(Time: real; TargetVolume: single); - procedure SetSyncSource(SyncSource: ISyncSource); + procedure SetSyncSource(SyncSource: TSyncSource); procedure SetPosition(Time: real); function GetPosition: real; @@ -228,7 +228,7 @@ begin MusicStream.Position := Time; end; -procedure TAudioPlaybackBase.SetSyncSource(SyncSource: ISyncSource); +procedure TAudioPlaybackBase.SetSyncSource(SyncSource: TSyncSource); begin if assigned(MusicStream) then MusicStream.SetSyncSource(SyncSource); diff --git a/src/media/UMedia_dummy.pas b/src/media/UMedia_dummy.pas index c38a8e60..25e94724 100644 --- a/src/media/UMedia_dummy.pas +++ b/src/media/UMedia_dummy.pas @@ -62,7 +62,7 @@ type procedure SetPosition(Time: real); function GetPosition: real; - procedure SetSyncSource(SyncSource: ISyncSource); + procedure SetSyncSource(SyncSource: TSyncSource); procedure GetFrame(Time: Extended); procedure DrawGL(Screen: integer); @@ -156,7 +156,7 @@ begin Result := 0; end; -procedure TMedia_dummy.SetSyncSource(SyncSource: ISyncSource); +procedure TMedia_dummy.SetSyncSource(SyncSource: TSyncSource); begin end; diff --git a/src/screens/UScreenSing.pas b/src/screens/UScreenSing.pas index 0b7dfba4..20f3b15e 100644 --- a/src/screens/UScreenSing.pas +++ b/src/screens/UScreenSing.pas @@ -53,8 +53,8 @@ uses UTime; type - TLyricsSyncSource = class(TInterfacedObject,ISyncSource) - function GetClock(): real; + TLyricsSyncSource = class(TSyncSource) + function GetClock(): real; override; end; type |