Fixes #1 :-) FINALLY!!!!

mich181189 · Sep 15, 2012 · 19f1f5d · 19f1f5d
1 parent aa92704
commit 19f1f5d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/sources/applications/flvplayback/include/rtmpappprotocolhandler.h b/sources/applications/flvplayback/include/rtmpappprotocolhandler.h
@@ -42,7 +42,7 @@ namespace app_flvplayback {
                 Variant connections; //keeps track of connection data, such as time...
                 void client_close(uint32_t id); //does logging and other fun
                 bool ProcessInvokePublish(BaseRTMPProtocol *pFrom,Variant &request);
-                bool ProcessInvokeDeleteStream(BaseRTMPProtocol *pFrom,Variant &request);
+                bool ProcessInvokeFCUnpublish(BaseRTMPProtocol *pFrom,Variant &request);
                 bool ProcessInvokePlay(BaseRTMPProtocol *pFrom,Variant &request);
                 bool ProcessInvokeCloseStream(BaseRTMPProtocol *pFrom,Variant &request);
                 bool ProcessInvoke(BaseRTMPProtocol *pFrom, Variant &request);

diff --git a/sources/applications/flvplayback/src/rtmpappprotocolhandler.cpp b/sources/applications/flvplayback/src/rtmpappprotocolhandler.cpp
@@ -103,14 +103,14 @@ bool RTMPAppProtocolHandler::ProcessInvokeGeneric(BaseRTMPProtocol *pFrom,
 	} else if (functionName == "insertMetadata") {
 		return ProcessInsertMetadata(pFrom, request);
 	} else if (functionName == "FCUnpublish") {
-		return ProcessInvokeDeleteStream(pFrom,request); //seems the base class doesn't catch this one, so I'm catching it now.
+		return ProcessInvokeFCUnpublish(pFrom,request); //seems the base class doesn't catch this one, so I'm catching it now.
 	} else {
 		return BaseRTMPAppProtocolHandler::ProcessInvokeGeneric(pFrom, request);
 	}
 }
 
-bool RTMPAppProtocolHandler::ProcessInvokeDeleteStream(BaseRTMPProtocol *pFrom,Variant &request) {
-    string streamNameFull = M_INVOKE_PARAM(request, 1);
+bool RTMPAppProtocolHandler::ProcessInvokeFCUnpublish(BaseRTMPProtocol *pFrom,Variant &request) {
+  string streamNameFull = M_INVOKE_PARAM(request, 1);
 	size_t len = streamNameFull.find('?');
 	string streamName;
 	if(len != string::npos)
@@ -128,8 +128,8 @@ bool RTMPAppProtocolHandler::ProcessInvokeDeleteStream(BaseRTMPProtocol *pFrom,V
             }
 
         }
-    INFO("Stream %s closed.",streamName.c_str());
-    return BaseRTMPAppProtocolHandler::ProcessInvokeDeleteStream(pFrom,request);
+    INFO("Stream %s unpublished.",streamName.c_str());
+    return true;
 }
 
 bool RTMPAppProtocolHandler::ProcessInvokePlay(BaseRTMPProtocol *pFrom,Variant &request) {