Changeset 63 for trunk/sources/applications/applestreamingclient/include/protocols/variant/messagestructure.h

Timestamp:

08/11/10 17:51:36 (22 months ago)

Author:

shiretu

Message:

-- added more APIs to the android apple streaming

File:

• trunk/sources/applications/applestreamingclient/include/protocols/variant/messagestructure.h (modified) (3 diffs)

trunk/sources/applications/applestreamingclient/include/protocols/variant/messagestructure.h

@@ -23 +23 @@
 #define INCLUDE_DEBUG_LOCATIONS
 
-#define ASC_REQ_TYPE_CONTEXT_CREATE                     "contextCreate"
-#define ASC_REQ_TYPE_CONTEXT_LIST                       "contextList"
-#define ASC_REQ_TYPE_CONTEXT_CLOSE                      "contextClose"
-#define ASC_REQ_TYPE_CONTEXT_CLOSE_ALL          "contextCloseAll"
-#define ASC_REQ_TYPE_COMMAND_PLAY                       "commandPlay"
-#define ASC_REQ_TYPE_COMMAND_PAUSE                      "commandPause"
-#define ASC_REQ_TYPE_COMMAND_RESUME                     "commandResume"
-#define ASC_REQ_TYPE_INFO_LIST_STREAMS          "listStreams"
-#define ASC_REQ_TYPE_INFO_LIST_ALL_STREAMS      "listAllStreams"
-
-#define ASC_REQ_COMMAND_PLAY_URI_KEY                    "uri"
-#define ASC_REQ_COMMAND_PLAY_SESSION_ID_KEY             "sessionId"
-#define ASC_REQ_COMMAND_PLAY_PASSWORD_KEY       "keyPassword"
+#define ASC_REQ_TYPE_CONTEXT_CREATE                             "contextCreate"
+#define ASC_REQ_TYPE_CONTEXT_LIST                               "contextList"
+#define ASC_REQ_TYPE_CONTEXT_CLOSE                              "contextClose"
+#define ASC_REQ_TYPE_CONTEXT_CLOSE_ALL                  "contextCloseAll"
+
+#define ASC_REQ_TYPE_COMMAND_PLAY                               "commandPlay"
+#define ASC_REQ_TYPE_COMMAND_PAUSE                              "commandPause"
+#define ASC_REQ_TYPE_COMMAND_RESUME                             "commandResume"
+#define ASC_REQ_TYPE_COMMAND_SELECT_BANDWIDTH   "commandSelectBandwidth"
+#define ASC_REQ_TYPE_COMMAND_SEEK                               "commandSeek"
+#define ASC_REQ_TYPE_COMMAND_SELECT_AV_CHANNELS "commandSelectAVChannels"
+
+#define ASC_REQ_TYPE_INFO_LIST_STREAMS                  "infoListStreams"
+#define ASC_REQ_TYPE_INFO_LIST_ALL_STREAMS              "infoListAllStreams"
+#define ASC_REQ_TYPE_INFO_BANDWIDTH                             "infoBandwidth"
+#define ASC_REQ_TYPE_INFO_ALL_BANDWIDTH                 "infoAllBandwidth"
+#define ASC_REQ_TYPE_INFO_PLAYBACK                              "infoPlayback"
+#define ASC_REQ_TYPE_INFO_ALL_PLAYBACK                  "infoAllPlayback"
+
+#define ASC_REQ_COMMAND_PLAY_URI_KEY                            "uri"
+#define ASC_REQ_COMMAND_PLAY_SESSION_ID_KEY                     "sessionId"
+#define ASC_REQ_COMMAND_PLAY_PASSWORD_KEY                       "keyPassword"
+#define ASC_REQ_COMMAND_SELECT_BANDWIDTH_BANDWIDTH      "bandwidth"
+#define ASC_REQ_COMMAND_SEEK_POINT                                      "point"
+#define ASC_REQ_COMMAND_SELECT_AV_CHANNELS_AUDIO        "audio"
+#define ASC_REQ_COMMAND_SELECT_AV_CHANNELS_VIDEO        "video"
 
 #define ASC_RES_CONTEXT_CREATE_CONTEXT_ID_KEY   "contextId"
@@ -119 +132 @@
         ASC_REQ_BUILD(v,ASC_REQ_TYPE_COMMAND_RESUME,contextId,Variant())
 
+#define ASC_REQ_BUILD_COMMAND_SELECT_BANDWIDTH(v,contextId,value) \
+do { \
+        Variant params; \
+        params[ASC_REQ_COMMAND_SELECT_BANDWIDTH_BANDWIDTH]=(uint32_t)value; \
+        ASC_REQ_BUILD(v,ASC_REQ_TYPE_COMMAND_SELECT_BANDWIDTH,contextId,params); \
+} while(0)
+
+#define ASC_REQ_BUILD_COMMAND_SEEK(v,contextId,value) \
+do { \
+        Variant params; \
+        params[ASC_REQ_COMMAND_SEEK_POINT]=(double)value; \
+        ASC_REQ_BUILD(v,ASC_REQ_TYPE_COMMAND_SEEK,contextId,params); \
+} while(0)
+
+#define ASC_REQ_BUILD_COMMAND_SELECT_AV_CHANNELS(v,contextId,audio,video) \
+do { \
+        Variant params; \
+        params[ASC_REQ_COMMAND_SELECT_AV_CHANNELS_AUDIO]=(uint32_t)audio; \
+        params[ASC_REQ_COMMAND_SELECT_AV_CHANNELS_VIDEO]=(uint32_t)video; \
+        ASC_REQ_BUILD(v,ASC_REQ_TYPE_COMMAND_SELECT_AV_CHANNELS,contextId,params); \
+} while(0)
+
 #define ASC_REQ_BUILD_INFO_LIST_STREAMS(v,contextId) \
         ASC_REQ_BUILD(v,ASC_REQ_TYPE_INFO_LIST_STREAMS,contextId,Variant())
@@ -125 +160 @@
         ASC_REQ_BUILD(v,ASC_REQ_TYPE_INFO_LIST_ALL_STREAMS,0,Variant())
 
+#define ASC_REQ_BUILD_INFO_BANDWIDTH(v,contextId) \
+        ASC_REQ_BUILD(v,ASC_REQ_TYPE_INFO_BANDWIDTH,contextId,Variant())
+
+#define ASC_REQ_BUILD_INFO_ALL_BANDWIDTH(v) \
+        ASC_REQ_BUILD(v,ASC_REQ_TYPE_INFO_ALL_BANDWIDTH,0,Variant())
+
+#define ASC_REQ_BUILD_INFO_PLAYBACK(v,contextId) \
+        ASC_REQ_BUILD(v,ASC_REQ_TYPE_INFO_PLAYBACK,contextId,Variant())
+
+#define ASC_REQ_BUILD_INFO_ALL_PLAYBACK(v) \
+        ASC_REQ_BUILD(v,ASC_REQ_TYPE_INFO_ALL_PLAYBACK,0,Variant())
 
 #define ASC_RES_BUILD(r,status,params) \