From 4063388c8b0df5be7b1877d32e89723aae612618 Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sat, 30 Oct 2010 07:52:56 +0000
Subject: ffmpeg audio converter renamed
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2698 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
mediaplugin/src/media/UAudioConverter.pas | 14 +++++++-------
mediaplugin/src/media/UAudioPlayback_SoftMixer.pas | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/mediaplugin/src/media/UAudioConverter.pas b/mediaplugin/src/media/UAudioConverter.pas
index f2388b8f..7826c265 100644
--- a/mediaplugin/src/media/UAudioConverter.pas
+++ b/mediaplugin/src/media/UAudioConverter.pas
@@ -74,7 +74,7 @@ type
end;
{$IFDEF UseFFmpegResample}
- TAudioConverter_FFmpeg = class(TAudioConverter)
+ TAudioConverterPlugin = class(TAudioConverter)
private
fPluginInfo: PMediaPluginInfo;
fAudioConverter: PAudioConverterInfo;
@@ -209,7 +209,7 @@ const
function Plugin_register(core: PMediaPluginCore): PMediaPluginInfo;
cdecl; external ffmpegPlugin;
-function TAudioConverter_FFmpeg.Init(SrcFormatInfo: TAudioFormatInfo; DstFormatInfo: TAudioFormatInfo): boolean;
+function TAudioConverterPlugin.Init(SrcFormatInfo: TAudioFormatInfo; DstFormatInfo: TAudioFormatInfo): boolean;
var
CSrcFormatInfo: TCAudioFormatInfo;
CDstFormatInfo: TCAudioFormatInfo;
@@ -226,32 +226,32 @@ begin
fStream := fAudioConverter.open(@CSrcFormatInfo, @CDstFormatInfo);
if (fStream = nil) then
begin
- Log.LogError('fAudioConverter.open() failed', 'TAudioConverter_FFmpeg.Init');
+ Log.LogError('fAudioConverter.open() failed', 'TAudioConverterPlugin.Init');
Exit;
end;
Result := true;
end;
-destructor TAudioConverter_FFmpeg.Destroy();
+destructor TAudioConverterPlugin.Destroy();
begin
if (fStream <> nil) then
fAudioConverter.close(fStream);
inherited;
end;
-function TAudioConverter_FFmpeg.Convert(InputBuffer: PByteArray; OutputBuffer: PByteArray; var InputSize: integer): integer;
+function TAudioConverterPlugin.Convert(InputBuffer: PByteArray; OutputBuffer: PByteArray; var InputSize: integer): integer;
begin
Result := fAudioConverter.convert(fStream,
PCuint8(InputBuffer), PCuint8(OutputBuffer), @InputSize);
end;
-function TAudioConverter_FFmpeg.GetOutputBufferSize(InputSize: integer): integer;
+function TAudioConverterPlugin.GetOutputBufferSize(InputSize: integer): integer;
begin
Result := fAudioConverter.getOutputBufferSize(fStream, InputSize);
end;
-function TAudioConverter_FFmpeg.GetRatio(): double;
+function TAudioConverterPlugin.GetRatio(): double;
begin
Result := fAudioConverter.getRatio(fStream);
end;
diff --git a/mediaplugin/src/media/UAudioPlayback_SoftMixer.pas b/mediaplugin/src/media/UAudioPlayback_SoftMixer.pas
index 11df4df5..b8148b4a 100644
--- a/mediaplugin/src/media/UAudioPlayback_SoftMixer.pas
+++ b/mediaplugin/src/media/UAudioPlayback_SoftMixer.pas
@@ -434,7 +434,7 @@ begin
// TODO: selection should not be done here, use a factory (TAudioConverterFactory) instead
{$IF Defined(UseFFmpegResample)}
- Converter := TAudioConverter_FFmpeg.Create();
+ Converter := TAudioConverterPlugin.Create();
{$ELSEIF Defined(UseSRCResample)}
Converter := TAudioConverter_SRC.Create();
{$ELSE}
--
cgit v1.2.3