Changeset 7454

Timestamp:

Dec 21, 2008, 8:02:21 PM (12 years ago)

Author:

charles

Message:

(trunk wx) get the wx client mostly building again.

Location:

trunk/wx

Files:

• filter.cc (modified) (2 diffs)
• speed-stats.cc (modified) (2 diffs)
• torrent-list.cc (modified) (6 diffs)
• xmission.cc (modified) (6 diffs)

trunk/wx/filter.cc

@@ -28 +28 @@
     const tr_stat * s = tr_torrentStat( (tr_torrent*)tor );
 
-    switch( s->status )
+    switch( s->activity )
     {
         case TR_STATUS_DOWNLOAD:
@@ -44 +44 @@
     }
 
-    flags |= ( ( s->rateUpload + s->rateDownload ) > 0.01 )
+    flags |= ( ( s->pieceUploadSpeed + s->pieceDownloadSpeed ) > 0.01 )
         ? FLAG_ACTIVE
         : FLAG_IDLE;

trunk/wx/speed-stats.cc

@@ -214 +214 @@
 {
     // add a new record
-    float allUp, allDown;
-    tr_sessionGetSpeed( handle, &allDown, &allUp );
+    const double allUp   = tr_sessionGetPieceSpeed( handle, TR_UP );
+    const double allDown = tr_sessionGetPieceSpeed( handle, TR_DOWN );
     Speed s;
     s.time = time( NULL );
@@ -222 +222 @@
     if( myTorrent ) {
         const tr_stat * stat = tr_torrentStat( myTorrent );
-        s.torrentUp = stat->rateUpload;
-        s.torrentDown = stat->rateDownload;
+        s.torrentUp = stat->pieceUploadSpeed;
+        s.torrentDown = stat->pieceDownloadSpeed;
     }
     myStats.push_back( s );

trunk/wx/torrent-list.cc

@@ -249 +249 @@
 
             case COL_DOWNLOAD_SPEED:
-                if( s->rateDownload > 0.01 )
-                    xstr = getReadableSpeed( s->rateDownload );
+                if( s->pieceDownloadSpeed > 0.01 )
+                    xstr = getReadableSpeed( s->pieceDownloadSpeed );
                 else
                     xstr.Clear( );
@@ -305 +305 @@
             case COL_STATE: /* FIXME: divine the meaning of these two columns */
             case COL_STATUS:
-                switch( s->status ) {
+                switch( s->activity ) {
                     case TR_STATUS_STOPPED:     xstr = _("Stopped"); break;
                     case TR_STATUS_CHECK:       xstr = wxString::Format ( _("Checking Files (%.0f)"), s->recheckProgress );  break;
@@ -320 +320 @@
 
             case COL_UPLOAD_SPEED:
-                if( s->rateUpload > 0.01 )
-                    xstr = getReadableSpeed( s->rateUpload );
+                if( s->pieceUploadSpeed > 0.01 )
+                    xstr = getReadableSpeed( s->pieceUploadSpeed );
                 else
                     xstr.Clear( );
@@ -421 +421 @@
 
         case COL_DOWNLOAD_SPEED:
-            if( sa->rateDownload < sb->rateDownload )
+            if( sa->pieceDownloadSpeed < sb->pieceDownloadSpeed )
                 ret = -1;
-            else if( sa->rateDownload > sb->rateDownload )
+            else if( sa->pieceDownloadSpeed > sb->pieceDownloadSpeed )
                 ret =  1;
             else
@@ -499 +499 @@
         case COL_STATE: /* FIXME */
         case COL_STATUS:
-            ret = sa->status - sb->status;
+            ret = sa->activity - sb->activity;
             break;
 
@@ -507 +507 @@
 
         case COL_UPLOAD_SPEED:
-            if( sa->rateUpload < sb->rateUpload )
+            if( sa->pieceUploadSpeed < sb->pieceUploadSpeed )
                 ret = -1;
-            else if( sa->rateUpload > sb->rateUpload )
+            else if( sa->pieceUploadSpeed > sb->pieceUploadSpeed )
                 ret = 1;
             else

trunk/wx/xmission.cc

@@ -286 +286 @@
     bool enable = false;
     foreach( torrents_v, mySelectedTorrents, it )
-        if( tr_torrentStatCached(*it)->status == TR_STATUS_STOPPED )
+        if( tr_torrentStatCached(*it)->activity == TR_STATUS_STOPPED )
             enable = true;
     event.Enable( enable );
@@ -294 +294 @@
 {
     foreach( torrents_v, mySelectedTorrents, it )
-        if( tr_torrentStatCached(*it)->status == TR_STATUS_STOPPED )
+        if( tr_torrentStatCached(*it)->activity == TR_STATUS_STOPPED )
             tr_torrentStart( *it );
 }
@@ -306 +306 @@
     bool enable = false;
     foreach( torrents_v, mySelectedTorrents, it )
-        if( tr_torrentStatCached(*it)->status != TR_STATUS_STOPPED )
+        if( tr_torrentStatCached(*it)->activity != TR_STATUS_STOPPED )
             enable = true;
     event.Enable( enable );
@@ -314 +314 @@
 {
     foreach( torrents_v, mySelectedTorrents, it )
-        if( tr_torrentStat(*it)->status != TR_STATUS_STOPPED )
+        if( tr_torrentStat(*it)->activity != TR_STATUS_STOPPED )
             tr_torrentStop( *it );
 }
@@ -474 +474 @@
     mySpeedStats->Pulse( handle );
 
-    float down, up;
-    tr_sessionGetSpeed( handle, &down, &up );
+    const double up   = tr_sessionGetPieceSpeed( handle, TR_UP );
+    const double down = tr_sessionGetPieceSpeed( handle, TR_DOWN );
     wxString xstr = _("Total DL: ");
     xstr += getReadableSpeed( down );
@@ -520 +520 @@
     long port;
     wxString key = _T("port");
-    if( !myConfig->Read( key, &port, TR_DEFAULT_PORT ) )
+    if( !myConfig->Read( key, &port, atoi( TR_DEFAULT_PEER_PORT_STR ) ) )
         myConfig->Write( key, port );
     tr_sessionSetPeerPort( handle, port );