[Kpod-devel] cvs_commit libqtpod/src track.h, 1.76, 1.77 track.cpp, 1.73, 1.74

[Michael S. <fr...@us...>]

Update of /cvsroot/kpod/libqtpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv660/src

Modified Files:
	track.h track.cpp 
Log Message:
setArtwork info plus some comparator case sense fixes

Index: track.cpp
===================================================================
RCS file: /cvsroot/kpod/libqtpod/src/track.cpp,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** track.cpp	21 Dec 2007 11:39:59 -0000	1.73
--- track.cpp	28 Dec 2007 11:41:40 -0000	1.74
***************
*** 66,70 ****
  class TrackComparators::ByArtistField : public TrackComparator {
      virtual int compare( const itunesdb::Track& track1, const itunesdb::Track& track2 ) const {
!         return track1.getArtist().localeAwareCompare( track2.getArtist() );
      }
  };
--- 66,70 ----
  class TrackComparators::ByArtistField : public TrackComparator {
      virtual int compare( const itunesdb::Track& track1, const itunesdb::Track& track2 ) const {
!         return track1.getArtist().lower().localeAwareCompare( track2.getArtist().lower() );
      }
  };
***************
*** 72,76 ****
  class TrackComparators::ByAlbumArtist : public TrackComparator {
      virtual int compare( const itunesdb::Track& track1, const itunesdb::Track& track2 ) const {
!         return track1.getAlbumArtist().localeAwareCompare( track2.getAlbumArtist() );
      }
  };
--- 72,76 ----
  class TrackComparators::ByAlbumArtist : public TrackComparator {
      virtual int compare( const itunesdb::Track& track1, const itunesdb::Track& track2 ) const {
!         return track1.getAlbumArtist().lower().localeAwareCompare( track2.getAlbumArtist().lower() );
      }
  };
***************
*** 1324,1327 ****
--- 1324,1334 ----
  
  
+ void Track::setArtworkInfo( Q_UINT16 artworkCount, Q_UINT32 artworkSize ) {
+     mArtworkCount = artworkCount;
+     mArtworkSize = artworkSize;
+     mHasArtwork = artworkCount && artworkSize;
+ }
+ 
+ 
  void Track::doneAddingData() {
      // some checks

Index: track.h
===================================================================
RCS file: /cvsroot/kpod/libqtpod/src/track.h,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** track.h	21 Dec 2007 11:39:59 -0000	1.76
--- track.h	28 Dec 2007 11:41:40 -0000	1.77
***************
*** 552,555 ****
--- 552,561 ----
      
      Q_UINT16 getAlbumID() const { return mAlbumID; }
+     
+     void setArtworkInfo( Q_UINT16 artworkCount, Q_UINT32 artworkSize );
+     
+     Q_UINT32 getArtworkSize() const { return mArtworkSize; }
+     
+     Q_UINT16 getArtworkCount() const { return mArtworkCount; } 
  
      /**
***************
*** 587,590 ****
--- 593,597 ----
          setSeasonNumber( provider.getSeasonNumber() );
          setEpisodeNumber( provider.getEpisodeNumber() );
+         setArtworkInfo( provider.getArtworkCount(), provider.getArtworkSize() );
  
          // Track related technical stuff