[Xbyamp-cvs] xbmp/player/xbox iso9660.h,1.1,1.2 MediaPlayer.cpp,1.6,1.7 MediaPlayer.h,1.3,1.4
Status: Pre-Alpha
Brought to you by:
yamp
From: <ya...@us...> - 2002-12-04 20:58:41
|
Update of /cvsroot/xbyamp/xbmp/player/xbox In directory sc8-pr-cvs1:/tmp/cvs-serv26514/player/xbox Modified Files: iso9660.h MediaPlayer.cpp MediaPlayer.h Log Message: no message Index: iso9660.h =================================================================== RCS file: /cvsroot/xbyamp/xbmp/player/xbox/iso9660.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** iso9660.h 28 Nov 2002 21:47:35 -0000 1.1 --- iso9660.h 4 Dec 2002 20:57:56 -0000 1.2 *************** *** 3,7 **** #include "IoSupport.h" ! #include "UI\CatalogueProvider.h" #include <vector> --- 3,7 ---- #include "IoSupport.h" ! #include "..\UI\CatalogueProvider.h" #include <vector> Index: MediaPlayer.cpp =================================================================== RCS file: /cvsroot/xbyamp/xbmp/player/xbox/MediaPlayer.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** MediaPlayer.cpp 3 Dec 2002 17:47:05 -0000 1.6 --- MediaPlayer.cpp 4 Dec 2002 20:57:58 -0000 1.7 *************** *** 4,10 **** #include "MediaPlayer.h" ! #include "AsyncDirectSound.h" ! #include "xbox/debugclient.h" ! #include "UI/configuration.h" ////////////////////////////////////////////////////////////////////// --- 4,10 ---- #include "MediaPlayer.h" ! #include "..\AsyncDirectSound.h" ! #include "debugclient.h" ! #include "..\UI/configuration.h" ////////////////////////////////////////////////////////////////////// *************** *** 13,16 **** --- 13,17 ---- extern CASyncDirectSound* m_pAudioDecoder; extern CConfiguration::PlayerSettings g_playerSettings; + CAudioStreamChangedCallback* callback ; //****************************************************************************************** *************** *** 19,22 **** --- 20,24 ---- ,m_pVideoRenderer(pVideoRenderer) { + callback =this; m_bPlaying=false; } *************** *** 74,77 **** --- 76,80 ---- { if (!m_bPlaying) return -1; + if (m_player.DoProcess()) { *************** *** 82,85 **** --- 85,89 ---- if (m_bPlaying) { + CloseFile(); m_pVideoRenderer->Clear(); } *************** *** 220,222 **** { return m_player.HasAudioStream(iStream); ! } \ No newline at end of file --- 224,231 ---- { return m_player.HasAudioStream(iStream); ! } ! ! float CMediaPlayer::GetAVDelay() ! { ! return m_player.GetAVDelay(); ! } Index: MediaPlayer.h =================================================================== RCS file: /cvsroot/xbyamp/xbmp/player/xbox/MediaPlayer.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MediaPlayer.h 3 Dec 2002 17:47:05 -0000 1.3 --- MediaPlayer.h 4 Dec 2002 20:58:00 -0000 1.4 *************** *** 53,56 **** --- 53,57 ---- void SetAudioStream(int iStream); virtual bool HasAudioStream(int iStream); + float GetAVDelay(); private: bool m_bPlaying; |