[Kpod-devel] ipodslave/src ipodslave.cpp,1.71,1.72

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

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

Modified Files:
	ipodslave.cpp 
Log Message:
emitting totalSize for listDir

Index: ipodslave.cpp
===================================================================
RCS file: /cvsroot/kpod/ipodslave/src/ipodslave.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** ipodslave.cpp	25 Nov 2005 20:42:58 -0000	1.71
--- ipodslave.cpp	25 Nov 2005 21:43:46 -0000	1.72
***************
*** 288,291 ****
--- 288,292 ----
  void kio_ipodslaveProtocol::listDir(const KURL &url)
  {
+     // TODO emit ERR_CANNOT_ENTER_DIRECTORY when unable to List
      kdDebug() << "ipodslave::listDir()" << url.path() << endl;
      DirectoryModel dirmodel( url);
***************
*** 318,321 ****
--- 319,323 ----
              return;
          }
+         totalSize( ipods.count() );
          for ( QPtrList<IPod>::iterator iter = ipods.begin(); iter != ipods.end(); ++iter ) {
              IPod * toList = *iter;
***************
*** 329,332 ****
--- 331,335 ----
          uint currentTime = dirmodel.isFile ? 0 : QDateTime::currentDateTime().toTime_t();
          // list categories
+         totalSize( DirectoryModel::NumCategories );
          for ( int cat = DirectoryModel::Artists; cat < DirectoryModel::NumCategories; ++cat ) {
              direntry.clear();
***************
*** 348,351 ****
--- 351,355 ----
                  return;
              }
+             totalSize( artists.count() );
              uint currentTime = dirmodel.isFile ? 0 : QDateTime::currentDateTime().toTime_t();
              for( QStringList::iterator artistiterator= artists.begin(); artistiterator!= artists.end(); ++artistiterator) {
***************
*** 376,379 ****
--- 380,384 ----
                  return;
              }
+             totalSize( playlisttitles.count() );
              uint currentTime = dirmodel.isFile ? 0 : QDateTime::currentDateTime().toTime_t();
              for(QStringList::iterator iter = playlisttitles.begin(); iter != playlisttitles.end(); ++iter) {
***************
*** 393,396 ****
--- 398,402 ----
          case DirectoryModel::Utilites: {
              // list utilities
+             totalSize( utilitymap.count() );
              UtilityMap::iterator utility_it= utilitymap.begin();
              for( ; utility_it!= utilitymap.end(); ++utility_it) {
***************
*** 402,405 ****
--- 408,412 ----
              break;
          case DirectoryModel::Transfer:
+             totalSize( 0 );
              break;
          default:
***************
*** 417,420 ****
--- 424,428 ----
          }
          int tracknum= 0;
+         totalSize( playlist->getNumTracks() );
          unsigned short trackdigits= (unsigned short)log10( playlist->getNumTracks())+ 1;
          TrackList::Iterator trackiterator = playlist->getTrackIDs();
***************
*** 443,446 ****
--- 451,455 ----
              error( ERR_DOES_NOT_EXIST, dirmodel.getFilename());
          } else {
+             totalSize( artist->count() );
              uint currentTime = dirmodel.isFile ? 0 : QDateTime::currentDateTime().toTime_t();
              for( ArtistIterator albumiterator(*artist); albumiterator.current(); ++albumiterator) {
***************
*** 457,460 ****
--- 466,470 ----
          if (album != NULL) {
              int tracknum= 0;
+             totalSize( album->getNumTracks() );
              unsigned short trackdigits= (unsigned short)log10( album->getMaxTrackNumber())+ 1;
              TrackList::Iterator trackiterator= album->getTrackIDs();