Changeset 96 for trunk/sources/applications/applestreamingclient/src/protocols/protocolfactory.cpp

Timestamp:

08/24/10 07:51:02 (21 months ago)

Author:

shiretu

Message:

-- android related

File:

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

trunk/sources/applications/applestreamingclient/src/protocols/protocolfactory.cpp

@@ -26 +26 @@
 #include "protocols/aes/inboundaesprotocol.h"
 #include "protocols/httpbuff/httpbufferprotocol.h"
+#include "protocols/timer/finetimer.h"
 
 ProtocolFactory::ProtocolFactory() {
@@ -41 +42 @@
         ADD_VECTOR_END(result, PT_HTTP_BUFF);
         ADD_VECTOR_END(result, PT_INBOUND_AES);
+#ifdef HAS_MS_TIMER
+        ADD_VECTOR_END(result, PT_FINE_TIMER);
+#endif /* HAS_MS_TIMER */
         return result;
 }
@@ -46 +50 @@
 vector<string> ProtocolFactory::HandledProtocolChains() {
         vector<string> result;
+#ifdef HAS_MS_TIMER
+        ADD_VECTOR_END(result, PC_FINE_TIMER);
+#endif /* HAS_MS_TIMER */
+
         ADD_VECTOR_END(result, PC_MASTER_PLAYLIST);
         ADD_VECTOR_END(result, PC_CHILD_PLAYLIST);
@@ -58 +66 @@
 vector<uint64_t> ProtocolFactory::ResolveProtocolChain(string name) {
         vector<uint64_t> result;
-        if (name == PC_MASTER_PLAYLIST) {
+        if (false) {
+
+        }
+#ifdef HAS_MS_TIMER
+        else if (name == PC_FINE_TIMER) {
+                ADD_VECTOR_END(result, PT_UDP);
+                ADD_VECTOR_END(result, PT_FINE_TIMER);
+        }
+#endif /* HAS_MS_TIMER */
+        else if (name == PC_MASTER_PLAYLIST) {
                 ADD_VECTOR_END(result, PT_TCP);
                 ADD_VECTOR_END(result, PT_OUTBOUND_HTTP);
@@ -99 +116 @@
         BaseProtocol *pResult = NULL;
         switch (type) {
+#ifdef HAS_MS_TIMER
+                case PT_FINE_TIMER:
+                        pResult = new FineTimer();
+                        break;
+#endif /* HAS_MS_TIMER */
                 case PT_INBOUND_MASTER_M3U8:
                         pResult = new MasterM3U8Protocol();