Changeset 9817

Timestamp:

Dec 24, 2009, 6:01:48 PM (13 years ago)

Author:

charles

Message:

(trunk libT) #2632 "Add streaming capability to libtransmission (but not the Transmission GUI clients)" -- revert this feature due to pushback from devs and users and the 1.80 freeze

Location:

trunk/libtransmission

Files:

• peer-mgr.c (modified) (2 diffs)
• resume.c (modified) (4 diffs)
• resume.h (modified) (1 diff)
• torrent.c (modified) (1 diff)
• torrent.h (modified) (1 diff)
• transmission.h (modified) (2 diffs)

trunk/libtransmission/peer-mgr.c

@@ -860 +860 @@
         const tr_torrent * tor = t->tor;
         const tr_info * inf = tr_torrentInfo( tor );
-        const tr_bool isStreaming = tr_torrentIsStreaming( tor );
         struct weighted_piece * pieces;
         int pieceCount;
@@ -876 +875 @@
             piece->index = pool[i];
             piece->requestCount = 0;
-            piece->salt = isStreaming ? piece->index
-                                      : (tr_piece_index_t)tr_cryptoWeakRandInt( 4096 );
+            piece->salt = tr_cryptoWeakRandInt( 4096 );
         }
 

trunk/libtransmission/resume.c

@@ -43 +43 @@
 #define KEY_SPEEDLIMIT_UP       "speed-limit-up"
 #define KEY_SPEEDLIMIT_DOWN     "speed-limit-down"
-#define KEY_STREAMING           "streaming"
 #define KEY_RATIOLIMIT          "ratio-limit"
 #define KEY_UPLOADED            "uploaded"
@@ -505 +504 @@
     tr_tordbg( tor, "Saving .resume file for \"%s\"", tr_torrentName( tor ) );
 
-    tr_bencInitDict( &top, 34 ); /* arbitrary "big enough" number */
+    tr_bencInitDict( &top, 33 ); /* arbitrary "big enough" number */
     tr_bencDictAddInt( &top, KEY_ACTIVITY_DATE, tor->activityDate );
     tr_bencDictAddInt( &top, KEY_ADDED_DATE, tor->addedDate );
@@ -518 +517 @@
     tr_bencDictAddInt( &top, KEY_BANDWIDTH_PRIORITY, tr_torrentGetPriority( tor ) );
     tr_bencDictAddBool( &top, KEY_PAUSED, !tor->isRunning );
-    tr_bencDictAddBool( &top, KEY_STREAMING, tr_torrentIsStreaming( tor ) );
     savePeers( &top, tor );
     saveFilePriorities( &top, tor );
@@ -612 +610 @@
     }
 
-    if( ( fieldsToLoad & TR_FR_STREAMING )
-      && tr_bencDictFindBool( &top, KEY_STREAMING, &boolVal ) )
-    {
-        tor->isStreaming = boolVal;
-        fieldsLoaded |= TR_FR_STREAMING;
-    }
-
     if( ( fieldsToLoad & TR_FR_ADDED_DATE )
       && tr_bencDictFindInt( &top, KEY_ADDED_DATE, &i ) )

trunk/libtransmission/resume.h

@@ -36 +36 @@
     TR_FR_DONE_DATE           = ( 1 << 14 ),
     TR_FR_ACTIVITY_DATE       = ( 1 << 15 ),
-    TR_FR_RATIOLIMIT          = ( 1 << 16 ),
-    TR_FR_STREAMING           = ( 1 << 17 )
+    TR_FR_RATIOLIMIT          = ( 1 << 16 )
 };
 

trunk/libtransmission/torrent.c

@@ -1891 +1891 @@
 ***/
 
-tr_bool
-tr_torrentIsStreaming( const tr_torrent * tor )
-{
-    assert( tr_isTorrent( tor ) );
-    assert( tr_isBool( tor->isStreaming ) );
-
-    return tor->isStreaming;
-}
-
-void
-tr_torrentSetStreaming( tr_torrent * tor, tr_bool isStreaming )
-{
-    assert( tr_isTorrent( tor ) );
-    assert( tr_isBool( isStreaming ) );
-
-    tor->isStreaming = isStreaming;
-}
-
-/***
-****
-***/
-
 void
 tr_torrentSetPeerLimit( tr_torrent * tor,

trunk/libtransmission/torrent.h

@@ -227 +227 @@
     void                             * ratio_limit_hit_func_user_data;
 
-    tr_bool                    isStreaming;
     tr_bool                    isRunning;
     tr_bool                    isDeleting;

trunk/libtransmission/transmission.h

@@ -708 +708 @@
 uint16_t   tr_sessionGetPeerLimitPerTorrent( const tr_session * );
 
+tr_priority_t   tr_torrentGetPriority( const tr_torrent * );
+void            tr_torrentSetPriority( tr_torrent *, tr_priority_t );
+
 
 /**
@@ -1072 +1075 @@
 tr_bool  tr_torrentUsesSessionLimits  ( const tr_torrent * );
 
-
-tr_priority_t   tr_torrentGetPriority( const tr_torrent * );
-void            tr_torrentSetPriority( tr_torrent *, tr_priority_t );
-
-tr_bool         tr_torrentIsStreaming( const tr_torrent * );
-void            tr_torrentSetStreaming( tr_torrent *, tr_bool );
 
 /****