Changeset 116

Timestamp:

09/01/10 14:10:37 (17 months ago)

Author:

shiretu

Message:

-- fixed wrong define

Location:

trunk/sources/androidapplestreaming/src

Files:

• api.cpp (modified) (2 diffs)
• main.cpp (modified) (2 diffs)

trunk/sources/androidapplestreaming/src/api.cpp

@@ -62 +62 @@
 #endif /* ANDROID */
 
+#ifdef BUILD_SIGNATURE
         //1.1 Create the settings string
         INFO("Build signature:\n%s", BUILD_SIGNATURE);
+#endif /* BUILD_SIGNATURE */
 
         //2. Create the default protocol factory
@@ -95 +97 @@
         }
 
-#ifdef BUILD_SIGNATURE
         //6. Register it to the app manager
         if (!ClientApplicationManager::RegisterApplication(pApp)) {
                 ASSERT("Unable to register application");
         }
-#endif /* BUILD_SIGNATURE */
 
         //7. Create the RTSP acceptor

trunk/sources/androidapplestreaming/src/main.cpp

@@ -91 +91 @@
 //#define MY_SESSION_ID ""
 
+#define MY_URL "http://localhost/~shiretu/ts6_raw/master.m3u8"
+#define MY_KEY ""
+#define MY_SESSION_ID ""
 
 void testCommands() {
@@ -97 +100 @@
 
         uint32_t contextId = (uint32_t) ASC_RES_PARAM(result, "contextId");
-        result = CommandSetBitrates(contextId, "[800000]");
+        result = CommandSetBitrates(contextId, "[850000]");
         FINEST("result:\n%s", STR(result.ToString()));
 
-        //result = CommandPlay(contextId, MY_URL, MY_SESSION_ID, MY_KEY);
-        //FINEST("result:\n%s", STR(result.ToString()));
+        result = CommandPlay(contextId, MY_URL, MY_SESSION_ID, MY_KEY);
+        FINEST("result:\n%s", STR(result.ToString()));
 
-        result = CommandPlay(contextId,
-                "aHR0cDovL21sYmxpdmUtYWtjLm1sYi5jb20vbWxiYW0vMjAxMC8wOC8yOC9NTEJfR0FNRV9WSURFT19LQ0FDTEVfSE9NRV8yMDEwMDgyOC9tYXN0ZXJfbW9iaWxlLm0zdTh8R3ZjbFJoV2lOMHlyZWcvL3NUeXJBNDJ4VXkwPXxwbGF5YmFjaz1IVFRQX0NMT1VEX01PQklMRSZjb250ZW50SWQ9MTEyNzU3MDkmYXBwQWNjb3VudE5hbWU9bWxiJmV2ZW50SWQ9MTQtMjY1NzQwLTIwMTAtMDgtMjgmaXBpZD0xMTYyNzcwNiZzZXNzaW9uS2V5PUFlMHNDUUFNUjJ2ZzQ2dUduT28xJTJGbVVYbjdFJTNEJmRldmljZUlkPUFORFJPSURfQTEwMDAwMTM3NTY2MDUmY291bnRyeT1ybyZwb3N0YWxDb2RlPTAwMDAwJnBsYXRmb3JtPUFORFJPSUQ="
-                );
-        FINEST("result:\n%s", STR(result.ToString()));
+        //      result = CommandPlay(contextId,
+        //                      "aHR0cDovL21sYmxpdmUtYWtjLm1sYi5jb20vbWxiYW0vMjAxMC8wOC8yOC9NTEJfR0FNRV9WSURFT19LQ0FDTEVfSE9NRV8yMDEwMDgyOC9tYXN0ZXJfbW9iaWxlLm0zdTh8R3ZjbFJoV2lOMHlyZWcvL3NUeXJBNDJ4VXkwPXxwbGF5YmFjaz1IVFRQX0NMT1VEX01PQklMRSZjb250ZW50SWQ9MTEyNzU3MDkmYXBwQWNjb3VudE5hbWU9bWxiJmV2ZW50SWQ9MTQtMjY1NzQwLTIwMTAtMDgtMjgmaXBpZD0xMTYyNzcwNiZzZXNzaW9uS2V5PUFlMHNDUUFNUjJ2ZzQ2dUduT28xJTJGbVVYbjdFJTNEJmRldmljZUlkPUFORFJPSURfQTEwMDAwMTM3NTY2MDUmY291bnRyeT1ybyZwb3N0YWxDb2RlPTAwMDAwJnBsYXRmb3JtPUFORFJPSUQ="
+        //                      );
+        //      FINEST("result:\n%s", STR(result.ToString()));
 
         //      sleep(30);