jvcllaz: Add TJvID3v2 (mp3 tags). Add demos for TJvID3v1 and TJvID3v2.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6299 8e941d3f-bd1b-0410-a28a-d453659cc2b4

components/jvcllaz/run/JvCore/JvJCLUtils.pas

@@ -66,6 +66,8 @@ const
   USDecimalSeparator = '.';
 
   WideNull = WideChar(#0);
+  BOM_LSB_FIRST = WideChar($FEFF);
+  BOM_MSB_FIRST = WideChar($FFFE);
 
 (******************** NOT CONVERTED
 {$IFDEF UNIX}
@@ -1203,6 +1205,9 @@ function ReverseBytes(Value: Word): Word; overload; // taken from JclLogic
 function ReverseBytes(Value: Integer): Integer; overload;
 function ReverseBytes(Value: Cardinal): Cardinal; overload;
 
+function BEtoN(const AValue: WideString): WideString; overload;
+function NtoBE(const AValue: WideString): WideString; overload;
+
 // taken from JclFileUtils
 function FindUnusedFileName(FileName: string; const FileExt: string; NumberPrefix: string = ''): string;
 
@@ -9788,6 +9793,35 @@ begin
   Result := (Value shr 24) or (Value shl 24) or ((Value and $00FF0000) shr 8) or ((Value and $0000FF00) shl 8);
 end;
 
+// from fpexif
+function BEtoN(const AValue: WideString): WideString;
+{$IFNDEF ENDIAN_BIG}
+var
+  i: Integer;
+{$ENDIF}
+begin
+  {$IFDEF ENDIAN_BIG}
+  Result := AValue;
+  {$ELSE}
+  SetLength(Result, Length(AValue));
+  for i:=1 to Length(AValue) do
+    Result[i] := WideChar(BEToN(PDWord(@AValue[i])^));
+  {$ENDIF}
+end;
+
+function NtoBE(const AValue: WideString): WideString;
+var
+  i: Integer;
+begin
+  {$IFDEF ENDIAN_BIG}
+  Result := AValue;
+  {$ELSE}
+  SetLength(Result, Length(AValue));
+  for i:=1 to Length(AValue) do
+    Result[i] := WideChar(NtoBE(PDWord(@AValue[i])^));
+  {$ENDIF}
+end;
+
 // from JclLogic
 function ReverseBytes(Value: Cardinal): Cardinal;
 begin

components/jvcllaz/run/JvMM/JvId3v1.pas

@@ -47,11 +47,11 @@ type
 
   TJvID3v1 = class(TComponent)   //TJvComponent)
   private
-    FSongName: AnsiString;
-    FArtist: AnsiString;
-    FAlbum: AnsiString;
-    FComment: AnsiString;
-    FYear: AnsiString;
+    FSongName: String;
+    FArtist: String;
+    FAlbum: String;
+    FComment: String;
+    FYear: String;
     FGenre: Byte;
     FFileName: TFileName;
     FActive: Boolean;
@@ -82,11 +82,11 @@ type
     property Active: Boolean read FActive write SetActive;
     property FileName: TFileName read FFileName write SetFileName;
     { Do not store dummies }
-    property SongName: AnsiString read FSongName write FSongName stored False;
-    property Artist: AnsiString read FArtist write FArtist stored False;
-    property Album: AnsiString read FAlbum write FAlbum stored False;
-    property Year: AnsiString read FYear write FYear stored False;
-    property Comment: AnsiString read FComment write FComment stored False;
+    property SongName: String read FSongName write FSongName stored False;
+    property Artist: String read FArtist write FArtist stored False;
+    property Album: String read FAlbum write FAlbum stored False;
+    property Year: String read FYear write FYear stored False;
+    property Comment: String read FComment write FComment stored False;
     property Genre: Byte read FGenre write FGenre stored False;
     property GenreAsString: string read GetGenreAsString write SetGenreAsString stored False;
     property AlbumTrack: Byte read FAlbumTrack write FAlbumTrack stored False;
@@ -101,7 +101,7 @@ function WriteID3v1Tag(const AFileName: string; const ATag: TID3v1Tag): Boolean;
 implementation
 
 uses
-  Math,
+  Math, LConvEncoding,
   JvId3v2Types, JvTypes, JvResources;
 
 const
@@ -110,6 +110,7 @@ const
   CTagSize = 128;
   CTagIDSize = 3;
 
+
 //=== Global procedures ======================================================
 
 function HasID3v1Tag(const AFileName: string): Boolean;
@@ -196,6 +197,7 @@ begin
   end;
 end;
 
+
 //=== Local procedures =======================================================
 
 procedure AnsiStringToPAnsiChar(const Source: AnsiString; Dest: PAnsiChar; const MaxLength: Integer);
@@ -215,6 +217,7 @@ begin
   SetString(Result, Q, P - Q);
 end;
 
+
 //=== { TJvID3v1 } ===========================================================
 
 procedure TJvID3v1.Loaded;
@@ -249,11 +252,11 @@ begin
 
   // Set new Tag
   Move(CID3v1Tag[0], lTag.Identifier[0], 3);
-  AnsiStringToPAnsiChar(SongName, @lTag.SongName, 30);
-  AnsiStringToPAnsiChar(Artist, @lTag.Artist, 30);
-  AnsiStringToPAnsiChar(Album, @lTag.Album, 30);
+  AnsiStringToPAnsiChar(UTF8ToISO_8859_1(SongName), @lTag.SongName, 30);
+  AnsiStringToPAnsiChar(UTF8ToISO_8859_1(Artist), @lTag.Artist, 30);
+  AnsiStringToPAnsiChar(UTF8ToISO_8859_1(Album), @lTag.Album, 30);
   AnsiStringToPAnsiChar(Year, @lTag.Year, 4);
-  AnsiStringToPAnsiChar(Comment, @lTag.Comment, 30);
+  AnsiStringToPAnsiChar(UTF8ToISO_8859_1(Comment), @lTag.Comment, 30);
   lTag.Genre := FGenre;
   if lTag.Comment[28] = #0 then
     lTag.Comment[29] := AnsiChar(FAlbumTrack);
@@ -322,11 +325,11 @@ begin
 
   if Result then
   begin
-    FSongName := PAnsiCharToAnsiString(@lTag.SongName, 30);
-    FArtist := PAnsiCharToAnsiString(@lTag.Artist, 30);
-    FAlbum := PAnsiCharToAnsiString(@lTag.Album, 30);
+    FSongName := ISO_8859_1ToUTF8(PAnsiCharToAnsiString(@lTag.SongName, 30));
+    FArtist := ISO_8859_1ToUTF8(PAnsiCharToAnsiString(@lTag.Artist, 30));
+    FAlbum := ISO_8859_1ToUTF8(PAnsiCharToAnsiString(@lTag.Album, 30));
     FYear := PAnsiCharToAnsiString(@lTag.Year, 4);
-    FComment := PAnsiCharToAnsiString(@lTag.Comment, 30);
+    FComment := ISO_8859_1ToUTF8(PAnsiCharToAnsiString(@lTag.Comment, 30));
     // (p3) missing genre added
     FGenre := lTag.Genre;
     if lTag.Comment[28] = #0 then