made USDX function when file paths differ from previous expectations..

( most of the software was still using hard coded paths )

also added ability to have multiple song directories.

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

1 files changed, 151 insertions, 149 deletions

diff --git a/Game/Code/Classes/Ulazjpeg.pas b/Game/Code/Classes/Ulazjpeg.pas
index d63ce753..003e9ab0 100644
--- a/Game/Code/Classes/Ulazjpeg.pas
+++ b/Game/Code/Classes/Ulazjpeg.pas
@@ -1,149 +1,151 @@
-{ Copyright (C) 2003 Mattias Gaertner

-

-  This library is free software; you can redistribute it and/or modify it

-  under the terms of the GNU Library General Public License as published by

-  the Free Software Foundation; either version 2 of the License, or (at your

-  option) any later version.

-

-  This program is distributed in the hope that it will be useful, but WITHOUT

-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-  FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License

-  for more details.

-

-  You should have received a copy of the GNU Library General Public License

-  along with this library; if not, write to the Free Software Foundation,

-  Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

-}

-unit Ulazjpeg;

-

-{$mode objfpc}{$H+}

-{$I switches.inc}

-

-interface

-

-uses

-  SysUtils, Classes, FPImage, IntfGraphics, Graphics, FPReadJPEG, FPWriteJPEG;

-

-type

-  TJPEGQualityRange = TFPJPEGCompressionQuality;

-  TJPEGPerformance = TJPEGReadPerformance;

-

-  TJPEGImage = class(TFPImageBitmap)

-  private

-    FPerformance: TJPEGPerformance;

-    FProgressiveEncoding: boolean;

-    FQuality: TJPEGQualityRange;

-  protected

-{$IFDEF LAZARUS_V0924}

-    procedure InitFPImageReader(IntfImg: TLazIntfImage; ImgReader: TFPCustomImageReader); override;

-{$ELSE}

-    procedure InitFPImageReader(ImgReader: TFPCustomImageReader); override;

-{$ENDIF}

-    procedure FinalizeFPImageReader(ImgReader: TFPCustomImageReader); override;

-{$IFDEF LAZARUS_V0924}

-    procedure InitFPImageWriter(IntfImg: TLazIntfImage; ImgWriter: TFPCustomImageWriter); override;

-{$ELSE}

-    procedure InitFPImageWriter(ImgWriter: TFPCustomImageWriter); override;

-{$ENDIF}

-  public

-    constructor Create; override;

-    class function GetFileExtensions: string; override;

-    class function GetDefaultFPReader: TFPCustomImageReaderClass; override;

-    class function GetDefaultFPWriter: TFPCustomImageWriterClass; override;

-  public

-    property CompressionQuality: TJPEGQualityRange read FQuality write FQuality;

-    property ProgressiveEncoding: boolean read FProgressiveEncoding;

-    property Performance: TJPEGPerformance read FPerformance write FPerformance;

-  end;

-

-const

-  DefaultJPEGMimeType = 'image/jpeg';

-

-

-implementation

-

-

-{ TJPEGImage }

-

-{$IFDEF LAZARUS_V0924}

-procedure TJPEGImage.InitFPImageReader(IntfImg: TLazIntfImage; ImgReader: TFPCustomImageReader);

-{$ELSE}

-procedure TJPEGImage.InitFPImageReader(ImgReader: TFPCustomImageReader);

-{$ENDIF}

-var

-  JPEGReader: TFPReaderJPEG;

-begin

-  if ImgReader is TFPReaderJPEG then begin

-    JPEGReader:=TFPReaderJPEG(ImgReader);

-    JPEGReader.Performance:=Performance;

-{$IFDEF LAZARUS_V0924}

-    JPEGReader.OnProgress:=@Progress;

-{$ENDIF}

-  end;

-{$IFDEF LAZARUS_V0924}

-  inherited InitFPImageReader(IntfImg, ImgReader);

-{$ELSE}

-  inherited InitFPImageReader(ImgReader);

