[Xbyamp-cvs] xbmp/player/xbox MediaPlayer.cpp,1.8,1.9 MediaPlayer.h,1.4,1.5

[<ya...@us...>]

Update of /cvsroot/xbyamp/xbmp/player/xbox
In directory sc8-pr-cvs1:/tmp/cvs-serv24312/xbox

Modified Files:
	MediaPlayer.cpp MediaPlayer.h 
Log Message:
no message

Index: MediaPlayer.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/xbox/MediaPlayer.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** MediaPlayer.cpp	5 Dec 2002 16:17:13 -0000	1.8
--- MediaPlayer.cpp	5 Dec 2002 21:56:00 -0000	1.9
***************
*** 4,11 ****
  
  #include "MediaPlayer.h"
! #include "..\AsyncDirectSound.h"
  #include "debugclient.h"
! #include "..\UI/configuration.h"
! 
  //////////////////////////////////////////////////////////////////////
  // Construction/Destruction
--- 4,11 ----
  
  #include "MediaPlayer.h"
! #include "../AsyncDirectSound.h"
  #include "debugclient.h"
! #include "../UI/configuration.h"
! #include "../xboxmediaplayer.h"
  //////////////////////////////////////////////////////////////////////
  // Construction/Destruction
***************
*** 16,22 ****
  
  //******************************************************************************************
! CMediaPlayer::CMediaPlayer(CMoviePlayer& player, CXboxVideoRenderer* pVideoRenderer)
  :m_player(player)
  ,m_pVideoRenderer(pVideoRenderer)
  {
  	callback =this;
--- 16,23 ----
  
  //******************************************************************************************
! CMediaPlayer::CMediaPlayer(CMoviePlayer& player, CXboxVideoRenderer* pVideoRenderer, CApplication* pApplication)
  :m_player(player)
  ,m_pVideoRenderer(pVideoRenderer)
+ ,m_pApplication(pApplication)
  {
  	callback =this;
***************
*** 62,69 ****
  	if (m_bPlaying)
  	{
  		m_pVideoRenderer->Clear();
  		m_player.Stop();
  	}
- 	m_bPlaying=false;
  
  	return S_OK;
--- 63,71 ----
  	if (m_bPlaying)
  	{
+ 		m_bPlaying=false;
  		m_pVideoRenderer->Clear();
  		m_player.Stop();
+ 		m_pApplication->OnPlaybackComplete();
  	}
  
  	return S_OK;
***************
*** 86,92 ****
  			{
  				CloseFile();
- 				m_pVideoRenderer->Clear();
  			}
- 			m_bPlaying=false;
  			return -1;
  		}
--- 88,92 ----

Index: MediaPlayer.h
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/xbox/MediaPlayer.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MediaPlayer.h	4 Dec 2002 20:58:00 -0000	1.4
--- MediaPlayer.h	5 Dec 2002 21:56:00 -0000	1.5
***************
*** 18,25 ****
  #include "..\movieplayer.h"
  #include "..\xbox_video.h"
  class CMediaPlayer : public MediaPlayer
  {
  public:
! 	CMediaPlayer(CMoviePlayer& player, CXboxVideoRenderer* pVideoRenderer);
  	virtual ~CMediaPlayer();
    virtual HRESULT Initialize() ;
--- 18,28 ----
  #include "..\movieplayer.h"
  #include "..\xbox_video.h"
+ 
+ class CApplication;
+ 
  class CMediaPlayer : public MediaPlayer
  {
  public:
! 	CMediaPlayer(CMoviePlayer& player, CXboxVideoRenderer* pVideoRenderer, CApplication* pApplication);
  	virtual ~CMediaPlayer();
    virtual HRESULT Initialize() ;
***************
*** 58,61 ****
--- 61,65 ----
  	CMoviePlayer&				m_player;
  	CXboxVideoRenderer* m_pVideoRenderer;
+ 	CApplication*				m_pApplication;
  };