Changeset 74 for trunk/sources/applications/applestreamingclient/src/protocols/variant/variantappprotocolhandler.cpp

Timestamp:

08/13/10 21:05:31 (22 months ago)

Author:

shiretu

Message:

-- work on apple streaming

File:

• trunk/sources/applications/applestreamingclient/src/protocols/variant/variantappprotocolhandler.cpp (modified) (6 diffs)

trunk/sources/applications/applestreamingclient/src/protocols/variant/variantappprotocolhandler.cpp

@@ -25 +25 @@
 #include "eventsink/varianteventsink.h"
 #include "applestreamingclientapplication.h"
+
+#define GET_CONTEXT(pProtocol, request) \
+uint32_t contextId = ASC_REQ_CONTEXT_ID(request); \
+if (contextId == 0) {\
+        ASC_RES_BUILD_CONTEXT_NOT_FOUND(request); \
+        return; \
+} \
+ClientContext *pContext = GetContext(contextId, pProtocol->GetType()); \
+if (pContext == NULL) { \
+        ASC_RES_BUILD_CONTEXT_NOT_FOUND(request); \
+        return; \
+}
 
 VariantAppProtocolHandler::VariantAppProtocolHandler(Variant &configuration)
@@ -66 +78 @@
         } else if (type == ASC_REQ_TYPE_INFO_LIST_ALL_STREAMS) {
                 ProcessInfoListAllStreams(pProtocol, lastReceived);
+        } else if (type == ASC_REQ_TYPE_INFO_BANDWIDTH) {
+                ProcessInfoBandwidth(pProtocol, lastReceived);
+        } else if (type == ASC_REQ_TYPE_INFO_PLAYBACK) {
+                ProcessInfoPlayback(pProtocol, lastReceived);
         } else {
                 WARN("Processing type `%s` not yet implemented", STR(type));
@@ -92 +108 @@
 void VariantAppProtocolHandler::ProcessContextClose(BaseVariantProtocol *pProtocol,
                 Variant &request) {
-        uint32_t contextId = ASC_REQ_CONTEXT_ID(request);
-        if (contextId == 0) {
-                ASC_RES_BUILD_CONTEXT_NOT_FOUND(request);
-                return;
-        }
-        ClientContext *pContext = GetContext(contextId, pProtocol->GetType());
-        if (pContext == NULL) {
-                ASC_RES_BUILD_CONTEXT_NOT_FOUND(request);
-                return;
-        }
+        GET_CONTEXT(pProtocol, request);
         ClientContext::ReleaseContext(contextId);
         ASC_RES_BUILD_OK(request, Variant());
@@ -114 +121 @@
 void VariantAppProtocolHandler::ProcessCommandPlay(
                 BaseVariantProtocol *pProtocol, Variant &request) {
-        uint32_t contextId = ASC_REQ_CONTEXT_ID(request);
-        if (contextId == 0) {
-                ASC_RES_BUILD_CONTEXT_NOT_FOUND(request);
-                return;
-        }
-        ClientContext *pContext = GetContext(contextId, pProtocol->GetType());
-        if (pContext == NULL) {
-                ASC_RES_BUILD_CONTEXT_NOT_FOUND(request);
-                return;
-        }
-
+        GET_CONTEXT(pProtocol, request);
         string connectingString = ASC_REQ_COMMAND_PLAY_URI(request);
         if (ASC_REQ_COMMAND_PLAY_PASSWORD(request) != "") {
@@ -152 +149 @@
 void VariantAppProtocolHandler::ProcessInfoListStreams(
                 BaseVariantProtocol *pProtocol, Variant &request) {
-        uint32_t contextId = ASC_REQ_CONTEXT_ID(request);
-        if (contextId == 0) {
-                ASC_RES_BUILD_CONTEXT_NOT_FOUND(request);
-                return;
-        }
-        ClientContext *pContext = GetContext(contextId, pProtocol->GetType());
-        if (pContext == NULL) {
-                ASC_RES_BUILD_CONTEXT_NOT_FOUND(request);
-                return;
-        }
+        GET_CONTEXT(pProtocol, request);
         if (pContext->EventSink()->GetType() == EVENT_SYNC_VARIANT) {
                 VariantEventSink *pSink = (VariantEventSink *) pContext->EventSink();
@@ -196 +184 @@
         ASC_RES_BUILD_OK_INFO_LIST_ALL_STREAMS(request, allStreams);
 }
+
+void VariantAppProtocolHandler::ProcessInfoBandwidth(
+                BaseVariantProtocol *pProtocol, Variant &request) {
+        GET_CONTEXT(pProtocol, request);
+        ASC_RES_BUILD_OK_INFO_BANDWIDTH(request,
+                        pContext->GetAvailableBandwidths(),
+                        pContext->GetDetectedBandwidth(),
+                        pContext->GetSelectedBandwidth(),
+                        pContext->GetBufferLevel(),
+                        pContext->GetMaxBufferLevel(),
+                        pContext->GetBufferLevelPercent());
+}
+
+void VariantAppProtocolHandler::ProcessInfoPlayback(
+                BaseVariantProtocol *pProtocol, Variant &request) {
+        GET_CONTEXT(pProtocol, request);
+        /*
+         * seek range
+         * current position
+         */
+        //      ASC_RES_BUILD_OK_INFO_PLAYBACK(request,
+        //                      pContext->GetMinTimestamp(),
+        //                      pContext->GetMaxTimestamp(),
+        //                      pContext->GetChunksCount(),
+        //                      pContext->GetCurrentTimestamp(),
+        //                      pContext->GetCurrentChunkIndex());
+        ASC_RES_BUILD_NYI(request);
+}