[Xbyamp-cvs] xbmp/player/xbox MediaPlayer.cpp,1.5,1.6 MediaPlayer.h,1.2,1.3
Status: Pre-Alpha
Brought to you by:
yamp
|
From: <ya...@us...> - 2002-12-03 17:47:09
|
Update of /cvsroot/xbyamp/xbmp/player/xbox
In directory sc8-pr-cvs1:/tmp/cvs-serv25740/player/xbox
Modified Files:
MediaPlayer.cpp MediaPlayer.h
Log Message:
removed compiler warnings
Index: MediaPlayer.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/xbox/MediaPlayer.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MediaPlayer.cpp 2 Dec 2002 17:01:24 -0000 1.5
--- MediaPlayer.cpp 3 Dec 2002 17:47:05 -0000 1.6
***************
*** 6,9 ****
--- 6,10 ----
#include "AsyncDirectSound.h"
#include "xbox/debugclient.h"
+ #include "UI/configuration.h"
//////////////////////////////////////////////////////////////////////
***************
*** 11,15 ****
//////////////////////////////////////////////////////////////////////
extern CASyncDirectSound* m_pAudioDecoder;
!
//******************************************************************************************
--- 12,16 ----
//////////////////////////////////////////////////////////////////////
extern CASyncDirectSound* m_pAudioDecoder;
! extern CConfiguration::PlayerSettings g_playerSettings;
//******************************************************************************************
***************
*** 199,202 ****
{
if (!m_bPlaying) return;
! m_player.SetPlaySpeed(iSpeed);
}
--- 200,222 ----
{
if (!m_bPlaying) return;
! m_player.SetPlaySpeed((float)iSpeed);
! }
!
! //******************************************************************************************
! void CMediaPlayer::SetAudioStream(int iStream)
! {
! m_player.SelectAudioStream(iStream);
! }
!
!
! //******************************************************************************************
! void CMediaPlayer::OnAudioStreamChanged()
! {
! SetAudioStream(g_playerSettings.dwAudioStream);
! }
!
! //******************************************************************************************
! bool CMediaPlayer::HasAudioStream(int iStream)
! {
! return m_player.HasAudioStream(iStream);
}
Index: MediaPlayer.h
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/xbox/MediaPlayer.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MediaPlayer.h 2 Dec 2002 17:01:24 -0000 1.2
--- MediaPlayer.h 3 Dec 2002 17:47:05 -0000 1.3
***************
*** 18,23 ****
#include "..\movieplayer.h"
#include "..\xbox_video.h"
!
! class CMediaPlayer : public MediaPlayer
{
public:
--- 18,22 ----
#include "..\movieplayer.h"
#include "..\xbox_video.h"
! class CMediaPlayer : public MediaPlayer
{
public:
***************
*** 51,54 ****
--- 50,56 ----
virtual LONG GetCurrentVolume();
virtual HRESULT SetCurrentVolume(LONG nVolume);
+ virtual void OnAudioStreamChanged();
+ void SetAudioStream(int iStream);
+ virtual bool HasAudioStream(int iStream);
private:
bool m_bPlaying;
|