-{$ENDIF}

-end;

-

-procedure TJPEGImage.FinalizeFPImageReader(ImgReader: TFPCustomImageReader);

-var

-  JPEGReader: TFPReaderJPEG;

-begin

-  if ImgReader is TFPReaderJPEG then begin

-    JPEGReader:=TFPReaderJPEG(ImgReader);

-    FProgressiveEncoding:=JPEGReader.ProgressiveEncoding;

-  end;

-  inherited FinalizeFPImageReader(ImgReader);

-end;

-

-{$IFDEF LAZARUS_V0924}

-procedure TJPEGImage.InitFPImageWriter(IntfImg: TLazIntfImage; ImgWriter: TFPCustomImageWriter);

-{$ELSE}

-procedure TJPEGImage.InitFPImageWriter(ImgWriter: TFPCustomImageWriter);

-{$ENDIF}

-var

-  JPEGWriter: TFPWriterJPEG;

-begin

-  if ImgWriter is TFPWriterJPEG then begin

-    JPEGWriter:=TFPWriterJPEG(ImgWriter);

-    if JPEGWriter<>nil then ;

-    JPEGWriter.ProgressiveEncoding:=ProgressiveEncoding;

-    JPEGWriter.CompressionQuality:=CompressionQuality;

-{$IFDEF LAZARUS_V0924}

-    JPEGWriter.OnProgress:=@Progress;

-{$ENDIF}

-  end;

-{$IFDEF LAZARUS_V0924}

-  inherited InitFPImageWriter(IntfImg, ImgWriter);

-{$ELSE}

-  inherited InitFPImageWriter(ImgWriter);

-{$ENDIF}

-end;

-

-class function TJPEGImage.GetDefaultFPReader: TFPCustomImageReaderClass;

-begin

-  Result:=TFPReaderJPEG;

-end;

-

-class function TJPEGImage.GetDefaultFPWriter: TFPCustomImageWriterClass;

-begin

-  Result:=TFPWriterJPEG;

-end;

-

-constructor TJPEGImage.Create;

-begin

-  inherited Create;

-  FPerformance:=jpBestQuality;

-  FProgressiveEncoding:=false;

-  FQuality:=75;

-end;

-

-class function TJPEGImage.GetFileExtensions: string;

-begin

-  Result:='jpg;jpeg';

-end;

-

-end.

-

