r3556 - in trunk/libminisip: include/libminisip/media source/subsystem_media source/subsystem_media/vnc

[erik at minisip.org]

Author: erik
Date: 2007-12-14 11:25:43 +0100 (Fri, 14 Dec 2007)
New Revision: 3556

Modified:
   trunk/libminisip/include/libminisip/media/MediaStream.h
   trunk/libminisip/source/subsystem_media/MediaStream.cxx
   trunk/libminisip/source/subsystem_media/Session.cxx
   trunk/libminisip/source/subsystem_media/vnc/MediaSharedWorkspace.cxx
Log:

 * Minor fixes to reliable transport plugins code.



Modified: trunk/libminisip/include/libminisip/media/MediaStream.h
===================================================================
--- trunk/libminisip/include/libminisip/media/MediaStream.h	2007-12-14 10:08:50 UTC (rev 3555)
+++ trunk/libminisip/include/libminisip/media/MediaStream.h	2007-12-14 10:25:43 UTC (rev 3556)
@@ -123,9 +123,7 @@
 	 * @return  The list of formats supported by the reliable media
 	 * 	    session.
 	 */
-	virtual std::string getMediaFormats(){
-		return mediaFormats;
-	}
+	virtual std::string getMediaFormats()=0;
 
 	virtual void start(){}
 	virtual void stop(){}

Modified: trunk/libminisip/source/subsystem_media/MediaStream.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/MediaStream.cxx	2007-12-14 10:08:50 UTC (rev 3555)
+++ trunk/libminisip/source/subsystem_media/MediaStream.cxx	2007-12-14 10:25:43 UTC (rev 3556)
@@ -55,6 +55,7 @@
 }
 
 std::string MediaStream::getSdpMediaType(){
+	massert(media);
 	if( media ){
 		return media->getSdpMediaType();
 	}

Modified: trunk/libminisip/source/subsystem_media/Session.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/Session.cxx	2007-12-14 10:08:50 UTC (rev 3555)
+++ trunk/libminisip/source/subsystem_media/Session.cxx	2007-12-14 10:25:43 UTC (rev 3556)
@@ -425,8 +425,7 @@
 		type = (*i)->getSdpMediaType();
 		m = new SdpHeaderM( type, localPort, 1, (*i)->getTransport() );
 
-		//cerr << "EEEE: trying to add formats <"<<(*i)->getMediaFormats()<<">"<<endl;
-		m->addFormat( "vnc" /*(*i)->getMediaFormats()*/ );
+		m->addFormat( (*i)->getMediaFormats() );
 		result->addHeader( *m );
 
 		attributes = (*i)->getSdpAttributes();

Modified: trunk/libminisip/source/subsystem_media/vnc/MediaSharedWorkspace.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/vnc/MediaSharedWorkspace.cxx	2007-12-14 10:08:50 UTC (rev 3555)
+++ trunk/libminisip/source/subsystem_media/vnc/MediaSharedWorkspace.cxx	2007-12-14 10:25:43 UTC (rev 3556)
@@ -9,14 +9,14 @@
 class SWSMediaStream : public ReliableMediaStream {
 public:
 	SWSMediaStream( std::string callId, MRef<ReliableMedia*> m );
-	std::string getSdpMediaType();
+	std::string getMediaFormats();
 };
 
 SWSMediaStream::SWSMediaStream( std::string callId, MRef<ReliableMedia*> m ) : ReliableMediaStream(callId,m) {
 
 }
 
-string SWSMediaStream::getSdpMediaType(){
+string SWSMediaStream::getMediaFormats(){
 	return "vnc";
 }