r3552 - in trunk/libminisip: include/libminisip/media/video source/subsystem_media/video

[mikma at minisip.org]

Author: mikma
Date: 2007-12-12 15:54:59 +0100 (Wed, 12 Dec 2007)
New Revision: 3552

Modified:
   trunk/libminisip/include/libminisip/media/video/VideoMedia.h
   trunk/libminisip/source/subsystem_media/video/VideoMedia.cxx
Log:
Fix compilation of VideoMedia. Media -> RealtimeMedia.


Modified: trunk/libminisip/include/libminisip/media/video/VideoMedia.h
===================================================================
--- trunk/libminisip/include/libminisip/media/video/VideoMedia.h	2007-12-11 20:05:20 UTC (rev 3551)
+++ trunk/libminisip/include/libminisip/media/video/VideoMedia.h	2007-12-12 14:54:59 UTC (rev 3552)
@@ -27,7 +27,7 @@
 
 #include<libminisip/libminisip_config.h>
 
-#include<libminisip/media/Media.h>
+#include<libminisip/media/RealtimeMedia.h>
 #include<libminisip/media/video/ImageHandler.h>
 #include<libminisip/media/video/display/VideoDisplay.h>
 #include<libminisip/media/video/codec/AVDecoder.h>
@@ -47,7 +47,8 @@
 class ImageMixer;
 class RtpPacket;
 
-class LIBMINISIP_API VideoMedia : public Media, public VideoEncoderCallback{
+class LIBMINISIP_API VideoMedia : public RealtimeMedia,
+				  public VideoEncoderCallback{
 
 	public:
 		VideoMedia( MRef<Codec *> codec, MRef<VideoDisplay *> display, MRef<ImageMixer *> mixer, MRef<Grabber *> = NULL, uint32_t receivingWidth = 176, uint32_t receivingHeight=144 );

Modified: trunk/libminisip/source/subsystem_media/video/VideoMedia.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/video/VideoMedia.cxx	2007-12-11 20:05:20 UTC (rev 3551)
+++ trunk/libminisip/source/subsystem_media/video/VideoMedia.cxx	2007-12-12 14:54:59 UTC (rev 3552)
@@ -44,7 +44,7 @@
 using namespace std;
 
 VideoMedia::VideoMedia( MRef<Codec *> codec, MRef<VideoDisplay *> display, MRef<ImageMixer *> mixer, MRef<Grabber *> grabber, uint32_t receivingWidth, uint32_t receivingHeight ):
-                Media( codec ),grabber(grabber),display(display),mixer(mixer),receivingWidth(receivingWidth),receivingHeight(receivingHeight){
+                RealtimeMedia( codec ),grabber(grabber),display(display),mixer(mixer),receivingWidth(receivingWidth),receivingHeight(receivingHeight){
 
         this->codec = dynamic_cast<VideoCodec *>(*codec);
         massert( this->codec );
@@ -100,7 +100,7 @@
 
 
 void VideoMedia::sendVideoData( byte_t * data, uint32_t length, uint32_t ts, bool marker ){
-        Media::sendData( data, length, ts, marker );
+        sendData( data, length, ts, marker );
 }
 
 void VideoMedia::registerMediaSource( uint32_t ssrc, string callId ){