+{ Copyright (C) 2003 Mattias Gaertner
+
+  This library is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Library General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or (at your
+  option) any later version.
+
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License
+  for more details.
+
+  You should have received a copy of the GNU Library General Public License
+  along with this library; if not, write to the Free Software Foundation,
+  Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+}
+unit Ulazjpeg;
+
+{$mode objfpc}{$H+}
+{$I switches.inc}
+
+{$DEFINE LAZARUS_V0924}
+
+interface
+
+uses
+  SysUtils, Classes, FPImage, IntfGraphics, Graphics, FPReadJPEG, FPWriteJPEG;
+
+type
+  TJPEGQualityRange = TFPJPEGCompressionQuality;
+  TJPEGPerformance = TJPEGReadPerformance;
+
+  TJPEGImage = class(TFPImageBitmap)
+  private
+    FPerformance: TJPEGPerformance;
+    FProgressiveEncoding: boolean;
+    FQuality: TJPEGQualityRange;
+  protected
+{$IFDEF LAZARUS_V0924}
+    procedure InitFPImageReader(IntfImg: TLazIntfImage; ImgReader: TFPCustomImageReader); override;
+{$ELSE}
+    procedure InitFPImageReader(ImgReader: TFPCustomImageReader); override;
+{$ENDIF}
+    procedure FinalizeFPImageReader(ImgReader: TFPCustomImageReader); override;
+{$IFDEF LAZARUS_V0924}
+    procedure InitFPImageWriter(IntfImg: TLazIntfImage; ImgWriter: TFPCustomImageWriter); override;
+{$ELSE}
+    procedure InitFPImageWriter(ImgWriter: TFPCustomImageWriter); override;
+{$ENDIF}
+  public
+    constructor Create; override;
+    class function GetFileExtensions: string; override;
+    class function GetDefaultFPReader: TFPCustomImageReaderClass; override;
+    class function GetDefaultFPWriter: TFPCustomImageWriterClass; override;
+  public
+    property CompressionQuality: TJPEGQualityRange read FQuality write FQuality;
+    property ProgressiveEncoding: boolean read FProgressiveEncoding;
+    property Performance: TJPEGPerformance read FPerformance write FPerformance;
+  end;
+
+const
+  DefaultJPEGMimeType = 'image/jpeg';
+
+
+implementation
+
+
+{ TJPEGImage }
+
+{$IFDEF LAZARUS_V0924}
+procedure TJPEGImage.InitFPImageReader(IntfImg: TLazIntfImage; ImgReader: TFPCustomImageReader);
+{$ELSE}
+procedure TJPEGImage.InitFPImageReader(ImgReader: TFPCustomImageReader);
+{$ENDIF}
+var
+  JPEGReader: TFPReaderJPEG;
+begin
+  if ImgReader is TFPReaderJPEG then begin
+    JPEGReader:=TFPReaderJPEG(ImgReader);
+    JPEGReader.Performance:=Performance;
+{$IFDEF LAZARUS_V0924}
+    JPEGReader.OnProgress:=@Progress;
+{$ENDIF}
+  end;
+{$IFDEF LAZARUS_V0924}
+  inherited InitFPImageReader(IntfImg, ImgReader);
+{$ELSE}
+  inherited InitFPImageReader(ImgReader);
+{$ENDIF}
+end;
+
+procedure TJPEGImage.FinalizeFPImageReader(ImgReader: TFPCustomImageReader);
+var
+  JPEGReader: TFPReaderJPEG;
+begin
+  if ImgReader is TFPReaderJPEG then begin
+    JPEGReader:=TFPReaderJPEG(ImgReader);
+    FProgressiveEncoding:=JPEGReader.ProgressiveEncoding;
+  end;
+  inherited FinalizeFPImageReader(ImgReader);
+end;
+
+{$IFDEF LAZARUS_V0924}
+procedure TJPEGImage.InitFPImageWriter(IntfImg: TLazIntfImage; ImgWriter: TFPCustomImageWriter);
+{$ELSE}
+procedure TJPEGImage.InitFPImageWriter(ImgWriter: TFPCustomImageWriter);
+{$ENDIF}
+var
+  JPEGWriter: TFPWriterJPEG;
+begin
+  if ImgWriter is TFPWriterJPEG then begin
+    JPEGWriter:=TFPWriterJPEG(ImgWriter);
+    if JPEGWriter<>nil then ;
+    JPEGWriter.ProgressiveEncoding:=ProgressiveEncoding;
+    JPEGWriter.CompressionQuality:=CompressionQuality;
+{$IFDEF LAZARUS_V0924}
+    JPEGWriter.OnProgress:=@Progress;
+{$ENDIF}
+  end;
+{$IFDEF LAZARUS_V0924}
+  inherited InitFPImageWriter(IntfImg, ImgWriter);
+{$ELSE}
+  inherited InitFPImageWriter(ImgWriter);
+{$ENDIF}
+end;
+
+class function TJPEGImage.GetDefaultFPReader: TFPCustomImageReaderClass;
+begin
+  Result:=TFPReaderJPEG;
+end;
+
+class function TJPEGImage.GetDefaultFPWriter: TFPCustomImageWriterClass;
+begin
+  Result:=TFPWriterJPEG;
+end;
+
+constructor TJPEGImage.Create;
+begin
+  inherited Create;
+  FPerformance:=jpBestQuality;
+  FProgressiveEncoding:=false;
+  FQuality:=75;
+end;
+
+class function TJPEGImage.GetFileExtensions: string;
+begin
+  Result:='jpg;jpeg';
+end;
+
+end.
+