[Kpod-devel] cvs_commit libqtpod/src itunesdbhelpers.include,1.10,1.11 track.cpp,1.12,1.13 track.h,1.11,1.12

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

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

Modified Files:
	itunesdbhelpers.include track.cpp track.h 
Log Message:
implemented more comparators + more Track::property getters/setters


Index: track.cpp
===================================================================
RCS file: /cvsroot/kpod/libqtpod/src/track.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** track.cpp	20 Mar 2006 22:57:43 -0000	1.12
--- track.cpp	21 Mar 2006 19:40:27 -0000	1.13
***************
*** 32,35 ****
--- 32,36 ----
  TrackComparators::ByArtist TrackComparators::BY_ARTISTONLY = TrackComparators::ByArtist();
  TrackComparators::ByAlbum TrackComparators::BY_ALBUMONLY = TrackComparators::ByAlbum();
+ TrackComparators::ByCategory TrackComparators::BY_CATEGORY = TrackComparators::ByCategory();
  TrackComparators::ByFiletype TrackComparators::BY_FILETYPE = TrackComparators::ByFiletype();
  TrackComparators::ByTrackLength TrackComparators::BY_TRACKLENGTH = TrackComparators::ByTrackLength();
***************
*** 44,47 ****
--- 45,50 ----
  TrackComparators::BySampleRate TrackComparators::BY_SAMPLERATE = TrackComparators::BySampleRate();
  TrackComparators::ByDateAdded TrackComparators::BY_DATEADDED = TrackComparators::ByDateAdded();
+ TrackComparators::ByDescriptionTxt TrackComparators::BY_DESCRIPTIONTXT =
+     TrackComparators::ByDescriptionTxt();
  TrackComparators::ByEqualizerSetting TrackComparators::BY_EQSETTING = TrackComparators::ByEqualizerSetting();
  TrackComparators::ByPlaycount TrackComparators::BY_PLAYCOUNT = TrackComparators::ByPlaycount();
***************
*** 86,90 ****
      m_recentlyPlayed( false )
  {
!     setFDesc( QString( "MPEG audio file" ) );    // hardwired for now
  }
  
--- 89,93 ----
      m_recentlyPlayed( false )
  {
!     setFileFormatDesc( QString( "MPEG audio file" ) );    // hardwired for now
  }
  
***************
*** 265,268 ****
--- 268,276 ----
  
  
+ const QString& Track::getCategory() const {
+     return getItemProperty( MHOD_CATEGORY );
+ }
+ 
+ 
  /*!
      \fn itunesdb::Track::getComment()
***************
*** 315,318 ****
--- 323,333 ----
  }
  
+ const QString& Track::getDescription() const {
+     return getItemProperty( itunesdb::MHOD_DESCRIPTION_TEXT );
+ }
+ 
+ const QString& Track::getFileFormatDesc() const {
+     return getItemProperty( itunesdb::MHOD_FDESC );
+ }
  
  Q_UINT32 Track::getNumMhod() const {
***************
*** 417,420 ****
--- 432,443 ----
  
  /*!
+ \fn Track::setCategory(QString& artist)
+  */
+ void Track::setCategory( const QString& category ) {
+     setItemProperty( category, itunesdb::MHOD_CATEGORY);
+ }
+ 
+ 
+ /*!
      \fn itunesdb::Track::setGenre(QString& genre)
   */
***************
*** 432,436 ****
  
  
! void Track::setFDesc( const QString& fdesc ) {
      setItemProperty( fdesc, itunesdb::MHOD_FDESC);
  }
--- 455,459 ----
  
  
! void Track::setFileFormatDesc( const QString& fdesc ) {
      setItemProperty( fdesc, itunesdb::MHOD_FDESC);
  }
***************
*** 440,443 ****
--- 463,469 ----
  }
  
