Changeset 8021 for trunk/libtransmission/torrent.c

Timestamp:

Mar 4, 2009, 7:52:57 PM (14 years ago)

Author:

charles

Message:

(trunk) libT and gtk+ parts for #1889: per-torrent vs. global speed limit confusion

File:

• trunk/libtransmission/torrent.c (modified) (2 diffs)

trunk/libtransmission/torrent.c

@@ -110 +110 @@
 
 void
-tr_torrentSetSpeedMode( tr_torrent *  tor,
-                        tr_direction  dir,
-                        tr_speedlimit mode )
-{
-    assert( tor != NULL );
+tr_torrentSetSpeedLimit( tr_torrent * tor, tr_direction dir, int KiB_sec )
+{
+    assert( tr_isTorrent( tor ) );
     assert( tr_isDirection( dir ) );
-    assert( mode==TR_SPEEDLIMIT_GLOBAL || mode==TR_SPEEDLIMIT_SINGLE || mode==TR_SPEEDLIMIT_UNLIMITED  );
-
-    tor->speedLimitMode[dir] = mode;
-
-    tr_bandwidthSetLimited( tor->bandwidth, dir, mode==TR_SPEEDLIMIT_SINGLE );
-    tr_bandwidthHonorParentLimits( tor->bandwidth, dir, mode==TR_SPEEDLIMIT_GLOBAL );
-}
-
-tr_speedlimit
-tr_torrentGetSpeedMode( const tr_torrent * tor,
-                        tr_direction       dir )
-{
-    assert( tor != NULL );
+
+    tr_bandwidthSetDesiredSpeed( tor->bandwidth, dir, KiB_sec );
+}
+
+int
+tr_torrentGetSpeedLimit( const tr_torrent * tor, tr_direction dir )
+{
+    assert( tr_isTorrent( tor ) );
     assert( tr_isDirection( dir ) );
 
-    return tor->speedLimitMode[dir];
-}
-
-void
-tr_torrentSetSpeedLimit( tr_torrent * tor,
-                         tr_direction dir,
-                         int          desiredSpeed )
-{
-    tr_bandwidthSetDesiredSpeed( tor->bandwidth, dir, desiredSpeed );
-}
-
-int
-tr_torrentGetSpeedLimit( const tr_torrent * tor,
-                         tr_direction       dir )
-{
-    assert( tr_isTorrent( tor ) );
-
     return tr_bandwidthGetDesiredSpeed( tor->bandwidth, dir );
 }
+
+void
+tr_torrentUseSpeedLimit( tr_torrent * tor, tr_direction dir, tr_bool do_use )
+{
+    assert( tr_isTorrent( tor ) );
+    assert( tr_isDirection( dir ) );
+
+    tr_bandwidthSetLimited( tor->bandwidth, dir, do_use );
+}
+
+tr_bool
+tr_torrentIsUsingSpeedLimit( const tr_torrent * tor, tr_direction dir )
+{
+    assert( tr_isTorrent( tor ) );
+    assert( tr_isDirection( dir ) );
+
+    return tr_bandwidthIsLimited( tor->bandwidth, dir );
+}
+
+void
+tr_torrentUseGlobalSpeedLimit( tr_torrent * tor, tr_direction dir, tr_bool do_use )
+{
+    assert( tr_isTorrent( tor ) );
+    assert( tr_isDirection( dir ) );
+
+    tr_bandwidthHonorParentLimits( tor->bandwidth, dir, do_use );
+}
+
+tr_bool
+tr_torrentIsUsingGlobalSpeedLimit( const tr_torrent * tor, tr_direction dir )
+{
+    assert( tr_isTorrent( tor ) );
+    assert( tr_isDirection( dir ) );
+
+    return tr_bandwidthAreParentLimitsHonored( tor->bandwidth, dir );
+}
+
+/***
+****
+***/
 
 void
@@ -193 +209 @@
                                   tr_direction        direction )
 {
-    tr_bool isEnabled = FALSE;
-
-    switch( tr_torrentGetSpeedMode( tor, direction ) )
-    {
-        case TR_SPEEDLIMIT_GLOBAL:
-            isEnabled = !tr_sessionIsSpeedLimitEnabled( tor->session, direction )
-                      || tr_sessionGetSpeedLimit( tor->session, direction ) > 0;
-            break;
-
-        case TR_SPEEDLIMIT_SINGLE:
-            isEnabled = tr_torrentGetSpeedLimit( tor, direction ) > 0;
-            break;
-
-        case TR_SPEEDLIMIT_UNLIMITED:
-            isEnabled = TRUE;
-            break;
-
-        default:
-            assert( 0 && "unhandled speed mode" );
-            break;
-    }
-
-    return isEnabled;
+    tr_bool allowed = TRUE;
+
+    if( tr_torrentIsUsingSpeedLimit( tor, direction ) )
+        if( tr_torrentGetSpeedLimit( tor, direction ) <= 0 )
+            allowed = FALSE;
+
+    if( tr_torrentIsUsingGlobalSpeedLimit( tor, direction ) )
+        if( tr_sessionIsSpeedLimitEnabled( tor->session, direction ) )
+            if( tr_sessionGetSpeedLimit( tor->session, direction ) <= 0 )
+                allowed = FALSE;
+
+    return allowed;
 }