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

Timestamp:

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

Author:

shiretu

Message:

-- fixed rolling file appender

File:

• trunk/sources/applications/applestreamingclient/src/playlist.cpp (modified) (6 diffs)

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

@@ -128 +128 @@
                                 //that means the item is finished. Save it
                                 _items[itemIndex] = item;
-                                _itemMediaSequences[itemIndex] = _lastMediaSequence;
+                                _itemMediaSequences[_lastMediaSequence] = itemIndex;
                                 _itemKeyUris[itemIndex] = _pLastKeyUri;
                                 _itemUris[itemIndex] = pLine;
@@ -189 +189 @@
 }
 
-string Playlist::GetItemUri(uint32_t index) {
+string Playlist::GetItemUri(uint32_t &sequence) {
+        uint32_t index = GetIndex(sequence);
         if (index >= _itemUris.size())
                 return "";
@@ -203 +204 @@
 }
 
-string Playlist::GetItemKeyUri(uint32_t index) {
+string Playlist::GetItemKeyUri(uint32_t &sequence) {
+        uint32_t index = GetIndex(sequence);
         if (index >= _itemKeyUris.size())
                 return "";
@@ -211 +213 @@
 }
 
-uint32_t Playlist::GetItemMediaSequence(uint32_t index) {
-        if (index >= _itemMediaSequences.size())
-                return 0;
-        return _itemMediaSequences[index];
-}
-
-uint32_t Playlist::GetItemBandwidth(uint32_t index) {
+uint32_t Playlist::GetItemBandwidth(uint32_t &sequence) {
+        uint32_t index = GetIndex(sequence);
         if (index >= _itemBandwidths.size())
                 return 0;
@@ -223 +220 @@
 }
 
-Variant Playlist::GetItemVariant(uint32_t index) {
-        if (index >= _items.size())
-                return Variant();
+Variant Playlist::GetItemVariant(uint32_t &sequence) {
+        uint32_t index = GetIndex(sequence);
         Variant result;
         result["encryptionKeyUri"] = GetItemKeyUri(index);
@@ -233 +229 @@
 }
 
-void Playlist::ApproximateStartEndTimes(uint32_t index, double start, double end) {
-        _meanDuration = _meanDuration * (double) _meanDurationCount + end - start;
-        _meanDurationCount++;
-        _meanDuration /= (double) _meanDurationCount;
-}
-
-void Playlist::GetSeekRange(double &min, double &max) {
-        min = 0;
-        max = (double) _items.size() * _meanDuration;
-}
-
-uint32_t Playlist::GetItemIndex(double seekPoint) {
-        if (_meanDuration == 0)
-                return 0;
-        uint32_t index = (uint32_t) (seekPoint / _meanDuration);
-        if (_items.size() <= index)
-                return 0;
-        return index;
-}
-
-uint32_t Playlist::GetLastMediaSequence() {
-        if (_itemMediaSequences.size() == 0)
-                return 0;
-        return _itemMediaSequences[_itemMediaSequences.size() - 1];
-}
+uint32_t Playlist::GetIndex(uint32_t &sequence) {
+        FINEST("---------------------");
+        FINEST("sequence requested: %d", sequence);
+        //1. We have it, we return it
+        if (MAP_HAS1(_itemMediaSequences, sequence)) {
+                FINEST("WE have it");
+                FINEST("---------------------");
+                return _itemMediaSequences[sequence];
+        }
+
+        //2. We don't have it, and is a 0 value, that means it was never initialized
+        if (sequence == 0) {
+                FINEST("sequence is 0");
+                FINEST("_itemMediaSequences.size(): %d", _itemMediaSequences.size());
+                if (_itemMediaSequences.size() != 0) {
+                        //3. We have stuff. Init and return
+                        FINEST("Return the first entry");
+                        sequence = MAP_KEY(_itemMediaSequences.begin());
+                        FINEST("---------------------");
+                        return MAP_VAL(_itemMediaSequences.begin());
+                } else {
+                        //4. We don't have stuff. Don't do nothing and return
+                        FINEST("empty sequences");
+                        FINEST("---------------------");
+                        return 0xffffffff;
+                }
+        }
+
+        //5. Ok, sequence is initialized but we don't have that value.
+        //So, we search the next one, init and return;
+        FINEST("DISC????");
+        if (_itemMediaSequences.size() > 0) {
+                FINEST("So, we have some items");
+                if (MAP_KEY(_itemMediaSequences.end()) >= sequence) {
+                        FINEST("Our sequence is somewhere there...");
+
+                        FOR_MAP(_itemMediaSequences, uint32_t, uint32_t, i) {
+                                FINEST("sequence: %d; MAP_KEY(i): %d", sequence, MAP_KEY(i));
+                                if (MAP_KEY(i) >= sequence) {
+                                        sequence = MAP_KEY(i);
+                                        FINEST("JACKPOT");
+                                        FINEST("---------------------");
+                                        return MAP_VAL(i);
+                                }
+                        }
+                } else {
+                        FINEST("sequence is bigger than the last item");
+                }
+        }
+
+        //6. Nada. This is the bottom
+        FINEST("Nothing left to do....");
+        FINEST("---------------------");
+        return 0xffffffff;
+}