+ void Track::setDescription( const QString& description_txt ) {
+     setItemProperty( description_txt, itunesdb::MHOD_DESCRIPTION_TEXT );
+ }
  
  void Track::setEqualizerSetting( const QString& eqSetting ) {

Index: itunesdbhelpers.include
===================================================================
RCS file: /cvsroot/kpod/libqtpod/src/itunesdbhelpers.include,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** itunesdbhelpers.include	19 Mar 2006 23:42:26 -0000	1.10
--- itunesdbhelpers.include	21 Mar 2006 19:40:27 -0000	1.11
***************
*** 97,104 ****
          case SORTORDER_RELEASE_DATE:
              return &itunesdb::TrackComparators::BY_RELEASEDATE;
-         case SORTORDER_BPM:
-         case SORTORDER_GROUPING:
          case SORTORDER_CATEGORY:
          case SORTORDER_DESCRIPTION:
              // TODO implement the above
          case SORTORDER_MANUAL:
--- 97,106 ----
          case SORTORDER_RELEASE_DATE:
              return &itunesdb::TrackComparators::BY_RELEASEDATE;
          case SORTORDER_CATEGORY:
+             return &itunesdb::TrackComparators::BY_CATEGORY;
          case SORTORDER_DESCRIPTION:
+             return &itunesdb::TrackComparators::BY_DESCRIPTIONTXT;
+         case SORTORDER_BPM:
+         case SORTORDER_GROUPING:
              // TODO implement the above
          case SORTORDER_MANUAL:

Index: track.h
===================================================================
RCS file: /cvsroot/kpod/libqtpod/src/track.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** track.h	20 Mar 2006 22:57:43 -0000	1.11
--- track.h	21 Mar 2006 19:40:27 -0000	1.12
***************
*** 59,62 ****
--- 59,68 ----
  
      /**
+      * Returns the category
+      * @return the category
+      */
+     virtual const QString& getCategory() const;
+ 
+     /**
       * Returns the comment set for the track
       * @return the comment
***************
*** 93,96 ****
--- 99,106 ----
      virtual const QString & getEqualizerSetting() const;
  
+     virtual const QString& getDescription() const;
+ 
+     virtual const QString& getFileFormatDesc() const;
+ 
      /**
       * Returns the DBID which refers to additional media associated to this track (like cover art)
***************
*** 170,179 ****
      virtual void setAlbum( const QString& album );
      virtual void setArtist( const QString& artist );
      virtual void setPath( const QString& encodedpath );
      virtual void setComment( const QString& comment );
      virtual void setCompilationFlag( unsigned char isCompilation );
      virtual void setGenre( const QString& genre );
      virtual void setTitle( const QString& title );
!     virtual void setFDesc( const QString& fdesc );
      virtual void setComposer( const QString& composer );
      virtual void setEqualizerSetting( const QString& eqSetting );
--- 180,191 ----
      virtual void setAlbum( const QString& album );
      virtual void setArtist( const QString& artist );
+     virtual void setCategory( const QString& category );
      virtual void setPath( const QString& encodedpath );
      virtual void setComment( const QString& comment );
      virtual void setCompilationFlag( unsigned char isCompilation );
+     virtual void setDescription( const QString& description_txt );
      virtual void setGenre( const QString& genre );
      virtual void setTitle( const QString& title );
!     virtual void setFileFormatDesc( const QString& fdesc );
      virtual void setComposer( const QString& composer );
      virtual void setEqualizerSetting( const QString& eqSetting );
***************
*** 200,217 ****
          setAlbum( provider.getAlbum() );
          setArtist( provider.getArtist() );
!         setTitle( provider.getTitle() );
          setComment( provider.getComment() );
          setComposer( provider.getComposer() );
          setGenre( provider.getGenre() );
!         setCompilationFlag( provider.getCompilationFlag() );
!         setYear( provider.getYear() );
!         setLastPlayed( provider.getLastPlayed() );
!         setPlayCount( provider.getPlayCount() );
!         setTrackNumber( provider.getTrackNumber() );
          setTrackCount( provider.getTrackCount() );
          setVolumeAdjust( provider.getVolumeAdjust() );
!         // virtual QString getFileFormatDesc() = 0; // TODO later
  
          // Track related technical stuff
          setRating( provider.getRating() );
          numcds = provider.getCdCount();
--- 212,232 ----
          setAlbum( provider.getAlbum() );
          setArtist( provider.getArtist() );
!         setCategory( provider.getCategory() );
          setComment( provider.getComment() );
+         setCompilationFlag( provider.getCompilationFlag() );
          setComposer( provider.getComposer() );
+         setDescription( provider.getDescription() );
+         setEqualizerSetting( provider.getEqualizerSetting() );
+         setFileFormatDesc(  provider.getFileFormatDesc() );
          setGenre( provider.getGenre() );
!         setTitle( provider.getTitle() );
          setTrackCount( provider.getTrackCount() );
+         setTrackNumber( provider.getTrackNumber() );
          setVolumeAdjust( provider.getVolumeAdjust() );
!         setYear( provider.getYear() );
  
          // Track related technical stuff
+         setLastPlayed( provider.getLastPlayed() );
+         setPlayCount( provider.getPlayCount() );
          setRating( provider.getRating() );
          numcds = provider.getCdCount();
***************
*** 296,299 ****
--- 311,319 ----
          }
      } BY_GENREONLY;
+     static class ByCategory : public TrackComparator {
+         virtual int compare( const itunesdb::Track& track1, const itunesdb::Track& track2 ) {
+             return track1.getCategory().localeAwareCompare( track2.getCategory() );
+         }
+     } BY_CATEGORY;
      static class ByComment : public TrackComparator {
          virtual int compare( const itunesdb::Track& track1, const itunesdb::Track& track2 ) {
***************
*** 311,314 ****
--- 331,339 ----
          }
      } BY_EQSETTING;
+     static class ByDescriptionTxt : public TrackComparator {
+         virtual int compare( const itunesdb::Track& track1, const itunesdb::Track& track2 ) {
+             return track1.getDescription().localeAwareCompare( track2.getDescription() );
+         }
+     } BY_DESCRIPTIONTXT;
      static class ByBitrate : public TrackComparator {
          virtual int compare( const itunesdb::Track& track1, const itunesdb::Track& track2 ) {