[Kpod-devel] ipodslave/src itunesdb.h,1.22,1.23 itunesdb.cpp,1.35,1.36

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

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

Modified Files:
	itunesdb.h itunesdb.cpp 
Log Message:
fixed issue when podcasts data set is _before_ the playlist data set


Index: itunesdb.h
===================================================================
RCS file: /cvsroot/kpod/ipodslave/src/itunesdb.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** itunesdb.h	2 Dec 2005 07:57:57 -0000	1.22
--- itunesdb.h	8 Jan 2006 16:29:09 -0000	1.23
***************
*** 252,256 ****
      QDateTime timestamp;
  
!     uint numDataSets;
      bool hasPodcastsFlag;
  };
--- 252,256 ----
      QDateTime timestamp;
  
!     uint currentDataSet;    // refelcts the current dataset while parsing the itunesdb
      bool hasPodcastsFlag;
  };

Index: itunesdb.cpp
===================================================================
RCS file: /cvsroot/kpod/ipodslave/src/itunesdb.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** itunesdb.cpp	8 Dec 2005 21:29:31 -0000	1.35
--- itunesdb.cpp	8 Jan 2006 16:29:10 -0000	1.36
***************
*** 64,68 ****
      m_recentlyPlayed(NULL),
      playlistiterator(playlistmap),
!     numDataSets( 0 ),
      hasPodcastsFlag( false )
  {
--- 64,68 ----
      m_recentlyPlayed(NULL),
      playlistiterator(playlistmap),
!     currentDataSet( 0 ),
      hasPodcastsFlag( false )
  {
***************
*** 263,267 ****
      error= QString::null;
      changed= true;
!     numDataSets = 0;
  }
  
--- 263,267 ----
      error= QString::null;
      changed= true;
!     currentDataSet = 0;
  }
  
***************
*** 406,409 ****
--- 406,414 ----
  
  void ITunesDB::handlePlaylist(const Playlist& playlist) {
+     if ( currentDataSet == 3 ) {
+         hasPodcastsFlag |= playlist.getNumTracks();
+         return; // can't handle podcasts at the moment
+     }
+ 
      // TODO find out another way to find out if this is the mainlist (maybe a handleMainlist() or have some state thingy
      if ( mainlist.getTitle().isEmpty() ) {
***************
*** 416,424 ****
      }
  
-     if ( numDataSets > 2 ) {
-         hasPodcastsFlag |= playlist.getNumTracks();
-         return; // can't handle podcasts at the moment
-     }
- 
      TrackList * pTracklist = new TrackList( playlist);
  
--- 421,424 ----
***************
*** 444,449 ****
  }
  
! void ITunesDB::handleDataSet( Q_UINT32 ) {
!     ++numDataSets;
  }
  
--- 444,449 ----
  }
  
! void ITunesDB::handleDataSet( Q_UINT32 type ) {
!     currentDataSet = type;
  }