Attached patch should fix problems with the tracknumber and year columns when
there is no associated data.
I'm not sure if the option for a track number column exists in fresh
installs/builds? As all the code for it seemed to have vanished??
Rob
_____
/ /\ Robert Hart
/ / \ [EMAIL PROTECTED]
/ / \ http://www.bath.ac.uk/~ab6rah
/ / /\ \
/ / / \ \ Ground Floor Flat
/ / /\ \ \ 2 Alexander Buildings
/ / / \ \ \ Bath
/ /__/____\ \ \ BA1 6AT
/ \ \ \
/________________\ \ \
\_____________________\ /
Index: freeamp/ui/musicbrowser/win32/include/Win32MusicBrowser.h
===================================================================
RCS file: /src/repository/freeamp/ui/musicbrowser/win32/include/Win32MusicBrowser.h,v
retrieving revision 1.91
diff -u -d -r1.91 Win32MusicBrowser.h
--- freeamp/ui/musicbrowser/win32/include/Win32MusicBrowser.h 2001/01/05 20:12:24
1.91
+++ freeamp/ui/musicbrowser/win32/include/Win32MusicBrowser.h 2001/01/17 20:53:19
@@ -66,7 +66,7 @@
#define IDC_TOOLBAR 13001
#define TOOLBAR_INDENT 8
-#define ALBUM_COLUMN "Album"
+#define ALBUM_COLUMN "Album"
#define ARTIST_COLUMN "Artist"
#define COMMENT_COLUMN "Comment"
#define GENRE_COLUMN "Genre"
@@ -74,6 +74,7 @@
#define TIME_COLUMN "Time"
#define TITLE_COLUMN "Title"
#define YEAR_COLUMN "Year"
+#define TRACK_COLUMN "Track"
bool operator<(const TreeData &A, const TreeData &b);
bool operator==(const TreeData &A, const TreeData &b);
Index: freeamp/ui/musicbrowser/win32/src/Event.cpp
===================================================================
RCS file: /src/repository/freeamp/ui/musicbrowser/win32/src/Event.cpp,v
retrieving revision 1.100
diff -u -d -r1.100 Event.cpp
--- freeamp/ui/musicbrowser/win32/src/Event.cpp 2001/01/05 20:12:24 1.100
+++ freeamp/ui/musicbrowser/win32/src/Event.cpp 2001/01/17 20:53:28
@@ -1680,6 +1680,10 @@
{
SendMessage(m_hWnd, WM_COMMAND, ID_SORT_LOCATION, 0);
}
+ else if (stricmp(columnText, TRACK_COLUMN) == 0)
+ {
+ SendMessage(m_hWnd, WM_COMMAND, ID_SORT_TRACK, 0);
+ }
break;
}
Index: freeamp/ui/musicbrowser/win32/src/PlaylistView.cpp
===================================================================
RCS file: /src/repository/freeamp/ui/musicbrowser/win32/src/PlaylistView.cpp,v
retrieving revision 1.67
diff -u -d -r1.67 PlaylistView.cpp
--- freeamp/ui/musicbrowser/win32/src/PlaylistView.cpp 2001/01/05 20:12:24 1.67
+++ freeamp/ui/musicbrowser/win32/src/PlaylistView.cpp 2001/01/17 20:53:35
@@ -263,16 +263,30 @@
else if ( stricmp( columnText, YEAR_COLUMN ) == 0 )
{
char buf[16];
- if (item->GetMetaData().Year() != 0)
+ //if (item->GetMetaData().Year() != 0)
{
int32 year = item->GetMetaData().Year();
if (year)
sprintf(buf, "%d", year );
else
- sprintf(buf, "Unknown");
+ sprintf(buf, "");
}
displayString = buf;
}
+ else if ( stricmp( columnText, TRACK_COLUMN ) == 0 )
+ {
+ char buf[16];
+ //if(item->GetMetaData().Track() != 0)
+ {
+ int32 track = item->GetMetaData().Track();
+ if(track)
+ sprintf(buf, "%d", track );
+ else
+ sprintf(buf, "");
+
+ displayString = buf;
+ }
+ }
else
{
displayString = "Unknown";
@@ -988,13 +1002,27 @@
else if ( stricmp( columnText, YEAR_COLUMN ) == 0 )
{
char buf[16];
- if(metadata.Year() != 0)
+ //if(metadata.Year() != 0)
{
int32 year = metadata.Year();
if(year)
sprintf(buf, "%d", year );
else
- sprintf(buf, "Unknown");
+ sprintf(buf, "");
+
+ text = buf;
+ }
+ }
+ else if ( stricmp( columnText, TRACK_COLUMN ) == 0 )
+ {
+ char buf[16];
+ //if(metadata.Track() != 0)
+ {
+ int32 track = metadata.Track();
+ if(track)
+ sprintf(buf, "%d", track );
+ else
+ sprintf(buf, "");
text = buf;
}
