Changeset 104 for trunk/sources/applications/applestreamingclient/src/clientcontext.cpp

Timestamp:

08/25/10 00:20:41 (21 months ago)

Author:

shiretu

Message:

-- fixed rolling file appender

File:

• trunk/sources/applications/applestreamingclient/src/clientcontext.cpp (modified) (5 diffs)

trunk/sources/applications/applestreamingclient/src/clientcontext.cpp

@@ -44 +44 @@
         _pMasterPlaylist = NULL;
         _parsedChildPlaylistsCount = 0;
-        _currentItemIndex = 0;
+        _currentSequence = 0;
         _optimalBw = 0;
         _lastUsedBw = 0;
@@ -291 +291 @@
 
         //4. Is this the last item in the playlis?
-        FINEST("---------------------------------------------------");
-        if (_currentItemIndex >= pPlaylist->GetItemsCount()) {
-                if (ReloadPlaylist(optimalBw)) {
-                        WARN("End of list. Wait one sec and try again");
-                        FINEST("---------------------------------------------------");
-                        return EnqueueFetchChildPlaylist(_childPlaylists[optimalBw]->GetPlaylistUri(), optimalBw);
-                } else {
-                        WARN("No playlist reload");
-                        _currentItemIndex--;
-                }
-        }
-        FINEST("_currentItemIndex: %d", _currentItemIndex);
-        FINEST("---------------------------------------------------");
+        string uri = pPlaylist->GetItemUri(_currentSequence);
+        if (uri == "") {
+                FINEST("---------------------------------------------------");
+                WARN("End of list. Wait one sec and try again");
+                FINEST("---------------------------------------------------");
+                return EnqueueFetchChildPlaylist(_childPlaylists[optimalBw]->GetPlaylistUri(), optimalBw);
+        }
 
         //4. Get the item URI and the key URI if available
-        string uri = pPlaylist->GetItemUri(_currentItemIndex);
-        string keyUri = pPlaylist->GetItemKeyUri(_currentItemIndex);
-        _mediaSequences[optimalBw] = pPlaylist->GetItemMediaSequence(_currentItemIndex);
+        string keyUri = pPlaylist->GetItemKeyUri(_currentSequence);
         if (keyUri != "")
                 keyUri += "&" + _connectingString.sessionId;
@@ -402 +394 @@
         //7. Done
         return true;
-}
-
-bool ClientContext::ReloadPlaylist(uint32_t bw) {
-        if (!MAP_HAS1(_mediaSequences, bw)) {
-                FINEST("bw %d not in _mediaSequences", bw);
-                return true;
-        }
-        if (!MAP_HAS1(_childPlaylists, bw)) {
-                FINEST("bw %d not in playlists", bw);
-                return true;
-        }
-
-        uint32_t lastSequence = _mediaSequences[bw];
-        FINEST("lastSequence: %d", lastSequence);
-        uint32_t playlistSequnece = _childPlaylists[bw]->GetLastMediaSequence();
-        FINEST("playlistSequnece: %d", playlistSequnece);
-
-        return lastSequence == playlistSequnece;
 }
 
@@ -547 +521 @@
         string itemUri = parameters["payload"]["itemUri"];
         uint32_t bw = parameters["payload"]["bw"];
-        uint64_t iv = _childPlaylists[bw]->GetItemMediaSequence(_currentItemIndex);
+        uint64_t iv = _currentSequence;
         //FINEST("itemUri: %s; bw: %d; key: %s", STR(itemUri), bw, STR(key));
 
@@ -563 +537 @@
 
 bool ClientContext::SignalTSChunkComplete(uint32_t bw) {
-        _currentItemIndex++;
+        _currentSequence++;
         return StartFeeding();
 }