Fixed some tagging problems found by Peter.

AThomsen · Jan 7, 2011 · 212b4f9 · 212b4f9
1 parent 84a7902
commit 212b4f9
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 12 deletions.
diff --git a/src/MainForm.pas b/src/MainForm.pas
@@ -7507,7 +7507,7 @@ function ProcessId3v2Pictures(id3v2: TMyID3Controller): PCoverRec;
 
                 for x:=0 to id3v2SimpleListFrame.List.Count-1 do
                 begin
-                  genreIndex := getGenreID(id3v2SimpleListFrame.List[x]);
+                  genreIndex := getGenreID(GenreToNiceGenre(id3v2SimpleListFrame.List[x]));
                   if genreIndex >= 0 then
                   begin
                     b := false;
@@ -20832,7 +20832,7 @@ function match(v1Value: String; v2FrameId: TJvID3FrameID; len: Integer): Boolean
           b2 := false;	// check if a valid v1 genre
 	        for i:=0 to id3LstFrm.List.Count-1 do
           begin
-            id := GetGenreID(id3LstFrm.List[i]);
+            id := GetGenreID(GenreToNiceGenre(id3LstFrm.List[i]));
 	        	b1 := b1 or (Fid3v1.GenreID = id);
             b2 := b2 or (id <= MAXGENRES)
           end;
@@ -31469,7 +31469,7 @@ function Bitmap32ToJpeg(bm32: TBitmap32): TJpegImage;
               resampler := TKernelResampler.Create();
               TKernelResampler(resampler).Kernel := TLanczosKernel.Create();
               StretchTransfer(bm1, bm1.BoundsRect, bm1.BoundsRect, bm2, bm2.BoundsRect, resampler, dmOpaque);	//sfMitchell - Lanczos er bedst :)
-              TKernelResampler(resampler).Kernel.Free;
+//              TKernelResampler(resampler).Kernel.Free;
               resampler.Free;
 
               bm2.Free;

diff --git a/src/TagEditor.pas b/src/TagEditor.pas
@@ -2922,8 +2922,10 @@ function GetYear(dt: TDateTime): word;
         SetLength(sDblArr, 0);
 				for i:=0 to id3v2.Frames.Count-1 do
         begin
-        	s := id3v2.Frames[i].FrameName;
-         	if Q_SameTextL(s, 'T', 1) and not IsId3v2Control(s, self) and (id3v2.Frames[i].FrameID <> fiRecordingTime) then
+          id3Frame := id3v2.Frames[i];
+        	s := id3Frame.FrameName;
+         	if Q_SameTextL(s, 'T', 1) and not IsId3v2Control(s, self) and (id3Frame.FrameID <> fiRecordingTime) and
+            ((id3Frame is TJvId3UserFrame) or (id3Frame is TJvId3CustomTextFrame)) then
           begin
           	SetLength(sDblArr, length(sDblArr)+1);
             SetLength(sDblArr[length(sDblArr)-1], 3);

diff --git a/src/gen_mexp.cfg b/src/gen_mexp.cfg
@@ -6,7 +6,7 @@
 -$F-
 -$G+
 -$H+
--$I-
+-$I+
 -$J-
 -$K-
 -$L-

diff --git a/src/gen_mexp.dof b/src/gen_mexp.dof
@@ -9,7 +9,7 @@ E=0
 F=0
 G=1
 H=1
-I=0
+I=1
 J=0
 K=0
 L=0
@@ -95,7 +95,7 @@ UnitOutputDir=
 PackageDLLOutputDir=
 PackageDCPOutputDir=
 SearchPath=C:\download\JVCL34~1\jcl\lib\d7\debug;lib;lib\winamp;lib\controls;lib\audio;lib\MEXP controls
-Packages=Vcl50;Vclx50;Vcldb50;VclSmp50;vclado50;ibevnt50;Vclbde50;vcldbx50;Qrpt50;TeeUI50;TeeDB50;Tee50;Dss50;TeeQR50;VCLIB50;Vclmid50;vclie50;Inetdb50;Inet50;NMFast50;webmid50;dclocx50;dclaxserver50;BMThreadPack;DJCL50;RxBDE5;Indy50;vcl;rtl;vclactnband
+Packages=Vcl50;Vclx50;Vcldb50;VclSmp50;vclado50;ibevnt50;Vclbde50;vcldbx50;Qrpt50;TeeUI50;TeeDB50;Tee50;Dss50;TeeQR50;VCLIB50;Vclmid50;vclie50;Inetdb50;Inet50;NMFast50;webmid50;dclocx50;dclaxserver50;BMThreadPack;DJCL50;RxBDE5;Indy50;vcl;rtl;vclactnband;VirtualTreesD7
 Conditionals=
 DebugSourceDirs=
 UsePackages=0
@@ -134,15 +134,14 @@ OriginalFilename=
 ProductName=
 ProductVersion=1.0.0.0
 Comments=
-[Excluded Packages]
-c:\programmer\borland\delphi7\Projects\Bpl\VirtualTreesD7D.bpl=Virtual Treeview design time package
 [HistoryLists\hlUnitAliases]
 Count=1
 Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
 [HistoryLists\hlSearchPath]
-Count=2
+Count=3
 Item0=C:\download\JVCL34~1\jcl\lib\d7\debug;lib;lib\winamp;lib\controls;lib\audio;lib\MEXP controls
-Item1=$(DELPHI)\Lib\Debug;C:\download\JVCL34~1\jcl\lib\d7\debug;lib;lib\winamp;lib\controls;lib\audio;lib\MEXP controls
+Item1=$(DELPHI)\Lib\Debug;C:\download\JCL-22~1.388\lib\d7\debug;C:\download\JVCL34~1\jcl\lib\d7\debug;lib;lib\winamp;lib\controls;lib\audio;lib\MEXP controls
+Item2=$(DELPHI)\Lib\Debug;C:\download\JVCL34~1\jcl\lib\d7\debug;lib;lib\winamp;lib\controls;lib\audio;lib\MEXP controls
 [HistoryLists\hlOutputDirectorry]
 Count=1
 Item0=C:\Programmer\Winamp\Plugins

diff --git a/src/lib/audio/MyId3v2Base.pas b/src/lib/audio/MyId3v2Base.pas
@@ -7248,6 +7248,9 @@ procedure TJvID3SimpleListFrame.ListChanged(Sender: TObject);
 
 procedure TJvID3SimpleListFrame.SetText(const ANewText: WideString);
 begin
+  // remove old values (added for mexp 0.1.1)
+  List.Clear;
+
   if FixedStringLength >= 0 then
     ExtractFixedStrings(ANewText, FixedStringLength, List)
   else
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,7 @@ @@
     -$F-
     -$G+
     -$H+
-    -$I-
+    -$I+
     -$J-
     -$K-
     -$L-
@@ Expand Down @@