adding renderer to mediaplayer class

havlenapetr · Aug 4, 2010 · a89be17 · a89be17
1 parent 132ba26
commit a89be17
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/jni/libmediaplayer/mediaplayer.cpp b/jni/libmediaplayer/mediaplayer.cpp
@@ -42,13 +42,11 @@ MediaPlayer::MediaPlayer()
     pthread_mutex_init(&mLock, NULL);
     mLeftVolume = mRightVolume = 1.0;
     mVideoWidth = mVideoHeight = 0;
-    mVideoQueue = new PacketQueue();
     sPlayer = this;
 }
 
 MediaPlayer::~MediaPlayer()
 {
-	free(mVideoQueue);
 	if(mListener != NULL) {
 		free(mListener);
 	}

diff --git a/jni/libmediaplayer/mediaplayer.h b/jni/libmediaplayer/mediaplayer.h
@@ -6,7 +6,7 @@
 #include <jni.h>
 #include <android/Errors.h>
 
-#include "packetqueue.h"
+#include "renderer.h"
 #include "decoder_audio.h"
 #include "decoder_video.h"
 
@@ -152,7 +152,6 @@ class MediaPlayer
 
 	double 						mTime;
 	pthread_mutex_t             mLock;
-	pthread_t					mVideoThread;
 	pthread_t					mPlayerThread;
 	PacketQueue*				mVideoQueue;
     //Mutex                       mNotifyLock;
@@ -163,6 +162,7 @@ class MediaPlayer
     int 						mVideoStreamIndex;
     DecoderAudio*				mDecoderAudio;
 	DecoderVideo*             	mDecoderVideo;
+	Renderer*					mRenderer;
     void*                       mCookie;
     media_player_states         mCurrentState;
     int                         mDuration;