xbyamp-cvs Mailing List for yamp
Status: Pre-Alpha
Brought to you by:
yamp
Menu
▾
▴
xbyamp-cvs — cvs changelog
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(186) |
Dec
(40) |
|---|
|
From: <ya...@us...> - 2002-12-05 21:56:03
|
Update of /cvsroot/xbyamp/xbmp/player/UI
In directory sc8-pr-cvs1:/tmp/cvs-serv24312/UI
Modified Files:
Catalogue.cpp
Log Message:
no message
Index: Catalogue.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/Catalogue.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Catalogue.cpp 28 Nov 2002 21:47:34 -0000 1.1
--- Catalogue.cpp 5 Dec 2002 21:56:00 -0000 1.2
***************
*** 8,12 ****
#include "RemoteCatalogue.h"
#include "LegacyCatalogue.h"
!
#include <algorithm>
--- 8,12 ----
#include "RemoteCatalogue.h"
#include "LegacyCatalogue.h"
! #include "../xbox/debugclient.h"
#include <algorithm>
***************
*** 30,34 ****
bool operator()(CatalogueProvider::Item& rpStart, CatalogueProvider::Item& rpEnd)
{
! return (rpStart.strPath.compare( rpEnd.strPath )<0);
}
};
--- 30,52 ----
bool operator()(CatalogueProvider::Item& rpStart, CatalogueProvider::Item& rpEnd)
{
! if ( ( (rpStart.dwAttributes & FILE_ATTRIBUTE_NORMAL) &&
! (rpEnd.dwAttributes & FILE_ATTRIBUTE_NORMAL) ) ||
! ( (rpStart.dwAttributes & FILE_ATTRIBUTE_DIRECTORY) &&
! (rpEnd.dwAttributes & FILE_ATTRIBUTE_DIRECTORY) ) )
! {
! char szfilename1[1024];
! char szfilename2[1024];
! strcpy(szfilename1,rpStart.strPath.c_str());
! strcpy(szfilename2,rpEnd.strPath.c_str());
! for (int i=0; i < (int)strlen(szfilename1); i++)
! szfilename1[i]=tolower(szfilename1[i]);
!
! for (i=0; i < (int)strlen(szfilename2); i++)
! szfilename2[i]=tolower(szfilename2[i]);
! //return (rpStart.strPath.compare( rpEnd.strPath )<0);
! return (strcmp(szfilename1,szfilename2)<0);
! }
! if (rpStart.dwAttributes & FILE_ATTRIBUTE_NORMAL ) return false;
! return true;
}
};
***************
*** 38,46 ****
bool operator()(CatalogueProvider::Item& rpStart, CatalogueProvider::Item& rpEnd)
{
! if (!((rpStart.dwAttributes & FILE_ATTRIBUTE_DIRECTORY) &&
! (rpStart.dwAttributes & FILE_ATTRIBUTE_NORMAL) ))
! return false;
! return (rpStart.strPath.compare( rpEnd.strPath )<0);
}
};
--- 56,101 ----
bool operator()(CatalogueProvider::Item& rpStart, CatalogueProvider::Item& rpEnd)
{
! if ( ( (rpStart.dwAttributes & FILE_ATTRIBUTE_NORMAL) &&
! (rpEnd.dwAttributes & FILE_ATTRIBUTE_NORMAL) ) ||
! ( (rpStart.dwAttributes & FILE_ATTRIBUTE_DIRECTORY) &&
! (rpEnd.dwAttributes & FILE_ATTRIBUTE_DIRECTORY) ) )
! {
! char szfilename1[1024], *extension1;
! char szfilename2[1024], *extension2;
! strcpy(szfilename1,rpStart.strPath.c_str());
! strcpy(szfilename2,rpEnd.strPath.c_str());
!
! for( int i=strlen(szfilename1) ; i>0 ; i-- )
! {
! if( szfilename1[i]=='.' )
! {
! extension1=(szfilename1)+i+1;
! break;
! }
! }
! for( int i=strlen(szfilename2) ; i>0 ; i-- )
! {
! if( szfilename2[i]=='.' )
! {
! extension2=(szfilename2)+i+1;
! break;
! }
! }
! for (int i=0; i < (int)strlen(szfilename1); i++)
! szfilename1[i]=tolower(szfilename1[i]);
!
! for (i=0; i < (int)strlen(szfilename2); i++)
! szfilename2[i]=tolower(szfilename2[i]);
!
! int icmp=(strcmp(extension1,extension2));
! if (icmp==0)
! {
! return (strcmp(szfilename1, szfilename2)<0);
! }
! return (icmp<0);
! }
! if (rpStart.dwAttributes & FILE_ATTRIBUTE_NORMAL ) return false;
! return true;
}
};
|
|
From: <ya...@us...> - 2002-12-05 21:56:03
|
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;
};
|
|
From: <ya...@us...> - 2002-12-05 21:56:03
|
Update of /cvsroot/xbyamp/xbmp/player
In directory sc8-pr-cvs1:/tmp/cvs-serv24312
Modified Files:
MoviePlayer.cpp XBoxMediaPlayer.cpp
Log Message:
no message
Index: MoviePlayer.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/MoviePlayer.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** MoviePlayer.cpp 5 Dec 2002 16:15:31 -0000 1.16
--- MoviePlayer.cpp 5 Dec 2002 21:56:00 -0000 1.17
***************
*** 9,13 ****
// - shoutcast
// - select audio stream
! // - files not closed when using relax->end of file->crash
//
//
--- 9,16 ----
// - shoutcast
// - select audio stream
! // - albums : queing of mp3 files
! // - alpha sorting filenames
! // - slow UI when playing files
! //
//
//
Index: XBoxMediaPlayer.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/XBoxMediaPlayer.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** XBoxMediaPlayer.cpp 5 Dec 2002 18:07:46 -0000 1.15
--- XBoxMediaPlayer.cpp 5 Dec 2002 21:56:00 -0000 1.16
***************
*** 285,289 ****
// Initialize AVI/VCD Player
m_pVideoRenderer = new CXboxVideoRenderer(m_pd3dDevice);
! m_pMediaPlayer = new CMediaPlayer(m_player,m_pVideoRenderer);
if( FAILED( m_pMediaPlayer->Initialize( ) ) )
{
--- 285,289 ----
// Initialize AVI/VCD Player
m_pVideoRenderer = new CXboxVideoRenderer(m_pd3dDevice);
! m_pMediaPlayer = new CMediaPlayer(m_player,m_pVideoRenderer,this);
if( FAILED( m_pMediaPlayer->Initialize( ) ) )
{
|
|
From: <ya...@us...> - 2002-12-05 21:53:40
|
Update of /cvsroot/xbyamp/xbmp/player
In directory sc8-pr-cvs1:/tmp/cvs-serv23530
Modified Files:
AsyncDirectSound.cpp
Log Message:
no message
Index: AsyncDirectSound.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/AsyncDirectSound.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AsyncDirectSound.cpp 4 Dec 2002 20:57:37 -0000 1.3
--- AsyncDirectSound.cpp 5 Dec 2002 21:53:37 -0000 1.4
***************
*** 62,66 ****
m_pDSound->GetTime(&m_delay);
m_delay-=m_startTime;
- mp_msg(0,0,"callback%i", m_delay);
}
}
--- 62,65 ----
***************
*** 71,76 ****
CASyncDirectSound::CASyncDirectSound(int iChannels, unsigned int uiSamplesPerSec, unsigned int uiBitsPerSample)
{
mp_msg(0,0,"init directsound chns:%i rate:%i, bits:%i",iChannels,uiSamplesPerSec,uiBitsPerSample);
! m_dwPacketSize = 4608;
m_bPause = false;
m_bIsPlaying = false;
--- 70,76 ----
CASyncDirectSound::CASyncDirectSound(int iChannels, unsigned int uiSamplesPerSec, unsigned int uiBitsPerSample)
{
+
mp_msg(0,0,"init directsound chns:%i rate:%i, bits:%i",iChannels,uiSamplesPerSec,uiBitsPerSample);
! m_dwPacketSize = 1152 * 2 * iChannels;
m_bPause = false;
m_bIsPlaying = false;
***************
*** 85,98 ****
ZeroMemory(&m_wfx,sizeof(m_wfx));
! // request a 16-bit stereo primary sound buffer with 22 KHz sampling rate
! m_wfx.wFormatTag = WAVE_FORMAT_PCM;
! m_wfx.nChannels = iChannels;
! m_wfx.nSamplesPerSec = uiSamplesPerSec;
! m_wfx.wBitsPerSample = uiBitsPerSample;
! m_wfx.nBlockAlign = (m_wfx.wBitsPerSample / 8) * m_wfx.nChannels;
! m_wfx.nAvgBytesPerSec = m_wfx.nSamplesPerSec * m_wfx.nBlockAlign;
// Create enough samples to hold approx 2 sec worth of audio.
! m_dwNumPackets = ( 2 * (m_wfx.nSamplesPerSec / ( m_dwPacketSize / 2 * m_wfx.nChannels )));
m_pbSampleData = new BYTE[ m_dwNumPackets * m_dwPacketSize ];
m_adwStatus = new DWORD[ m_dwNumPackets ];
--- 85,97 ----
ZeroMemory(&m_wfx,sizeof(m_wfx));
! XAudioCreatePcmFormat( iChannels,
! uiSamplesPerSec,
! uiBitsPerSample,
! &m_wfx
! );
!
// Create enough samples to hold approx 2 sec worth of audio.
! m_dwNumPackets = ( (m_wfx.nSamplesPerSec / ( m_dwPacketSize / (2 * m_wfx.nChannels) )) / 2);
m_pbSampleData = new BYTE[ m_dwNumPackets * m_dwPacketSize ];
m_adwStatus = new DWORD[ m_dwNumPackets ];
***************
*** 110,125 ****
for( DWORD j = 0; j < m_dwNumPackets; j++ )
! m_adwStatus[ j ] = XMEDIAPACKET_STATUS_SUCCESS;
! DSMIXBINVOLUMEPAIR dsmbvp[6] = {DSMIXBINVOLUMEPAIRS_DEFAULT_6CHANNEL}; // xbmp
DSMIXBINS dsmb;
! dsmb.dwMixBinCount = 6;
! dsmb.lpMixBinVolumePairs = dsmbvp;
DSSTREAMDESC dssd;
memset(&dssd,0,sizeof(dssd));
dssd.dwFlags = DSSTREAMCAPS_ACCURATENOTIFY; // xbmp=0
dssd.dwMaxAttachedPackets = m_dwNumPackets;
! dssd.lpwfxFormat = &m_wfx;
dssd.lpfnCallback = StaticStreamCallback;
dssd.lpvContext = this;
--- 109,167 ----
for( DWORD j = 0; j < m_dwNumPackets; j++ )
! m_adwStatus[ j ] = XMEDIAPACKET_STATUS_SUCCESS;
! DSMIXBINVOLUMEPAIR dsmbvp6[6] = {DSMIXBINVOLUMEPAIRS_DEFAULT_6CHANNEL};
! DSMIXBINVOLUMEPAIR dsmbvp4[4] = {DSMIXBINVOLUMEPAIRS_DEFAULT_4CHANNEL};
! DSMIXBINVOLUMEPAIR dsmbvp2[4] = {DSMIXBINVOLUMEPAIRS_DEFAULT_STEREO};
! DSMIXBINVOLUMEPAIR dsmbvp1[4] = {DSMIXBINVOLUMEPAIRS_DEFAULT_MONO};
DSMIXBINS dsmb;
!
!
! WAVEFORMATEXTENSIBLE wfx;
! wfx.Format = m_wfx;
! wfx.Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE;
! wfx.Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE);
! wfx.Samples.wValidBitsPerSample = wfx.Format.wBitsPerSample;
! switch (iChannels)
! {
! case 1:
! wfx.dwChannelMask = SPEAKER_FRONT_LEFT;
! dsmb.dwMixBinCount = 1;
! dsmb.lpMixBinVolumePairs = dsmbvp1;
! break;
!
! case 2:
! wfx.dwChannelMask = SPEAKER_FRONT_LEFT|SPEAKER_FRONT_RIGHT;
! dsmb.dwMixBinCount = 2;
! dsmb.lpMixBinVolumePairs = dsmbvp2;
! break;
!
! case 3:
! case 4:
! wfx.dwChannelMask =SPEAKER_FRONT_LEFT|SPEAKER_FRONT_RIGHT|SPEAKER_BACK_LEFT|SPEAKER_BACK_RIGHT;
! dsmb.dwMixBinCount = 4;
! dsmb.lpMixBinVolumePairs = dsmbvp4;
! break;
!
! case 5:
! wfx.dwChannelMask =SPEAKER_FRONT_CENTER|SPEAKER_FRONT_LEFT|SPEAKER_FRONT_RIGHT|SPEAKER_BACK_LEFT|SPEAKER_BACK_RIGHT;
! dsmb.dwMixBinCount = 5;
! dsmb.lpMixBinVolumePairs = dsmbvp6;
! break;
!
! case 6:
! wfx.dwChannelMask = SPEAKER_FRONT_LEFT|SPEAKER_FRONT_RIGHT|SPEAKER_FRONT_CENTER|SPEAKER_LOW_FREQUENCY|SPEAKER_BACK_LEFT|SPEAKER_BACK_RIGHT;
! dsmb.dwMixBinCount = 6;
! dsmb.lpMixBinVolumePairs = dsmbvp6;
! break;
! }
! wfx.SubFormat = KSDATAFORMAT_SUBTYPE_PCM;
DSSTREAMDESC dssd;
memset(&dssd,0,sizeof(dssd));
+
dssd.dwFlags = DSSTREAMCAPS_ACCURATENOTIFY; // xbmp=0
dssd.dwMaxAttachedPackets = m_dwNumPackets;
! dssd.lpwfxFormat = (WAVEFORMATEX*)&wfx;
dssd.lpfnCallback = StaticStreamCallback;
dssd.lpvContext = this;
***************
*** 132,135 ****
--- 174,182 ----
m_pStream->SetHeadroom(600);
m_pStream->SetVolume(VOLUME_MAX);
+ m_pStream->Flush();
+ // if (S_OK== m_pStream->SetFormat((WAVEFORMATEX*)&wfx))
+ // {
+ // OUTPUTDEBUG("*WARNING* Unable to set format on sound stream!");
+ // }
m_bIsAllocated = true;
|
|
From: <ya...@us...> - 2002-12-05 18:07:53
|
Update of /cvsroot/xbyamp/xbmp/player
In directory sc8-pr-cvs1:/tmp/cvs-serv25608
Modified Files:
buildtime.h FileRelax.cpp streaming.cpp XBoxMediaPlayer.cpp
XBoxMediaPlayer.h
Log Message:
fixed hanging when playing mpeg1 over relax @ and of file
Index: buildtime.h
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/buildtime.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** buildtime.h 5 Dec 2002 16:15:31 -0000 1.7
--- buildtime.h 5 Dec 2002 18:07:45 -0000 1.8
***************
*** 1,4 ****
#ifndef BUILD_TIME_H
#define BUILD_TIME_H
! #define BUILD_TIME L"build:5-dec-2002 17:00"
#endif
--- 1,4 ----
#ifndef BUILD_TIME_H
#define BUILD_TIME_H
! #define BUILD_TIME L"build:5-dec-2002 19:00"
#endif
Index: FileRelax.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/FileRelax.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FileRelax.cpp 5 Dec 2002 16:15:31 -0000 1.3
--- FileRelax.cpp 5 Dec 2002 18:07:46 -0000 1.4
***************
*** 118,123 ****
char result[32];
! send(m_socket,"CLSE",4,0);
! recv(m_socket,result,32,0);
closesocket(m_socket);
}
--- 118,124 ----
char result[32];
! int iBytesSend=send(m_socket,"CLSE",4,0);
! int iBytesRecv=recv(m_socket,result,32,0);
!
closesocket(m_socket);
}
Index: streaming.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/streaming.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** streaming.cpp 5 Dec 2002 16:15:31 -0000 1.3
--- streaming.cpp 5 Dec 2002 18:07:46 -0000 1.4
***************
*** 193,207 ****
{
m_eventStarted.Set();
! while (!m_bStop)
{
!
! while ( Need2Refill() && !m_bEOFReached)
{
m_eventNeedFilling.Wait();
Fill();
}
- Need2Refill() ;
- m_eventNeedFilling.Wait();
}
mp_msg(0,0,"process done");
}
--- 193,211 ----
{
m_eventStarted.Set();
! while (!m_bStop && !m_bEOFReached)
{
! if ( Need2Refill() )
{
m_eventNeedFilling.Wait();
Fill();
}
}
+ if (m_pFile)
+ {
+ m_pFile->Close();
+ delete m_pFile;
+ }
+ m_pFile=NULL;
+
mp_msg(0,0,"process done");
}
Index: XBoxMediaPlayer.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/XBoxMediaPlayer.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** XBoxMediaPlayer.cpp 5 Dec 2002 16:15:31 -0000 1.14
--- XBoxMediaPlayer.cpp 5 Dec 2002 18:07:46 -0000 1.15
***************
*** 1090,1093 ****
--- 1090,1102 ----
m_pd3dDevice->BlockUntilVerticalBlank();
}
+ else
+ {
+ CMovieInterface* pInterface=(CMovieInterface* )m_pUserInterfaces[m_appState];
+ // when control panel is visible:
+ if (pInterface->IsControlPanelVisible())
+ {
+ m_pd3dDevice->BlockUntilVerticalBlank();
+ }
+ }
}
}
Index: XBoxMediaPlayer.h
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/XBoxMediaPlayer.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** XBoxMediaPlayer.h 4 Dec 2002 20:57:52 -0000 1.8
--- XBoxMediaPlayer.h 5 Dec 2002 18:07:47 -0000 1.9
***************
*** 134,137 ****
--- 134,139 ----
virtual void SetTime(uint64_t);
virtual void OnPlaybackComplete();
+ void OnFastBackward();
+ void OnFastForward();
CMediaPlayer* m_pMediaPlayer;
***************
*** 157,162 ****
BOOL GetAlbumTexture(CHAR* szThumbnailPath, LPCSTR szPath);
VOID GetThumbnailFile(CHAR* szThumbnailPath, CHAR* szItemPath);
- void OnFastBackward();
- void OnFastForward();
void OnKey(char chKey);
BOOL InitializeNetwork();
--- 159,162 ----
|
|
From: <ya...@us...> - 2002-12-05 18:07:53
|
Update of /cvsroot/xbyamp/xbmp/player/UI
In directory sc8-pr-cvs1:/tmp/cvs-serv25608/UI
Modified Files:
ControlPanel.cpp ControlPanel.h MovieInterface.cpp
Log Message:
fixed hanging when playing mpeg1 over relax @ and of file
Index: ControlPanel.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/ControlPanel.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ControlPanel.cpp 28 Nov 2002 21:47:34 -0000 1.1
--- ControlPanel.cpp 5 Dec 2002 18:07:48 -0000 1.2
***************
*** 4,7 ****
--- 4,8 ----
#include "ControlPanel.h"
+ #include "../xboxmediaplayer.h"
//////////////////////////////////////////////////////////////////////
***************
*** 117,120 ****
--- 118,126 ----
}
+ void CControlPanel::SetApplication(CApplication* Application)
+ {
+ m_pApplication=Application;
+ }
+
HRESULT CControlPanel::Destroy()
{
***************
*** 161,176 ****
if (m_pMediaPlayer->SupportsSeek())
{
! BOOL bPlaying = m_pMediaPlayer->IsPlaying();
!
! if (bPlaying)
! m_pMediaPlayer->Stop();
!
! if( m_pMediaPlayer->GetPosition() < m_dwStepSize )
! m_pMediaPlayer->SetPosition( 0 );
! else
! m_pMediaPlayer->SetPosition( m_pMediaPlayer->GetPosition()-m_dwStepSize );
!
! if (bPlaying)
! m_pMediaPlayer->Play();
}
--- 167,171 ----
if (m_pMediaPlayer->SupportsSeek())
{
! m_pApplication->OnFastBackward();
}
***************
*** 181,196 ****
if (m_pMediaPlayer->SupportsSeek())
{
! BOOL bPlaying = m_pMediaPlayer->IsPlaying();
!
! if (bPlaying)
! m_pMediaPlayer->Stop();
!
! if( m_pMediaPlayer->GetPosition() + m_dwStepSize > m_pMediaPlayer->GetPlaybackTime() )
! m_pMediaPlayer->SetPosition( m_pMediaPlayer->GetPlaybackTime() );
! else
! m_pMediaPlayer->SetPosition( m_pMediaPlayer->GetPosition()+m_dwStepSize );
!
! if (bPlaying)
! m_pMediaPlayer->Play();
}
--- 176,180 ----
if (m_pMediaPlayer->SupportsSeek())
{
! m_pApplication->OnFastForward();
}
Index: ControlPanel.h
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/ControlPanel.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ControlPanel.h 28 Nov 2002 21:47:34 -0000 1.1
--- ControlPanel.h 5 Dec 2002 18:07:48 -0000 1.2
***************
*** 32,35 ****
--- 32,37 ----
#define VOLUME_STEP 50
+ class CApplication;
+
class CControlPanel
{
***************
*** 58,62 ****
HRESULT Destroy();
!
private:
--- 60,64 ----
HRESULT Destroy();
! void SetApplication(CApplication* Application);
private:
***************
*** 79,82 ****
--- 81,85 ----
DWORD m_dwStepSize; // Represents a change of 5% from the current position.
+ CApplication* m_pApplication;
};
Index: MovieInterface.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/MovieInterface.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MovieInterface.cpp 4 Dec 2002 20:56:49 -0000 1.4
--- MovieInterface.cpp 5 Dec 2002 18:07:49 -0000 1.5
***************
*** 65,68 ****
--- 65,69 ----
return E_FAIL;
+ m_cplControls.SetApplication(m_pApplication);
OutputDebugString("Movie UI ready.\n");
return S_OK;
|
|
From: <ya...@us...> - 2002-12-05 16:17:19
|
Update of /cvsroot/xbyamp/xbmp/player/xbox
In directory sc8-pr-cvs1:/tmp/cvs-serv17121/xbox
Modified Files:
MediaPlayer.cpp
Log Message:
no message
Index: MediaPlayer.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/xbox/MediaPlayer.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** MediaPlayer.cpp 4 Dec 2002 20:57:58 -0000 1.7
--- MediaPlayer.cpp 5 Dec 2002 16:17:13 -0000 1.8
***************
*** 28,32 ****
CMediaPlayer::~CMediaPlayer()
{
!
}
--- 28,32 ----
CMediaPlayer::~CMediaPlayer()
{
! CloseFile();
}
|
|
From: <ya...@us...> - 2002-12-05 16:15:35
|
Update of /cvsroot/xbyamp/xbmp/player
In directory sc8-pr-cvs1:/tmp/cvs-serv16512
Modified Files:
buildtime.h FileRelax.cpp MoviePlayer.cpp streaming.cpp
XBoxMediaPlayer.cpp
Log Message:
no message
Index: buildtime.h
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/buildtime.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** buildtime.h 4 Dec 2002 20:57:40 -0000 1.6
--- buildtime.h 5 Dec 2002 16:15:31 -0000 1.7
***************
*** 1,4 ****
#ifndef BUILD_TIME_H
#define BUILD_TIME_H
! #define BUILD_TIME L"build:4-dec-2002 21:00"
#endif
--- 1,4 ----
#ifndef BUILD_TIME_H
#define BUILD_TIME_H
! #define BUILD_TIME L"build:5-dec-2002 17:00"
#endif
Index: FileRelax.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/FileRelax.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FileRelax.cpp 3 Dec 2002 17:47:05 -0000 1.2
--- FileRelax.cpp 5 Dec 2002 16:15:31 -0000 1.3
***************
*** 96,99 ****
--- 96,101 ----
if (sending<=0)
{
+ OutputDebugString( "CFileRelax::Read() failed 2 get response.\n" );
+
return 0;
}
Index: MoviePlayer.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/MoviePlayer.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** MoviePlayer.cpp 4 Dec 2002 20:57:42 -0000 1.15
--- MoviePlayer.cpp 5 Dec 2002 16:15:31 -0000 1.16
***************
*** 9,13 ****
// - shoutcast
// - select audio stream
! // -
//
//
--- 9,13 ----
// - shoutcast
// - select audio stream
! // - files not closed when using relax->end of file->crash
//
//
***************
*** 17,20 ****
--- 17,22 ----
// - multiple screen resolutions
// - 15min shutdown on non-debug systems
+ // - control panel: slider not highlighted when selected
+ // - audio settings:crash
//
//
Index: streaming.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/streaming.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** streaming.cpp 30 Nov 2002 20:32:13 -0000 1.2
--- streaming.cpp 5 Dec 2002 16:15:31 -0000 1.3
***************
*** 29,33 ****
int streaming_seek(int fd,long pos)
{
- mp_msg(0,0,"seek %x", pos);
return streamer.Seek(fd,pos);
}
--- 29,32 ----
***************
*** 35,39 ****
int streaming_read( int fd, char* buffer, int iLen )
{
! return streamer.Read(fd,buffer,iLen);
}
--- 34,39 ----
int streaming_read( int fd, char* buffer, int iLen )
{
! int iread=streamer.Read(fd,buffer,iLen);
! return iread;
}
***************
*** 51,57 ****
//****************************************************************************************
CStreaming::CStreaming()
! {
!
m_pFile=NULL;
}
--- 51,57 ----
//****************************************************************************************
CStreaming::CStreaming()
! {
m_pFile=NULL;
+ m_byCache=NULL;
}
***************
*** 59,62 ****
--- 59,63 ----
CStreaming::~CStreaming()
{
+
}
***************
*** 67,70 ****
--- 68,77 ----
int CStreaming::Open(const string& strProtocol, const string& strHostName, const string &strFileName)
{
+ if (m_byCache)
+ {
+ delete [] m_byCache;
+ m_byCache=NULL;
+ }
+
mp_msg(0,0,"open %s %s %s\n", strProtocol.c_str(), strHostName.c_str(), strFileName.c_str());
CSingleLock lock(m_critSection);
***************
*** 86,90 ****
int CStreaming::Seek(int fd, long pos)
{
! if (!m_pFile) return -1;
CSingleLock lock(m_critSection);
--- 93,100 ----
int CStreaming::Seek(int fd, long pos)
{
! if (!m_pFile)
! {
! return -1;
! }
CSingleLock lock(m_critSection);
***************
*** 100,111 ****
int CStreaming::Read(int fd, char *pBuffer, int iLen)
{
! if (!m_pFile) return -1;
!
// copy from buffer..
int iBytesRead=0;
int iSize=0;
int iPos=0;
m_eventFilled.Reset();
! while (!m_bEOFReached && iLen>0)
{
unsigned long ulBytesInCache=CacheFilled();
--- 110,124 ----
int CStreaming::Read(int fd, char *pBuffer, int iLen)
{
! if (!m_pFile)
! {
! return -1;
! }
// copy from buffer..
int iBytesRead=0;
int iSize=0;
int iPos=0;
+ int iLenOrg=iLen;
m_eventFilled.Reset();
! while (iLen>0)
{
unsigned long ulBytesInCache=CacheFilled();
***************
*** 124,131 ****
--- 137,152 ----
else
{
+ if (m_bEOFReached && 0==ulBytesInCache)
+ {
+ break;
+ }
Need2Refill();
m_eventFilled.Wait();
}
}
+ if (iBytesRead != iLenOrg)
+ {
+ mp_msg(0,0,"read only %i/%i bytes",iBytesRead,iLenOrg);
+ }
return iBytesRead;
}
***************
*** 134,145 ****
void CStreaming::Close()
{
CSingleLock lock(m_critSection);
m_bStop=true;
m_eventNeedFilling.Set();
m_eventStop.Wait();
! m_pFile->Close();
! delete m_pFile;
m_pFile=NULL;
m_ulReadPointer=m_ulWritePointer=0;
}
--- 155,175 ----
void CStreaming::Close()
{
+ mp_msg(0,0,"streaming close");
CSingleLock lock(m_critSection);
m_bStop=true;
m_eventNeedFilling.Set();
m_eventStop.Wait();
! if (m_pFile)
! {
! m_pFile->Close();
! delete m_pFile;
! }
m_pFile=NULL;
m_ulReadPointer=m_ulWritePointer=0;
+ if (m_byCache)
+ {
+ delete [] m_byCache;
+ m_byCache=NULL;
+ }
}
***************
*** 156,163 ****
void CStreaming::OnExit()
{
- delete [] m_byCache;
- m_byCache=NULL;
-
-
m_eventStop.Set();
}
--- 186,189 ----
***************
*** 178,181 ****
--- 204,208 ----
m_eventNeedFilling.Wait();
}
+ mp_msg(0,0,"process done");
}
***************
*** 211,214 ****
--- 238,242 ----
if (iBytesRead==0)
{
+ mp_msg(0,0,"stream eof reached");
m_eventFilled.Set();
m_bEOFReached=true;
Index: XBoxMediaPlayer.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/XBoxMediaPlayer.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** XBoxMediaPlayer.cpp 4 Dec 2002 20:57:49 -0000 1.13
--- XBoxMediaPlayer.cpp 5 Dec 2002 16:15:31 -0000 1.14
***************
*** 56,64 ****
VOID __cdecl main()
{
! CApplication xbApp;
! if( !FAILED( xbApp.Create() ) )
! xbApp.Run();
!
! while(1);
}
--- 56,65 ----
VOID __cdecl main()
{
! CApplication xbApp;
! if( !FAILED( xbApp.Create() ) )
! {
! xbApp.Run();
! xbApp.Cleanup();
! }
}
***************
*** 96,99 ****
--- 97,101 ----
{
// Freesyle UI
+ memset(m_pUserInterfaces,0,sizeof(m_pUserInterfaces));
m_bShowDelay=false;
m_appState = IN_HOME;
***************
*** 465,468 ****
--- 467,479 ----
HRESULT CApplication::Cleanup()
{
+ if (m_pMediaPlayer)
+ {
+ delete m_pMediaPlayer;
+ }
+ if ( m_pVideoRenderer ) delete m_pVideoRenderer;
+ m_pMediaPlayer=NULL;
+ m_pVideoRenderer=NULL;
+
+
return S_OK;
}
***************
*** 1073,1078 ****
else
{
! // not flipping, then wait until vsync
! m_pd3dDevice->BlockUntilVerticalBlank();
}
}
--- 1084,1093 ----
else
{
! if (m_appState != IN_MOVIE)
! {
! // not flipping, then wait until vsync only when
! // we're in UI
! m_pd3dDevice->BlockUntilVerticalBlank();
! }
}
}
***************
*** 1086,1089 ****
--- 1101,1105 ----
if (( timeGetTime() - m_dwPowerDown) >= POWERDOWN)
{
+ Cleanup();
m_dwPowerDown=timeGetTime();
CIoSupport helper;
***************
*** 1268,1271 ****
--- 1284,1288 ----
VOID CApplication::ExitToDashboard()
{
+ Cleanup();
if (g_playerSettings.szDashboard[0]!=0)
{
|
Update of /cvsroot/xbyamp/xbmp/player/mplayer In directory sc8-pr-cvs1:/tmp/cvs-serv19159 Added Files: liba52.a libavcodec.a libavcodec.lib libgcc.a libmad.lib libMP3.a libmpcodecs.lib libmpdemux.lib libmpeg2.a libpostproc.a libswscale.a Log Message: no message |
|
From: <ya...@us...> - 2002-12-04 21:41:31
|
Update of /cvsroot/xbyamp/xbmp/player/mplayer In directory sc8-pr-cvs1:/tmp/cvs-serv18643 Added Files: mp_image.h mp_msg.h mpc_info.h network.h osd.c osd.h osd_font.h Log Message: no message |
Update of /cvsroot/xbyamp/xbmp/player/mplayer In directory sc8-pr-cvs1:/tmp/cvs-serv17389 Added Files: af.c af.h af_channels.c af_delay.c af_dummy.c af_equalizer.c af_format.c af_resample.c af_volume.c afmt.c afmt.h ao_plugin.c ao_win32.c aspect.c aspect.h audio_out.c audio_out.h audio_out_internal.h audio_plugin.h codec-cfg.h common.h Config.h control.h cpudetect.h cygwin_inttypes.h dec_audio.h dec_video.h demuxer.h dsp.h equalizer.h fastmemcpy.h filter.c filter.h find_sub.c find_sub.c.orig font_load.c font_load.c.orig font_load.h geometry.c geometry.h help_mp-en.h help_mp.h helper.c img_format.h Log Message: no message |
Update of /cvsroot/xbyamp/xbmp/player/mplayer In directory sc8-pr-cvs1:/tmp/cvs-serv11922 Added Files: osd_template.c rgb2rgb.h spudec.c spudec.h stheader.h stream.h sub.c sub.c.orig sub.h subreader.cpp subreader.h swscale.h url.h vd.h vf.h vfcap.h video_out.c video_out.h video_out_internal.h vo_aa.c vo_aa.c.orig vo_md5.c vo_null.c vo_yuv4mpeg.c vorbis_static_d.lib window.c window.h Log Message: no message --- NEW FILE: vorbis_static_d.lib --- (This appears to be a binary file; contents omitted.) |
Update of /cvsroot/xbyamp/xbmp/player/mplayer In directory sc8-pr-cvs1:/tmp/cvs-serv8722 Removed Files: liba52.a libavcodec.a libavcodec.lib libgcc.a libmad.lib libMP3.a libmpcodecs.lib libmpdemux.lib libmpeg2.a libpostproc.a libswscale.a mp_image.h mp_msg.h mpc_info.h network.h osd.c osd.h osd_font.h osd_template.c rgb2rgb.h spudec.c spudec.h stheader.h stream.h sub.c sub.c.orig sub.h subreader.cpp subreader.h swscale.h url.h vd.h vf.h vfcap.h video_out.c video_out.h video_out_internal.h vo_aa.c vo_aa.c.orig vo_md5.c vo_null.c vo_yuv4mpeg.c window.c window.h Log Message: no message --- liba52.a DELETED --- --- libavcodec.a DELETED --- --- libavcodec.lib DELETED --- --- libgcc.a DELETED --- --- libmad.lib DELETED --- --- libMP3.a DELETED --- --- libmpcodecs.lib DELETED --- --- libmpdemux.lib DELETED --- --- libmpeg2.a DELETED --- --- libpostproc.a DELETED --- --- libswscale.a DELETED --- --- mp_image.h DELETED --- --- mp_msg.h DELETED --- --- mpc_info.h DELETED --- --- network.h DELETED --- --- osd.c DELETED --- --- osd.h DELETED --- --- osd_font.h DELETED --- --- osd_template.c DELETED --- --- rgb2rgb.h DELETED --- --- spudec.c DELETED --- --- spudec.h DELETED --- --- stheader.h DELETED --- --- stream.h DELETED --- --- sub.c DELETED --- --- sub.c.orig DELETED --- --- sub.h DELETED --- --- subreader.cpp DELETED --- --- subreader.h DELETED --- --- swscale.h DELETED --- --- url.h DELETED --- --- vd.h DELETED --- --- vf.h DELETED --- --- vfcap.h DELETED --- --- video_out.c DELETED --- --- video_out.h DELETED --- --- video_out_internal.h DELETED --- --- vo_aa.c DELETED --- --- vo_aa.c.orig DELETED --- --- vo_md5.c DELETED --- --- vo_null.c DELETED --- --- vo_yuv4mpeg.c DELETED --- --- window.c DELETED --- --- window.h DELETED --- |
Update of /cvsroot/xbyamp/xbmp/player/mplayer In directory sc8-pr-cvs1:/tmp/cvs-serv7924 Removed Files: af.c af.h af_channels.c af_delay.c af_dummy.c af_equalizer.c af_format.c af_resample.c af_volume.c afmt.c afmt.h ao_plugin.c ao_win32.c aspect.c aspect.h audio_out.c audio_out.h audio_out_internal.h audio_plugin.h codec-cfg.h common.h Config.h control.h cpudetect.h cygwin_inttypes.h dec_audio.h dec_video.h demuxer.h dsp.h equalizer.h fastmemcpy.h filter.c filter.h find_sub.c find_sub.c.orig font_load.c font_load.c.orig font_load.h geometry.c geometry.h help_mp-en.h help_mp.h helper.c img_format.h Log Message: no message --- af.c DELETED --- --- af.h DELETED --- --- af_channels.c DELETED --- --- af_delay.c DELETED --- --- af_dummy.c DELETED --- --- af_equalizer.c DELETED --- --- af_format.c DELETED --- --- af_resample.c DELETED --- --- af_volume.c DELETED --- --- afmt.c DELETED --- --- afmt.h DELETED --- --- ao_plugin.c DELETED --- --- ao_win32.c DELETED --- --- aspect.c DELETED --- --- aspect.h DELETED --- --- audio_out.c DELETED --- --- audio_out.h DELETED --- --- audio_out_internal.h DELETED --- --- audio_plugin.h DELETED --- --- codec-cfg.h DELETED --- --- common.h DELETED --- --- Config.h DELETED --- --- control.h DELETED --- --- cpudetect.h DELETED --- --- cygwin_inttypes.h DELETED --- --- dec_audio.h DELETED --- --- dec_video.h DELETED --- --- demuxer.h DELETED --- --- dsp.h DELETED --- --- equalizer.h DELETED --- --- fastmemcpy.h DELETED --- --- filter.c DELETED --- --- filter.h DELETED --- --- find_sub.c DELETED --- --- find_sub.c.orig DELETED --- --- font_load.c DELETED --- --- font_load.c.orig DELETED --- --- font_load.h DELETED --- --- geometry.c DELETED --- --- geometry.h DELETED --- --- help_mp-en.h DELETED --- --- help_mp.h DELETED --- --- helper.c DELETED --- --- img_format.h DELETED --- |
Update of /cvsroot/xbyamp/xbmp/player/UI
In directory sc8-pr-cvs1:/tmp/cvs-serv26514/player/UI
Modified Files:
AlbumInterface.cpp ArtistInterface.cpp
AudioSettingsInterface.cpp AudioSettingsInterface.h
CalibrateInterface.cpp CatalogueInterface.cpp
ClipInterface.cpp GeneralSettingsInterface.cpp
HomeInterface.cpp LegacyCatalogue.cpp MovieInterface.cpp
PhotoInterface.cpp PhotoInterface.h RatioInterface.cpp
ScreenInterface.cpp SettingsInterface.cpp SettingsInterface.h
SongsInterface.cpp UMusic.cpp UMusic.h UPictures.cpp
UVideos.cpp
Log Message:
no message
Index: AlbumInterface.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/AlbumInterface.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AlbumInterface.cpp 28 Nov 2002 21:47:34 -0000 1.1
--- AlbumInterface.cpp 4 Dec 2002 20:56:31 -0000 1.2
***************
*** 5,12 ****
#include "AlbumInterface.h"
! #include "UI\LocalCatalogue.h"
! #include "UI\RemoteCatalogue.h"
! #include "XboxMediaPlayer.h"
#include "Crc32.h"
--- 5,12 ----
#include "AlbumInterface.h"
! #include "LocalCatalogue.h"
! #include "RemoteCatalogue.h"
! #include "..\XboxMediaPlayer.h"
#include "Crc32.h"
Index: ArtistInterface.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/ArtistInterface.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ArtistInterface.cpp 28 Nov 2002 21:47:34 -0000 1.1
--- ArtistInterface.cpp 4 Dec 2002 20:56:33 -0000 1.2
***************
*** 5,12 ****
#include "ArtistInterface.h"
! #include "UI\LocalCatalogue.h"
! #include "UI\RemoteCatalogue.h"
! #include "XboxMediaPlayer.h"
#define NETCACHE_PACKET_SIZE 28000
--- 5,12 ----
#include "ArtistInterface.h"
! #include "LocalCatalogue.h"
! #include "RemoteCatalogue.h"
! #include "..\XboxMediaPlayer.h"
#define NETCACHE_PACKET_SIZE 28000
Index: AudioSettingsInterface.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/AudioSettingsInterface.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AudioSettingsInterface.cpp 3 Dec 2002 17:47:04 -0000 1.2
--- AudioSettingsInterface.cpp 4 Dec 2002 20:56:36 -0000 1.3
***************
*** 3,15 ****
//////////////////////////////////////////////////////////////////////
! #include "XboxMediaPlayer.h"
#include "AudioSettingsInterface.h"
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
//////////////////////////////////////////////////////////////////////
! CAudioSettingsInterface::CAudioSettingsInterface(CAudioStreamChangedCallback* callback )
! :m_pCallback (callback )
{
--- 3,16 ----
//////////////////////////////////////////////////////////////////////
! #include "../XboxMediaPlayer.h"
#include "AudioSettingsInterface.h"
+ #include "../AudioStreamChangedCallback.h"
+ extern CAudioStreamChangedCallback* callback ;
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
//////////////////////////////////////////////////////////////////////
! CAudioSettingsInterface::CAudioSettingsInterface()
{
***************
*** 40,55 ****
return E_FAIL;
}
m_dhkStream.SetPosition(440,126);
- m_iCurrentStream=1;
- m_dhkStream.SetRange( 1, 10);
- m_dhkStream.SetValue( 1 );
return S_OK;
}
-
-
VOID CAudioSettingsInterface::OnActive(LPVOID lpvCookie)
{
}
--- 41,54 ----
return E_FAIL;
}
+
+ m_dhkStream.SetRange( 0, 3);
m_dhkStream.SetPosition(440,126);
return S_OK;
}
VOID CAudioSettingsInterface::OnActive(LPVOID lpvCookie)
{
+ m_dhkStream.SetValue( g_playerSettings.dwAudioStream );
}
***************
*** 76,79 ****
--- 75,80 ----
g_playerSettings.dwAudioStream = pThis->m_mapAudioStreams[pThis->m_iCurrentStream-1];
+ pThis->m_dhkStream.SetValue(pThis->m_iCurrentStream);
+ callback->OnAudioStreamChanged();
}
else if ((!bDown) && (pThis->m_iCurrentStream>1))
***************
*** 84,88 ****
pThis->m_dhkStream.SetValue(pThis->m_iCurrentStream);
! pThis->m_pCallback->OnAudioStreamChanged();
}
}
--- 85,89 ----
pThis->m_dhkStream.SetValue(pThis->m_iCurrentStream);
! callback->OnAudioStreamChanged();
}
}
***************
*** 103,107 ****
for (int i=0; i <=255; i++)
{
! if (m_pCallback->HasAudioStream(i) )
{
m_mapAudioStreams[iNumber]=i;
--- 104,108 ----
for (int i=0; i <=255; i++)
{
! if (callback->HasAudioStream(i) )
{
m_mapAudioStreams[iNumber]=i;
***************
*** 109,114 ****
}
}
- m_dhkStream.SetRange( 1, iNumber);
- m_dhkStream.SetValue(m_iCurrentStream);
CControl* pControl = m_pSettingsInterface->GetControlFromId(m_pSettingsInterface->GetFocusId());
if (!pControl)
--- 110,113 ----
***************
*** 150,152 ****
return S_OK;
}
-
--- 149,150 ----
Index: AudioSettingsInterface.h
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/AudioSettingsInterface.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AudioSettingsInterface.h 3 Dec 2002 17:47:04 -0000 1.2
--- AudioSettingsInterface.h 4 Dec 2002 20:56:39 -0000 1.3
***************
*** 15,27 ****
#include "Dohickey.h"
#include "../AudioStreamChangedCallback.h"
- class CSettingsInterface;
#include <map>
using namespace std;
class CAudioSettingsInterface : public CUserInterface
{
public:
! CAudioSettingsInterface(CAudioStreamChangedCallback* callback );
virtual ~CAudioSettingsInterface();
--- 15,28 ----
#include "Dohickey.h"
#include "../AudioStreamChangedCallback.h"
#include <map>
using namespace std;
+ class CSettingsInterface;
+
class CAudioSettingsInterface : public CUserInterface
{
public:
! CAudioSettingsInterface();
virtual ~CAudioSettingsInterface();
***************
*** 36,45 ****
private:
- int m_iCurrentStream;
CFont* m_pfntCommon13;
CDohickey m_dhkStream;
! CAudioStreamChangedCallback* m_pCallback ;
CSettingsInterface* m_pSettingsInterface;
map<int,int> m_mapAudioStreams;
typedef map<int,int> imapAudioStreams;
--- 37,47 ----
private:
CFont* m_pfntCommon13;
CDohickey m_dhkStream;
!
CSettingsInterface* m_pSettingsInterface;
+
+ int m_iCurrentStream;
map<int,int> m_mapAudioStreams;
typedef map<int,int> imapAudioStreams;
Index: CalibrateInterface.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/CalibrateInterface.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CalibrateInterface.cpp 3 Dec 2002 17:47:05 -0000 1.3
--- CalibrateInterface.cpp 4 Dec 2002 20:56:41 -0000 1.4
***************
*** 3,7 ****
//////////////////////////////////////////////////////////////////////
! #include "XboxMediaPlayer.h"
#include "CalibrateInterface.h"
#include "Configuration.h"
--- 3,7 ----
//////////////////////////////////////////////////////////////////////
! #include "../XboxMediaPlayer.h"
#include "CalibrateInterface.h"
#include "Configuration.h"
Index: CatalogueInterface.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/CatalogueInterface.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CatalogueInterface.cpp 28 Nov 2002 21:47:34 -0000 1.1
--- CatalogueInterface.cpp 4 Dec 2002 20:56:44 -0000 1.2
***************
*** 5,14 ****
#include "CatalogueInterface.h"
! #include "UI\LocalCatalogue.h"
! #include "UI\RemoteCatalogue.h"
! #include "XboxMediaPlayer.h"
#include "Crc32.h"
! #include "xbox/iosupport.h"
#define NETCACHE_PACKET_SIZE 28000
--- 5,14 ----
#include "CatalogueInterface.h"
! #include "LocalCatalogue.h"
! #include "RemoteCatalogue.h"
! #include "..\XboxMediaPlayer.h"
#include "Crc32.h"
! #include "../xbox/iosupport.h"
#define NETCACHE_PACKET_SIZE 28000
Index: ClipInterface.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/ClipInterface.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ClipInterface.cpp 3 Dec 2002 17:47:05 -0000 1.2
--- ClipInterface.cpp 4 Dec 2002 20:56:46 -0000 1.3
***************
*** 3,7 ****
//////////////////////////////////////////////////////////////////////
! #include "XboxMediaPlayer.h"
#include "ClipInterface.h"
--- 3,7 ----
//////////////////////////////////////////////////////////////////////
! #include "../XboxMediaPlayer.h"
#include "ClipInterface.h"
Index: GeneralSettingsInterface.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/GeneralSettingsInterface.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GeneralSettingsInterface.cpp 28 Nov 2002 21:47:34 -0000 1.1
--- GeneralSettingsInterface.cpp 4 Dec 2002 20:56:46 -0000 1.2
***************
*** 3,7 ****
//////////////////////////////////////////////////////////////////////
! #include "XboxMediaPlayer.h"
#include "GeneralSettingsInterface.h"
--- 3,7 ----
//////////////////////////////////////////////////////////////////////
! #include "../XboxMediaPlayer.h"
#include "GeneralSettingsInterface.h"
Index: HomeInterface.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/HomeInterface.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** HomeInterface.cpp 1 Dec 2002 18:17:12 -0000 1.2
--- HomeInterface.cpp 4 Dec 2002 20:56:47 -0000 1.3
***************
*** 3,9 ****
//////////////////////////////////////////////////////////////////////
! #include "XboxMediaPlayer.h"
#include "HomeInterface.h"
! #include "buildtime.h"
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
--- 3,9 ----
//////////////////////////////////////////////////////////////////////
! #include "../XboxMediaPlayer.h"
#include "HomeInterface.h"
! #include "..\buildtime.h"
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
Index: LegacyCatalogue.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/LegacyCatalogue.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LegacyCatalogue.cpp 28 Nov 2002 21:47:34 -0000 1.1
--- LegacyCatalogue.cpp 4 Dec 2002 20:56:48 -0000 1.2
***************
*** 6,10 ****
#include "Configuration.h"
! #include "Xbox\iso9660.h"
#define MAX_PATH_SIZE 256
--- 6,10 ----
#include "Configuration.h"
! #include "..\Xbox\iso9660.h"
#define MAX_PATH_SIZE 256
Index: MovieInterface.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/MovieInterface.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MovieInterface.cpp 2 Dec 2002 17:01:13 -0000 1.3
--- MovieInterface.cpp 4 Dec 2002 20:56:49 -0000 1.4
***************
*** 4,8 ****
#include "MovieInterface.h"
! #include "XboxMediaPlayer.h"
#include "Configuration.h"
--- 4,8 ----
#include "MovieInterface.h"
! #include "..\XboxMediaPlayer.h"
#include "Configuration.h"
Index: PhotoInterface.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/PhotoInterface.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PhotoInterface.cpp 3 Dec 2002 17:47:05 -0000 1.2
--- PhotoInterface.cpp 4 Dec 2002 20:56:50 -0000 1.3
***************
*** 4,8 ****
#include "PhotoInterface.h"
! #include "XboxMediaPlayer.h"
//////////////////////////////////////////////////////////////////////
--- 4,8 ----
#include "PhotoInterface.h"
! #include "..\XboxMediaPlayer.h"
//////////////////////////////////////////////////////////////////////
Index: PhotoInterface.h
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/PhotoInterface.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PhotoInterface.h 28 Nov 2002 21:47:34 -0000 1.1
--- PhotoInterface.h 4 Dec 2002 20:56:52 -0000 1.2
***************
*** 13,17 ****
#include "Font.h"
#include "JpegImage.h"
! #include "Xbox\Playlist.h"
class CApplication;
--- 13,17 ----
#include "Font.h"
#include "JpegImage.h"
! #include "..\Xbox\Playlist.h"
class CApplication;
Index: RatioInterface.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/RatioInterface.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RatioInterface.cpp 3 Dec 2002 17:47:05 -0000 1.2
--- RatioInterface.cpp 4 Dec 2002 20:57:01 -0000 1.3
***************
*** 3,7 ****
//////////////////////////////////////////////////////////////////////
! #include "XboxMediaPlayer.h"
#include "RatioInterface.h"
--- 3,7 ----
//////////////////////////////////////////////////////////////////////
! #include "..\XboxMediaPlayer.h"
#include "RatioInterface.h"
Index: ScreenInterface.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/ScreenInterface.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ScreenInterface.cpp 3 Dec 2002 17:47:05 -0000 1.2
--- ScreenInterface.cpp 4 Dec 2002 20:57:09 -0000 1.3
***************
*** 3,7 ****
//////////////////////////////////////////////////////////////////////
! #include "XboxMediaPlayer.h"
#include "ScreenInterface.h"
--- 3,7 ----
//////////////////////////////////////////////////////////////////////
! #include "..\XboxMediaPlayer.h"
#include "ScreenInterface.h"
Index: SettingsInterface.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/SettingsInterface.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SettingsInterface.cpp 3 Dec 2002 17:47:05 -0000 1.2
--- SettingsInterface.cpp 4 Dec 2002 20:57:11 -0000 1.3
***************
*** 3,7 ****
//////////////////////////////////////////////////////////////////////
! #include "XboxMediaPlayer.h"
#include "SettingsInterface.h"
--- 3,7 ----
//////////////////////////////////////////////////////////////////////
! #include "../XboxMediaPlayer.h"
#include "SettingsInterface.h"
***************
*** 10,15 ****
//////////////////////////////////////////////////////////////////////
! CSettingsInterface::CSettingsInterface(CAudioStreamChangedCallback* callback )
! :m_pcallback (callback )
{
m_uiState = IN_SETTINGS_GENERAL;
--- 10,14 ----
//////////////////////////////////////////////////////////////////////
! CSettingsInterface::CSettingsInterface()
{
m_uiState = IN_SETTINGS_GENERAL;
***************
*** 21,25 ****
}
! HRESULT CSettingsInterface::Create( LPDIRECT3DDEVICE8 pd3dDevice, CFontManager* pfntManager, LPVOID lpvCookie)
{
m_pd3dDevice = pd3dDevice;
--- 20,24 ----
}
! HRESULT CSettingsInterface::Create( LPDIRECT3DDEVICE8 pd3dDevice, CFontManager* pfntManager, LPVOID lpvCookie )
{
m_pd3dDevice = pd3dDevice;
***************
*** 67,72 ****
// Create Audio Settings User Interface
! m_pSettingsInterfaces[IN_SETTINGS_AUDIO] = new CAudioSettingsInterface(m_pcallback);
! if( FAILED( m_pSettingsInterfaces[IN_SETTINGS_AUDIO]->Create( m_pd3dDevice, pfntManager, this) ) )
{
OutputDebugString("Unable to create audio settings interface.\n");
--- 66,71 ----
// Create Audio Settings User Interface
! m_pSettingsInterfaces[IN_SETTINGS_AUDIO] = new CAudioSettingsInterface();
! if( FAILED( m_pSettingsInterfaces[IN_SETTINGS_AUDIO]->Create( m_pd3dDevice, pfntManager, this ) ) )
{
OutputDebugString("Unable to create audio settings interface.\n");
***************
*** 106,110 ****
m_bplSettings.SetPosition(66,120);
m_bplSettings.Render();
-
m_pfntCommon13->Begin();
--- 105,108 ----
***************
*** 204,214 ****
VOID CSettingsInterface::SendMessage(DWORD dwInterface, DWORD dwMessage, LPVOID lpvCookie)
{
- char szDebug[64];
- sprintf(szDebug,"Sending message to interface %u via settings interface.\n",dwInterface);
- OutputDebugString(szDebug);
-
m_pSettingsInterfaces[dwInterface]->OnMessage(dwMessage, lpvCookie);
-
- OutputDebugString("Message sent.\n");
}
--- 202,206 ----
Index: SettingsInterface.h
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/SettingsInterface.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SettingsInterface.h 3 Dec 2002 17:47:05 -0000 1.2
--- SettingsInterface.h 4 Dec 2002 20:57:13 -0000 1.3
***************
*** 18,22 ****
#include "AudioSettingsInterface.h"
#include "GeneralSettingsInterface.h"
! #include "../AudioStreamChangedCallback.h"
#define SETTINGS_INTERFACES 3
--- 18,22 ----
#include "AudioSettingsInterface.h"
#include "GeneralSettingsInterface.h"
!
#define SETTINGS_INTERFACES 3
***************
*** 30,37 ****
{
public:
! CSettingsInterface(CAudioStreamChangedCallback* callback );
virtual ~CSettingsInterface();
! HRESULT Create( LPDIRECT3DDEVICE8 pd3dDevice, CFontManager* pfntManager, LPVOID lpvCookie);
HRESULT FrameMove(XBGAMEPAD* pGamepad, XBIR_REMOTE* pRemote, LPDWORD pdwState);
HRESULT Render();
--- 30,37 ----
{
public:
! CSettingsInterface();
virtual ~CSettingsInterface();
! HRESULT Create( LPDIRECT3DDEVICE8 pd3dDevice, CFontManager* pfntManager, LPVOID lpvCookie );
HRESULT FrameMove(XBGAMEPAD* pGamepad, XBIR_REMOTE* pRemote, LPDWORD pdwState);
HRESULT Render();
***************
*** 48,56 ****
CSettingsPanel m_bplSettings;
CFont* m_pfntCommon13;
CApplication* m_pApplication;
DWORD m_uiState;
CUserInterface* m_pSettingsInterfaces[SETTINGS_INTERFACES];
- CAudioStreamChangedCallback* m_pcallback ;
};
--- 48,56 ----
CSettingsPanel m_bplSettings;
CFont* m_pfntCommon13;
+
CApplication* m_pApplication;
DWORD m_uiState;
CUserInterface* m_pSettingsInterfaces[SETTINGS_INTERFACES];
};
Index: SongsInterface.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/SongsInterface.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SongsInterface.cpp 28 Nov 2002 21:47:34 -0000 1.1
--- SongsInterface.cpp 4 Dec 2002 20:57:14 -0000 1.2
***************
*** 5,12 ****
#include "SongsInterface.h"
! #include "UI\LocalCatalogue.h"
! #include "UI\RemoteCatalogue.h"
! #include "XboxMediaPlayer.h"
#define NETCACHE_PACKET_SIZE 28000
--- 5,12 ----
#include "SongsInterface.h"
! #include "LocalCatalogue.h"
! #include "RemoteCatalogue.h"
! #include "..\XboxMediaPlayer.h"
#define NETCACHE_PACKET_SIZE 28000
Index: UMusic.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/UMusic.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** UMusic.cpp 1 Dec 2002 16:21:48 -0000 1.2
--- UMusic.cpp 4 Dec 2002 20:57:19 -0000 1.3
***************
*** 4,8 ****
#include "UMusic.h"
! #include "XboxMediaPlayer.h"
#include "MusicPanel.h"
--- 4,8 ----
#include "UMusic.h"
! #include "..\XboxMediaPlayer.h"
#include "MusicPanel.h"
Index: UMusic.h
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/UMusic.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** UMusic.h 28 Nov 2002 21:47:34 -0000 1.1
--- UMusic.h 4 Dec 2002 20:57:25 -0000 1.2
***************
*** 10,19 ****
#endif // _MSC_VER > 1000
! #include "UI\CatalogueInterface.h"
! #include "UI\Configuration.h"
! #include "UI\AlbumInterface.h"
! #include "UI\ArtistInterface.h"
! #include "UI\SongsInterface.h"
#define MUSIC_INTERFACES 4
--- 10,19 ----
#endif // _MSC_VER > 1000
! #include "CatalogueInterface.h"
! #include "Configuration.h"
! #include "AlbumInterface.h"
! #include "ArtistInterface.h"
! #include "SongsInterface.h"
#define MUSIC_INTERFACES 4
Index: UPictures.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/UPictures.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** UPictures.cpp 28 Nov 2002 21:47:34 -0000 1.1
--- UPictures.cpp 4 Dec 2002 20:57:35 -0000 1.2
***************
*** 5,9 ****
#include "UPictures.h"
#include "PicturePanel.h"
! #include "XboxMediaPlayer.h"
//////////////////////////////////////////////////////////////////////
--- 5,9 ----
#include "UPictures.h"
#include "PicturePanel.h"
! #include "..\XboxMediaPlayer.h"
//////////////////////////////////////////////////////////////////////
Index: UVideos.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/UVideos.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** UVideos.cpp 1 Dec 2002 16:21:48 -0000 1.2
--- UVideos.cpp 4 Dec 2002 20:57:36 -0000 1.3
***************
*** 5,9 ****
#include "UVideos.h"
#include "VideoPanel.h"
! #include "XboxMediaPlayer.h"
//////////////////////////////////////////////////////////////////////
--- 5,9 ----
#include "UVideos.h"
#include "VideoPanel.h"
! #include "..\XboxMediaPlayer.h"
//////////////////////////////////////////////////////////////////////
|
Update of /cvsroot/xbyamp/xbmp/player
In directory sc8-pr-cvs1:/tmp/cvs-serv26514/player
Modified Files:
AsyncDirectSound.cpp buildtime.h MoviePlayer.cpp MoviePlayer.h
XBoxMediaPlayer.cpp XBoxMediaPlayer.h XBMediaPlayer.plg
Log Message:
no message
Index: AsyncDirectSound.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/AsyncDirectSound.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AsyncDirectSound.cpp 30 Nov 2002 16:02:14 -0000 1.2
--- AsyncDirectSound.cpp 4 Dec 2002 20:57:37 -0000 1.3
***************
*** 45,48 ****
--- 45,50 ----
#define VOLUME_MAX DSBVOLUME_MAX
+ static DWORD dwDonePkts=0;
+ static DWORD dwSendPkts=0;
void CALLBACK CASyncDirectSound::StaticStreamCallback(LPVOID pStreamContext, LPVOID pPacketContext, DWORD dwStatus)
{
***************
*** 54,57 ****
--- 56,60 ----
void CASyncDirectSound::StreamCallback(LPVOID pPacketContext, DWORD dwStatus)
{
+ dwDonePkts++;
if (m_iCalcDelay==1)
{
***************
*** 82,86 ****
ZeroMemory(&m_wfx,sizeof(m_wfx));
! // request a 16-bit stereo primary sound buffer with 22 KHz sampling rate
m_wfx.wFormatTag = WAVE_FORMAT_PCM;
m_wfx.nChannels = iChannels;
--- 85,89 ----
ZeroMemory(&m_wfx,sizeof(m_wfx));
! // request a 16-bit stereo primary sound buffer with 22 KHz sampling rate
m_wfx.wFormatTag = WAVE_FORMAT_PCM;
m_wfx.nChannels = iChannels;
***************
*** 329,333 ****
m_pDSound->GetTime(&m_startTime);
}
! m_pStream->Process( &xmpAudio, NULL );
//mp_msg(0,0,"audio decoder process done");
iBytesCopied+=iSize;
--- 332,342 ----
m_pDSound->GetTime(&m_startTime);
}
!
!
! if (DS_OK != m_pStream->Process( &xmpAudio, NULL ))
! {
! return iBytesCopied;
! }
! dwSendPkts++;
//mp_msg(0,0,"audio decoder process done");
iBytesCopied+=iSize;
Index: buildtime.h
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/buildtime.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** buildtime.h 3 Dec 2002 17:47:05 -0000 1.5
--- buildtime.h 4 Dec 2002 20:57:40 -0000 1.6
***************
*** 1,4 ****
#ifndef BUILD_TIME_H
#define BUILD_TIME_H
! #define BUILD_TIME L"build:3-dec-2002 17:45"
#endif
--- 1,4 ----
#ifndef BUILD_TIME_H
#define BUILD_TIME_H
! #define BUILD_TIME L"build:4-dec-2002 21:00"
#endif
Index: MoviePlayer.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/MoviePlayer.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** MoviePlayer.cpp 3 Dec 2002 17:47:05 -0000 1.14
--- MoviePlayer.cpp 4 Dec 2002 20:57:42 -0000 1.15
***************
*** 8,16 ****
// - iso9660
// - shoutcast
- // - duo's core
- // - duo's HW ac3 decoder
- // - .m3u
// - select audio stream
! // - after a few files i can not play any file anymore???
//
//
--- 8,13 ----
// - iso9660
// - shoutcast
// - select audio stream
! // -
//
//
***************
*** 21,24 ****
--- 18,57 ----
// - 15min shutdown on non-debug systems
//
+ //
+ // softsleep
+ // -softsleep
+ // Uses high quality software timers.
+ // As precise as the RTC without requiring special privileges.
+ // Comes at the price of higher CPU consumption.
+ //
+ // autosync -autosync <factor> (buggy audio drivers)
+ // Gradually adjusts the A/V sync based on audio delay measurements.
+ // Specifying '-autosync' 0, the default, will cause frame timing to be based
+ // entirely on audio delay measurements.
+ // Specifying '-autosync' 1 will do the same, but will subtly change the A/V
+ // correction algorithm used.
+ // An uneven video frame rate in a movie which plays fine with '-nosound can
+ // often be helped by setting this to an integer value greater than 1.
+ // The higher the value, the closer the timing will be to -nosound.
+ // Try '-autosync' 30 to smooth out problems with sound drivers which do
+ // not implement a perfect audio delay measurement.
+ // With this value, if large A/V sync offsets occur, they will only take about
+ // 1 or 2' seconds to settle out.
+ // This delay in reaction time to sudden A/V offsets should be the only
+ // side-effect of turning this option on, for all sound drivers.
+ //
+ // pts_from_bps -bps / -nobps
+ // -nobps (.AVI only)
+ // Do not use average byte/sec value for A/V sync (AVI).
+ // Helps with some AVI files with broken header.
+ //
+ // frame_dropping
+ // -framedrop (also see -hardframedrop)
+ // Skips displaying some frames to maintain A/V sync on slow systems.
+ // Decoding of B frames is also skipped and video filters are not used.
+ //
+ // -mc <seconds/frame>
+ // Maximum A-V sync correction per frame (in seconds).
+ //
//////////////////////////////////////////////////////////////////////
***************
*** 72,76 ****
int stream_cache_size=16384;
float font_factor=0.75;
!
#ifdef __cplusplus
}
--- 105,109 ----
int stream_cache_size=16384;
float font_factor=0.75;
! extern int pts_from_bps;
#ifdef __cplusplus
}
***************
*** 132,139 ****
osd_visible=100;
delay_corrected=1;
! softsleep=1;
step_sec=0;
max_framesize=0;
! frame_dropping=0; // option 0=no drop 1= drop vo 2= drop decode
audio_time_usage=0;
total_time_usage_start=0;
--- 165,172 ----
osd_visible=100;
delay_corrected=1;
! softsleep=0;
step_sec=0;
max_framesize=0;
! frame_dropping=1; // option 0=no drop 1= drop vo 2= drop decode
audio_time_usage=0;
total_time_usage_start=0;
***************
*** 143,147 ****
// movie info:
eof=0;
! autosync=1; // 30 might be a good default value.
stream=NULL;
demuxer=NULL;
--- 176,180 ----
// movie info:
eof=0;
! autosync=0; // 30 might be a good default value.
stream=NULL;
demuxer=NULL;
***************
*** 293,297 ****
if ( XC_AUDIO_FLAGS_ENCODED( dwSpeakerConfig ) & XC_AUDIO_FLAGS_ENABLE_DTS )
{
! mp_msg(0,0,"DTS output (4 channels)");
audio_output_channels=4;
}
--- 326,330 ----
if ( XC_AUDIO_FLAGS_ENCODED( dwSpeakerConfig ) & XC_AUDIO_FLAGS_ENABLE_DTS )
{
! mp_msg(0,0,"DTS output (5.1 channels)");
audio_output_channels=4;
}
***************
*** 299,304 ****
if ( XC_AUDIO_FLAGS_ENCODED( dwSpeakerConfig ) & XC_AUDIO_FLAGS_ENABLE_AC3 )
{
! mp_msg(0,0,"ac3 output (6 channels)");
! audio_output_channels=6;
}
--- 332,337 ----
if ( XC_AUDIO_FLAGS_ENCODED( dwSpeakerConfig ) & XC_AUDIO_FLAGS_ENABLE_AC3 )
{
! mp_msg(0,0,"ac3 output (5 channels)");
! audio_output_channels=4;
}
***************
*** 309,312 ****
--- 342,348 ----
bool CMoviePlayer::OpenFile(const string &strFileName)
{
+
+ pts_from_bps=0;
+ m_fAVDelay=0;
strHostName="";
strProtocol="";
***************
*** 353,360 ****
osd_visible=100;
delay_corrected=1;
! softsleep=1;
step_sec=0;
max_framesize=0;
! frame_dropping=0; // option 0=no drop 1= drop vo 2= drop decode
audio_time_usage=0;
total_time_usage_start=0;
--- 389,396 ----
osd_visible=100;
delay_corrected=1;
! softsleep=0;
step_sec=0;
max_framesize=0;
! frame_dropping=1; // option 0=no drop 1= drop vo 2= drop decode
audio_time_usage=0;
total_time_usage_start=0;
***************
*** 364,368 ****
// movie info:
eof=0;
! autosync=1; // 30 might be a good default value.
stream=NULL;
demuxer=NULL;
--- 400,404 ----
// movie info:
eof=0;
! autosync=0; // 30 might be a good default value.
stream=NULL;
demuxer=NULL;
***************
*** 436,439 ****
--- 472,477 ----
bool CMoviePlayer::OpenCodecs()
{
+
+ pts_from_bps=0;
mp_msg(0,0,"open codecs\n");
if(sh_video)
***************
*** 636,640 ****
total_frame_cnt=0;
drop_frame_cnt=0; // fix for multifile fps benchmark
! pts_from_bps=0;
mp_msg(0,0,"codecs opened\n");
if (sh_video)
--- 674,678 ----
total_frame_cnt=0;
drop_frame_cnt=0; // fix for multifile fps benchmark
! //pts_from_bps=0;
mp_msg(0,0,"codecs opened\n");
if (sh_video)
***************
*** 679,682 ****
--- 717,721 ----
bool CMoviePlayer::DoProcess()
{
+ pts_from_bps=0;
DirectSoundDoWork();
if (m_bPaused) return true;
***************
*** 1013,1017 ****
if (timeGetTime()-dwTime > 1000)
{
! mp_msg(MSGT_AVSYNC,MSGL_DBG2,"### A:%8.3f (%8.3f) V:%8.3f A-V:%7.4f %i ",a_pts,a_pts-audio_delay-delay,v_pts,(a_pts-delay-audio_delay)-v_pts,m_timer);
dwTime =timeGetTime();
}
--- 1052,1057 ----
if (timeGetTime()-dwTime > 1000)
{
! m_fAVDelay=(a_pts-delay-audio_delay)-v_pts;
! mp_msg(MSGT_AVSYNC,MSGL_DBG2,"### A:%8.3f (%8.3f) V:%8.3f A-V:%7.4f %i ",a_pts,a_pts-audio_delay-delay,v_pts,(a_pts-delay-audio_delay)-v_pts,pts_from_bps);
dwTime =timeGetTime();
}
***************
*** 1386,1388 ****
--- 1426,1434 ----
if ( NULL==demuxer->a_streams[iStream]) return false;
return true;
+ }
+
+ float CMoviePlayer::GetAVDelay()
+ {
+ return m_fAVDelay;
+
}
Index: MoviePlayer.h
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/MoviePlayer.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MoviePlayer.h 3 Dec 2002 17:47:05 -0000 1.4
--- MoviePlayer.h 4 Dec 2002 20:57:47 -0000 1.5
***************
*** 68,71 ****
--- 68,72 ----
{
public:
+ float GetAVDelay();
bool HasAudioStream(int iStream);
void SelectAudioStream(int iStream);
***************
*** 168,171 ****
--- 169,173 ----
int output_quality;
private:
+ float m_fAVDelay;
string m_strSubtitleName;
};
Index: XBoxMediaPlayer.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/XBoxMediaPlayer.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** XBoxMediaPlayer.cpp 3 Dec 2002 17:47:05 -0000 1.12
--- XBoxMediaPlayer.cpp 4 Dec 2002 20:57:49 -0000 1.13
***************
*** 96,100 ****
{
// Freesyle UI
!
m_appState = IN_HOME;
m_appPreviousState = IN_HOME;
--- 96,100 ----
{
// Freesyle UI
! m_bShowDelay=false;
m_appState = IN_HOME;
m_appPreviousState = IN_HOME;
***************
*** 418,422 ****
// Create Settings User Interface
! m_pUserInterfaces[IN_SETTINGS] = new CSettingsInterface( m_pMediaPlayer );
if( FAILED( m_pUserInterfaces[IN_SETTINGS]->Create( m_pd3dDevice, &m_fntManager, this) ) )
{
--- 418,422 ----
// Create Settings User Interface
! m_pUserInterfaces[IN_SETTINGS] = new CSettingsInterface( );
if( FAILED( m_pUserInterfaces[IN_SETTINGS]->Create( m_pd3dDevice, &m_fntManager, this) ) )
{
***************
*** 794,797 ****
--- 794,801 ----
}
+ if (pRemote->wPressedButtons)
+ {
+ m_bShowDelay=!m_bShowDelay;
+ }
if (dwCurrentAppState == IN_MOVIE)
***************
*** 915,918 ****
--- 919,923 ----
}
}
+
m_pUserInterfaces[m_appState]->FrameMove(pGamepad, pRemote, &dwCurrentAppState);
***************
*** 1045,1048 ****
--- 1050,1060 ----
m_dwShowFlags=0;
}
+ if (m_bShowDelay)
+ {
+ WCHAR strOffset[30];
+ swprintf(strOffset,L"AV sync %02.2f msec",m_pMediaPlayer->GetAVDelay());
+ m_pfntCommon13->DrawText( 200, 40, 0xFFFFFFFF, strOffset);
+ }
+
if (!m_pMediaPlayer->IsPlaying())
{
Index: XBoxMediaPlayer.h
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/XBoxMediaPlayer.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** XBoxMediaPlayer.h 2 Dec 2002 17:01:23 -0000 1.7
--- XBoxMediaPlayer.h 4 Dec 2002 20:57:52 -0000 1.8
***************
*** 71,74 ****
--- 71,75 ----
#include "UI\PhotoInterface.h"
#include "UI\SettingsInterface.h"
+ #include "xbox\mediaplayer.h"
#define USER_INTERFACES 12
***************
*** 134,138 ****
virtual void OnPlaybackComplete();
! MediaPlayer* m_pMediaPlayer;
protected:
--- 135,139 ----
virtual void OnPlaybackComplete();
! CMediaPlayer* m_pMediaPlayer;
protected:
***************
*** 143,146 ****
--- 144,148 ----
BOOL m_bNetwork;
private:
+ bool m_bShowDelay;
int m_iFFSpeed;
int m_iAVDelay;
Index: XBMediaPlayer.plg
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/XBMediaPlayer.plg,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** XBMediaPlayer.plg 3 Dec 2002 17:47:05 -0000 1.4
--- XBMediaPlayer.plg 4 Dec 2002 20:57:55 -0000 1.5
***************
*** 7,34 ****
</h3>
<h3>Command Lines</h3>
! Creating temporary file "D:\DOCUME~1\erwin\LOCALS~1\Temp\RSP339.tmp" with contents
[
/nologo /MT /W3 /Gm /GX /Zi /Od /I "D:\Program Files\Microsoft Xbox SDK\samples\xbox\common\include" /I ".." /D "WIN32" /D "_XBOX" /D "NDEBUG" /D "_NETWORKDEBUG" /D "_XDK" /Fp"Release/XBMediaPlayer.pch" /YX /Fo"Release/" /Fd"Release/" /FD /Ztmp /G6 /c
- "D:\xbmp2\xbmp\player\UI\AlbumInterface.cpp"
- "D:\xbmp2\xbmp\player\UI\ArtistInterface.cpp"
- "D:\xbmp2\xbmp\player\UI\AudioSettingsInterface.cpp"
- "D:\xbmp2\xbmp\player\UI\CalibrateInterface.cpp"
- "D:\xbmp2\xbmp\player\UI\CatalogueInterface.cpp"
- "D:\xbmp2\xbmp\player\UI\ClipInterface.cpp"
- "D:\xbmp2\xbmp\player\UI\GeneralSettingsInterface.cpp"
"D:\xbmp2\xbmp\player\UI\HomeInterface.cpp"
- "D:\xbmp2\xbmp\player\UI\MovieInterface.cpp"
- "D:\xbmp2\xbmp\player\UI\PhotoInterface.cpp"
- "D:\xbmp2\xbmp\player\UI\RatioInterface.cpp"
- "D:\xbmp2\xbmp\player\UI\ScreenInterface.cpp"
- "D:\xbmp2\xbmp\player\UI\SettingsInterface.cpp"
- "D:\xbmp2\xbmp\player\UI\SongsInterface.cpp"
- "D:\xbmp2\xbmp\player\UI\UMusic.cpp"
- "D:\xbmp2\xbmp\player\UI\UPictures.cpp"
- "D:\xbmp2\xbmp\player\UI\UVideos.cpp"
- "D:\xbmp2\xbmp\player\XBoxMediaPlayer.cpp"
]
! Creating command line "cl.exe @D:\DOCUME~1\erwin\LOCALS~1\Temp\RSP339.tmp"
! Creating temporary file "D:\DOCUME~1\erwin\LOCALS~1\Temp\RSP33A.tmp" with contents
[
xapilib.lib d3d8.lib d3dx8.lib xgraphics.lib dsound.lib dmusic.lib xboxkrnl.lib xonline.lib /nologo /incremental:no /pdb:"Release/XBMediaPlayer.pdb" /debug /machine:I386 /nodefaultlib:"libc" /out:"Release/XBMediaPlayer.exe" /subsystem:xbox /opt:ref /fixed:no /TMP
--- 7,17 ----
</h3>
<h3>Command Lines</h3>
! Creating temporary file "D:\DOCUME~1\erwin\LOCALS~1\Temp\RSP1C5.tmp" with contents
[
/nologo /MT /W3 /Gm /GX /Zi /Od /I "D:\Program Files\Microsoft Xbox SDK\samples\xbox\common\include" /I ".." /D "WIN32" /D "_XBOX" /D "NDEBUG" /D "_NETWORKDEBUG" /D "_XDK" /Fp"Release/XBMediaPlayer.pch" /YX /Fo"Release/" /Fd"Release/" /FD /Ztmp /G6 /c
"D:\xbmp2\xbmp\player\UI\HomeInterface.cpp"
]
! Creating command line "cl.exe @D:\DOCUME~1\erwin\LOCALS~1\Temp\RSP1C5.tmp"
! Creating temporary file "D:\DOCUME~1\erwin\LOCALS~1\Temp\RSP1C6.tmp" with contents
[
xapilib.lib d3d8.lib d3dx8.lib xgraphics.lib dsound.lib dmusic.lib xboxkrnl.lib xonline.lib /nologo /incremental:no /pdb:"Release/XBMediaPlayer.pdb" /debug /machine:I386 /nodefaultlib:"libc" /out:"Release/XBMediaPlayer.exe" /subsystem:xbox /opt:ref /fixed:no /TMP
***************
*** 118,152 ****
.\Release\xbox_video.obj
]
! Creating command line "link.exe @D:\DOCUME~1\erwin\LOCALS~1\Temp\RSP33A.tmp"
Creating command line "imagebld.exe /nologo /testid:"0xFACE007" /testname:"Xbox Media Player" /stack:0x30000 /initflags:0x0 /out:"root\xbplayer.xbe" /limitmem /titleimage:"titleimage.xbx" /testmediatypes:0x80000007 .\Release\XBMediaPlayer.exe "
<h3>Output Window</h3>
Compiling...
- AlbumInterface.cpp
- SettingsInterface.cpp
- Skipping... (no relevant changes detected)
- ArtistInterface.cpp
- AudioSettingsInterface.cpp
- CalibrateInterface.cpp
- CatalogueInterface.cpp
- ClipInterface.cpp
- GeneralSettingsInterface.cpp
HomeInterface.cpp
- MovieInterface.cpp
- PhotoInterface.cpp
- RatioInterface.cpp
- ScreenInterface.cpp
- SongsInterface.cpp
- UMusic.cpp
- UPictures.cpp
- UVideos.cpp
- XBoxMediaPlayer.cpp
Linking...
Creating Xbox image...
IMAGEBLD : warning IM1029: library XONLINE is unapproved
IMAGEBLD : warning IM1030: This image may not be accepted for certification
! Creating command line "xbecopy.exe /NOLOGO .\root\xbplayer.xbe "xe:\xbplayer\xbplayer.xbe""
! Transferring file to Xbox...xe:\xbplayer\xbplayer.xbe
! <h3>Output Window</h3>
! Creating temporary file "D:\DOCUME~1\erwin\LOCALS~1\Temp\RSP33C.bat" with contents
[
@echo off
--- 101,114 ----
.\Release\xbox_video.obj
]
! Creating command line "link.exe @D:\DOCUME~1\erwin\LOCALS~1\Temp\RSP1C6.tmp"
Creating command line "imagebld.exe /nologo /testid:"0xFACE007" /testname:"Xbox Media Player" /stack:0x30000 /initflags:0x0 /out:"root\xbplayer.xbe" /limitmem /titleimage:"titleimage.xbx" /testmediatypes:0x80000007 .\Release\XBMediaPlayer.exe "
<h3>Output Window</h3>
Compiling...
HomeInterface.cpp
Linking...
Creating Xbox image...
IMAGEBLD : warning IM1029: library XONLINE is unapproved
IMAGEBLD : warning IM1030: This image may not be accepted for certification
! Creating temporary file "D:\DOCUME~1\erwin\LOCALS~1\Temp\RSP1C8.bat" with contents
[
@echo off
***************
*** 155,159 ****
rem del Root\xbplayer.bak
]
! Creating command line "D:\DOCUME~1\erwin\LOCALS~1\Temp\RSP33C.bat"
Patching for retail XBox
--- 117,121 ----
rem del Root\xbplayer.bak
]
! Creating command line "D:\DOCUME~1\erwin\LOCALS~1\Temp\RSP1C8.bat"
Patching for retail XBox
|
|
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;
|
|
From: <ya...@us...> - 2002-12-04 20:58:38
|
Update of /cvsroot/xbyamp/xbmp/player/mplayer In directory sc8-pr-cvs1:/tmp/cvs-serv26514/player/mplayer Modified Files: libmpdemux.lib Log Message: no message Index: libmpdemux.lib =================================================================== RCS file: /cvsroot/xbyamp/xbmp/player/mplayer/libmpdemux.lib,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 Binary files /tmp/cvsnhBIGL and /tmp/cvs1lYGVL differ |
|
From: <ya...@us...> - 2002-12-03 17:59:02
|
Update of /cvsroot/xbyamp/xbmp/player
In directory sc8-pr-cvs1:/tmp/cvs-serv10209/player
Added Files:
AudioStreamChangedCallback.cpp AudioStreamChangedCallback.h
vcd_reader.cpp
Log Message:
no message
--- NEW FILE: AudioStreamChangedCallback.cpp ---
// AudioStreamChangedCallback.cpp: implementation of the CAudioStreamChangedCallback class.
//
//////////////////////////////////////////////////////////////////////
#include "AudioStreamChangedCallback.h"
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
//////////////////////////////////////////////////////////////////////
CAudioStreamChangedCallback::CAudioStreamChangedCallback()
{
}
CAudioStreamChangedCallback::~CAudioStreamChangedCallback()
{
}
--- NEW FILE: AudioStreamChangedCallback.h ---
// AudioStreamChangedCallback.h: interface for the CAudioStreamChangedCallback class.
//
//////////////////////////////////////////////////////////////////////
#if !defined(AFX_AUDIOSTREAMCHANGEDCALLBACK_H__D692D23B_736A_416A_8B02_1BB18BADA9BE__INCLUDED_)
#define AFX_AUDIOSTREAMCHANGEDCALLBACK_H__D692D23B_736A_416A_8B02_1BB18BADA9BE__INCLUDED_
#if _MSC_VER > 1000
#pragma once
#endif // _MSC_VER > 1000
class CAudioStreamChangedCallback
{
public:
CAudioStreamChangedCallback();
virtual ~CAudioStreamChangedCallback();
virtual void OnAudioStreamChanged()=0;
virtual bool HasAudioStream(int iStream)=0;
};
#endif // !defined(AFX_AUDIOSTREAMCHANGEDCALLBACK_H__D692D23B_736A_416A_8B02_1BB18BADA9BE__INCLUDED_)
--- NEW FILE: vcd_reader.cpp ---
#ifdef __cplusplus
extern "C" {
#endif
#ifdef _XBOX
#include <xtl.h>
#else
#include <windows.h>
#endif
#include <stdio.h>
#include <stdlib.h>
#include <fcntl.h>
#include "mplayer/mp_msg.h"
/* CD-ROM address types (cdrom_tocentry.cdte_format) */
#define VCD_SECTOR_DATA 2324
#define VCD_SECTOR_OFFS 24
#define VCD_SECTOR_SIZE 2352
#define CDROM_LEADOUT 0xAA
#define CDROM_LBA 0x01 /* logical block: first frame is #0 */
#define CDROM_MSF 0x02 /* minute-second-frame: binary. not bcd here!*/
#define CDROMREADTOCHDR 0x5305 /* Read TOC header (cdrom_tochdr) */
#define CDROMREADTOCENTRY 0x5306 /* Read TOC entry (cdrom_tocentry) */
#define CD_HEAD_SIZE 4 /* header (address) bytes per raw data frame */
#define CD_SYNC_SIZE 12 /* 12 sync bytes per raw data frame */
#define CD_FRAMESIZE 2048 /* bytes per frame, "cooked" mode */
#define CD_FRAMESIZE_RAW 2352 /* bytes per frame, "raw" mode */
#define CD_FRAMESIZE_RAW0 (CD_FRAMESIZE_RAW-CD_SYNC_SIZE-CD_HEAD_SIZE) /*2336*/
#define CD_FRAMESIZE_RAW1 (CD_FRAMESIZE_RAW-CD_SYNC_SIZE) /*2340*/
static char vcd_buf[VCD_SECTOR_SIZE];
struct cdrom_msf
{
unsigned char cdmsf_min0; /* start minute */
unsigned char cdmsf_sec0; /* start second */
unsigned char cdmsf_frame0; /* start frame */
unsigned char cdmsf_min1; /* end minute */
unsigned char cdmsf_sec1; /* end second */
unsigned char cdmsf_frame1; /* end frame */
};
struct cdrom_tochdr
{
unsigned char cdth_trk0; /* start track */
unsigned char cdth_trk1; /* end track */
};
struct cdrom_msf0
{
unsigned char minute;
unsigned char second;
unsigned char frame;
};
union cdrom_addr
{
struct cdrom_msf0 msf;
int lba;
};
struct cdrom_tocentry
{
unsigned char cdte_track;
unsigned char cdte_adr ;
unsigned char cdte_ctrl ;
unsigned char cdte_format;
union cdrom_addr cdte_addr;
unsigned char cdte_datamode;
};
static struct cdrom_tocentry vcd_entry;
//******************************************************************************************
int read_sectortoc(struct cdrom_tocentry* entry)
{
//CDROMREADTOCHDR
return -1;
}
//******************************************************************************************
int read_tochdr(struct cdrom_tochdr *tochdr)
{
//CDROMREADTOCHDR
return -1;
}
//******************************************************************************************
int read_sectorraw(char *pbuffer)
{
//CDROMREADRAW
return -1;
}
//******************************************************************************************
unsigned int vcd_get_msf()
{
return vcd_entry.cdte_addr.msf.frame +
(vcd_entry.cdte_addr.msf.second+
vcd_entry.cdte_addr.msf.minute*60)*75;
}
//******************************************************************************************
void vcd_set_msf(unsigned int sect)
{
vcd_entry.cdte_addr.msf.frame=sect%75;
sect=sect/75;
vcd_entry.cdte_addr.msf.second=sect%60;
sect=sect/60;
vcd_entry.cdte_addr.msf.minute=sect;
}
//******************************************************************************************
void vcd_read_toc(int fd)
{
struct cdrom_tochdr tochdr;
int i;
if (read_tochdr(&tochdr)==-1) //CDROMREADTOCHDR
{
mp_msg(0,0,"read CDROM toc header: ");
return;
}
for (i=tochdr.cdth_trk0 ; i<=tochdr.cdth_trk1 ; i++)
{
struct cdrom_tocentry tocentry;
tocentry.cdte_track = i;
tocentry.cdte_format = CDROM_MSF;
if (read_sectortoc(&tocentry)==-1)//CDROMREADTOCHDR
{
mp_msg(0,0,"read CDROM toc entry: ");
return;
}
mp_msg(MSGT_OPEN,MSGL_INFO,"track %02d: adr=%d ctrl=%d format=%d %02d:%02d:%02d mode: %d\n",
(int)tocentry.cdte_track,
(int)tocentry.cdte_adr,
(int)tocentry.cdte_ctrl,
(int)tocentry.cdte_format,
(int)tocentry.cdte_addr.msf.minute,
(int)tocentry.cdte_addr.msf.second,
(int)tocentry.cdte_addr.msf.frame,
(int)tocentry.cdte_datamode
);
}
}
//******************************************************************************************
int vcd_get_track_end(int fd,int track)
{
struct cdrom_tochdr tochdr;
if (read_tochdr(&tochdr)==-1) //CDROMREADTOCHDR
{
mp_msg(0,0,"read CDROM toc header: ");
return -1;
}
vcd_entry.cdte_format = CDROM_MSF;
vcd_entry.cdte_track = track < tochdr.cdth_trk1?(track+1) : CDROM_LEADOUT;
if (read_sectortoc(&vcd_entry)) //CDROMREADTOCENTRY
{
mp_msg(0,0,"ioctl dif2");
return -1;
}
return VCD_SECTOR_DATA*vcd_get_msf();
}
//******************************************************************************************
int vcd_seek_to_track(int fd,int track)
{
vcd_entry.cdte_format = CDROM_MSF;
vcd_entry.cdte_track = track;
if (!read_sectortoc(&vcd_entry)) return -1; //CDROMREADTOCENTRY
return VCD_SECTOR_DATA*vcd_get_msf();
}
//******************************************************************************************
int vcd_read(int fd,char *mem)
{
memcpy(vcd_buf,&vcd_entry.cdte_addr.msf,sizeof(struct cdrom_msf));
if(read_sectorraw(vcd_buf)==-1) //CDROMREADRAW
return 0; // EOF?
memcpy(mem,&vcd_buf[VCD_SECTOR_OFFS],VCD_SECTOR_DATA);
vcd_entry.cdte_addr.msf.frame++;
if (vcd_entry.cdte_addr.msf.frame==75)
{
vcd_entry.cdte_addr.msf.frame=0;
vcd_entry.cdte_addr.msf.second++;
if (vcd_entry.cdte_addr.msf.second==60)
{
vcd_entry.cdte_addr.msf.second=0;
vcd_entry.cdte_addr.msf.minute++;
}
}
return VCD_SECTOR_DATA;
}
//******************************************************************************************
void vcd_close(int fd)
{
}
//******************************************************************************************
int vcd_open(char* szDevice ,int iWhence)
{
return -1;
}
#ifdef __cplusplus
}
#endif
|
|
From: <ya...@us...> - 2002-12-03 17:47:40
|
Update of /cvsroot/xbyamp/xbmp/player/UI
In directory sc8-pr-cvs1:/tmp/cvs-serv25740/player/UI
Modified Files:
AudioSettingsInterface.cpp AudioSettingsInterface.h
CalibrateInterface.cpp ClipInterface.cpp PhotoInterface.cpp
RatioInterface.cpp ScreenInterface.cpp SettingsInterface.cpp
SettingsInterface.h
Log Message:
removed compiler warnings
Index: AudioSettingsInterface.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/AudioSettingsInterface.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AudioSettingsInterface.cpp 28 Nov 2002 21:47:34 -0000 1.1
--- AudioSettingsInterface.cpp 3 Dec 2002 17:47:04 -0000 1.2
***************
*** 10,14 ****
//////////////////////////////////////////////////////////////////////
! CAudioSettingsInterface::CAudioSettingsInterface()
{
--- 10,15 ----
//////////////////////////////////////////////////////////////////////
! CAudioSettingsInterface::CAudioSettingsInterface(CAudioStreamChangedCallback* callback )
! :m_pCallback (callback )
{
***************
*** 39,45 ****
return E_FAIL;
}
-
- m_dhkStream.SetRange( 0, 3);
m_dhkStream.SetPosition(440,126);
return S_OK;
--- 40,47 ----
return E_FAIL;
}
m_dhkStream.SetPosition(440,126);
+ m_iCurrentStream=1;
+ m_dhkStream.SetRange( 1, 10);
+ m_dhkStream.SetValue( 1 );
return S_OK;
***************
*** 50,54 ****
VOID CAudioSettingsInterface::OnActive(LPVOID lpvCookie)
{
- m_dhkStream.SetValue( g_playerSettings.dwAudioStream );
}
--- 52,55 ----
***************
*** 70,79 ****
{
CAudioSettingsInterface* pThis = (CAudioSettingsInterface*) lpvCookie;
! if ((bDown) && (g_playerSettings.dwAudioStream<3))
! g_playerSettings.dwAudioStream++;
! else if ((!bDown) && (g_playerSettings.dwAudioStream>0))
! g_playerSettings.dwAudioStream--;
! pThis->m_dhkStream.SetValue(g_playerSettings.dwAudioStream);
}
--- 71,89 ----
{
CAudioSettingsInterface* pThis = (CAudioSettingsInterface*) lpvCookie;
! if ((bDown) && (pThis->m_iCurrentStream+1<=(int)pThis->m_mapAudioStreams.size()))
! {
! pThis->m_iCurrentStream++;
! g_playerSettings.dwAudioStream = pThis->m_mapAudioStreams[pThis->m_iCurrentStream-1];
! }
! else if ((!bDown) && (pThis->m_iCurrentStream>1))
! {
! pThis->m_iCurrentStream--;
!
! g_playerSettings.dwAudioStream = pThis->m_mapAudioStreams[pThis->m_iCurrentStream-1];
!
! pThis->m_dhkStream.SetValue(pThis->m_iCurrentStream);
! pThis->m_pCallback->OnAudioStreamChanged();
! }
}
***************
*** 89,92 ****
--- 99,114 ----
HRESULT CAudioSettingsInterface::FrameMove(XBGAMEPAD* pGamepad, XBIR_REMOTE* pRemote, LPDWORD pdwState)
{
+ int iNumber=0;
+ m_mapAudioStreams.erase(m_mapAudioStreams.begin(),m_mapAudioStreams.end());
+ for (int i=0; i <=255; i++)
+ {
+ if (m_pCallback->HasAudioStream(i) )
+ {
+ m_mapAudioStreams[iNumber]=i;
+ iNumber++;
+ }
+ }
+ m_dhkStream.SetRange( 1, iNumber);
+ m_dhkStream.SetValue(m_iCurrentStream);
CControl* pControl = m_pSettingsInterface->GetControlFromId(m_pSettingsInterface->GetFocusId());
if (!pControl)
Index: AudioSettingsInterface.h
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/AudioSettingsInterface.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AudioSettingsInterface.h 28 Nov 2002 21:47:34 -0000 1.1
--- AudioSettingsInterface.h 3 Dec 2002 17:47:04 -0000 1.2
***************
*** 14,24 ****
#include "Font.h"
#include "Dohickey.h"
!
class CSettingsInterface;
class CAudioSettingsInterface : public CUserInterface
{
public:
! CAudioSettingsInterface();
virtual ~CAudioSettingsInterface();
--- 14,27 ----
#include "Font.h"
#include "Dohickey.h"
! #include "../AudioStreamChangedCallback.h"
class CSettingsInterface;
+ #include <map>
+ using namespace std;
+
class CAudioSettingsInterface : public CUserInterface
{
public:
! CAudioSettingsInterface(CAudioStreamChangedCallback* callback );
virtual ~CAudioSettingsInterface();
***************
*** 33,41 ****
private:
CFont* m_pfntCommon13;
CDohickey m_dhkStream;
!
CSettingsInterface* m_pSettingsInterface;
};
--- 36,47 ----
private:
+ int m_iCurrentStream;
CFont* m_pfntCommon13;
CDohickey m_dhkStream;
! CAudioStreamChangedCallback* m_pCallback ;
CSettingsInterface* m_pSettingsInterface;
+ map<int,int> m_mapAudioStreams;
+ typedef map<int,int> imapAudioStreams;
};
Index: CalibrateInterface.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/CalibrateInterface.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CalibrateInterface.cpp 30 Nov 2002 12:33:33 -0000 1.2
--- CalibrateInterface.cpp 3 Dec 2002 17:47:05 -0000 1.3
***************
*** 95,102 ****
if (m_bTopLeft)
{
! m_pnlCalibrateTopLeft.Render(m_rcVisible.left, m_rcVisible.top);
swprintf(wszText,L"%d,%d", m_rcVisible.left, m_rcVisible.top);
! m_pfntCommon13->DrawText( m_rcVisible.left+64, m_rcVisible.top+64, 0xFFFFFFFF, wszText );
}
else
--- 95,102 ----
if (m_bTopLeft)
{
! m_pnlCalibrateTopLeft.Render((float)m_rcVisible.left, (float)m_rcVisible.top);
swprintf(wszText,L"%d,%d", m_rcVisible.left, m_rcVisible.top);
! m_pfntCommon13->DrawText( (float)m_rcVisible.left+64, (float)m_rcVisible.top+64, 0xFFFFFFFF, wszText );
}
else
***************
*** 143,147 ****
else
{
! if (m_rcVisible.bottom>(g_playerSettings.dwScreenHeight-64))
m_rcVisible.bottom--;
}
--- 143,147 ----
else
{
! if (m_rcVisible.bottom > (long)(g_playerSettings.dwScreenHeight-64))
m_rcVisible.bottom--;
}
***************
*** 157,161 ****
else
{
! if (m_rcVisible.bottom<g_playerSettings.dwScreenHeight)
m_rcVisible.bottom++;
}
--- 157,161 ----
else
{
! if (m_rcVisible.bottom < (long)g_playerSettings.dwScreenHeight)
m_rcVisible.bottom++;
}
***************
*** 171,175 ****
else
{
! if (m_rcVisible.right>(g_playerSettings.dwScreenWidth-64))
m_rcVisible.right--;
}
--- 171,175 ----
else
{
! if (m_rcVisible.right > (long)(g_playerSettings.dwScreenWidth-64))
m_rcVisible.right--;
}
***************
*** 185,189 ****
else
{
! if (m_rcVisible.right<g_playerSettings.dwScreenWidth)
m_rcVisible.right++;
}
--- 185,189 ----
else
{
! if (m_rcVisible.right < (long)g_playerSettings.dwScreenWidth)
m_rcVisible.right++;
}
***************
*** 200,204 ****
{
if (m_rcVisible.top>0)
! m_rcVisible.top-=fY;
else
m_rcVisible.top=0;
--- 200,204 ----
{
if (m_rcVisible.top>0)
! m_rcVisible.top-=(LONG)fY;
else
m_rcVisible.top=0;
***************
*** 209,213 ****
{
if (m_rcVisible.left>0)
! m_rcVisible.left+=fX;
else
m_rcVisible.left=0;
--- 209,213 ----
{
if (m_rcVisible.left>0)
! m_rcVisible.left+=(LONG)fX;
else
m_rcVisible.left=0;
***************
*** 218,222 ****
{
if (m_rcVisible.top<64)
! m_rcVisible.top-=fY;
else
m_rcVisible.top=64;
--- 218,222 ----
{
if (m_rcVisible.top<64)
! m_rcVisible.top-=(LONG)fY;
else
m_rcVisible.top=64;
***************
*** 227,231 ****
{
if (m_rcVisible.left<64)
! m_rcVisible.left+=fX;
else
m_rcVisible.left=64;
--- 227,231 ----
{
if (m_rcVisible.left<64)
! m_rcVisible.left+=(LONG)fX;
else
m_rcVisible.left=64;
***************
*** 237,242 ****
if (fY>0)
{
! if (m_rcVisible.bottom>(g_playerSettings.dwScreenHeight-64))
! m_rcVisible.bottom-=fY;
else
m_rcVisible.bottom=(g_playerSettings.dwScreenHeight-64);
--- 237,242 ----
if (fY>0)
{
! if (m_rcVisible.bottom > (long)(g_playerSettings.dwScreenHeight-64))
! m_rcVisible.bottom-=(LONG)fY;
else
m_rcVisible.bottom=(g_playerSettings.dwScreenHeight-64);
***************
*** 246,251 ****
if (fX<0)
{
! if (m_rcVisible.right>(g_playerSettings.dwScreenWidth-64))
! m_rcVisible.right+=fX;
else
m_rcVisible.right=(g_playerSettings.dwScreenWidth-64);
--- 246,251 ----
if (fX<0)
{
! if (m_rcVisible.right > (long)(g_playerSettings.dwScreenWidth-64))
! m_rcVisible.right+=(LONG)fX;
else
m_rcVisible.right=(g_playerSettings.dwScreenWidth-64);
***************
*** 255,260 ****
if (fY<0)
{
! if (m_rcVisible.bottom<g_playerSettings.dwScreenHeight)
! m_rcVisible.bottom-=fY;
else
m_rcVisible.bottom=g_playerSettings.dwScreenHeight;
--- 255,260 ----
if (fY<0)
{
! if (m_rcVisible.bottom < (long)g_playerSettings.dwScreenHeight)
! m_rcVisible.bottom-=(LONG)fY;
else
m_rcVisible.bottom=g_playerSettings.dwScreenHeight;
***************
*** 264,269 ****
if (fX>0)
{
! if (m_rcVisible.right<g_playerSettings.dwScreenWidth)
! m_rcVisible.right+=fX;
else
m_rcVisible.right=g_playerSettings.dwScreenWidth;
--- 264,269 ----
if (fX>0)
{
! if (m_rcVisible.right < (long)g_playerSettings.dwScreenWidth)
! m_rcVisible.right+=(LONG)fX;
else
m_rcVisible.right=g_playerSettings.dwScreenWidth;
Index: ClipInterface.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/ClipInterface.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ClipInterface.cpp 28 Nov 2002 21:47:34 -0000 1.1
--- ClipInterface.cpp 3 Dec 2002 17:47:05 -0000 1.2
***************
*** 110,115 ****
FLOAT width, height;
! width = g_playerSettings.rSource.right-g_playerSettings.rSource.left;
! height = g_playerSettings.rSource.bottom-g_playerSettings.rSource.top;
if ((width<=0) || (height<=0))
{
--- 110,115 ----
FLOAT width, height;
! width = (FLOAT)g_playerSettings.rSource.right-g_playerSettings.rSource.left;
! height = (FLOAT)g_playerSettings.rSource.bottom-g_playerSettings.rSource.top;
if ((width<=0) || (height<=0))
{
***************
*** 124,129 ****
m_pfntCommon13->DrawText( 78, 336+18, 0xFFB2D4F5, wszText);
! width = g_playerSettings.rOutput.right-g_playerSettings.rOutput.left;
! height = g_playerSettings.rOutput.bottom-g_playerSettings.rOutput.top;
swprintf(wszText, L"%gx%g", width, height);
m_pfntCommon13->DrawText(178, 336+18, 0xFFB2D4F5, wszText);
--- 124,129 ----
m_pfntCommon13->DrawText( 78, 336+18, 0xFFB2D4F5, wszText);
! width = (FLOAT)g_playerSettings.rOutput.right-g_playerSettings.rOutput.left;
! height = (FLOAT)g_playerSettings.rOutput.bottom-g_playerSettings.rOutput.top;
swprintf(wszText, L"%gx%g", width, height);
m_pfntCommon13->DrawText(178, 336+18, 0xFFB2D4F5, wszText);
***************
*** 147,154 ****
*pdwState = IN_SCREEN;
! g_playerSettings.rClip.left = m_dhkLeft.GetFloatValue();
! g_playerSettings.rClip.top = m_dhkTop.GetFloatValue();
! g_playerSettings.rClip.right = -m_dhkRight.GetFloatValue();
! g_playerSettings.rClip.bottom= -m_dhkBottom.GetFloatValue();
if (m_dhkTop.HasFocus())
--- 147,154 ----
*pdwState = IN_SCREEN;
! g_playerSettings.rClip.left = (LONG)m_dhkLeft.GetFloatValue();
! g_playerSettings.rClip.top = (LONG)m_dhkTop.GetFloatValue();
! g_playerSettings.rClip.right = (LONG)-m_dhkRight.GetFloatValue();
! g_playerSettings.rClip.bottom= (LONG)-m_dhkBottom.GetFloatValue();
if (m_dhkTop.HasFocus())
Index: PhotoInterface.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/PhotoInterface.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PhotoInterface.cpp 28 Nov 2002 21:47:34 -0000 1.1
--- PhotoInterface.cpp 3 Dec 2002 17:47:05 -0000 1.2
***************
*** 219,227 ****
CHAR szText[64];
! FLOAT viewWidth = lprcClient->right - lprcClient->left;
! FLOAT viewHeight = lprcClient->bottom - lprcClient->top;
! FLOAT sourceWidth = lprcSource->right - lprcSource->left;
! FLOAT sourceHeight = lprcSource->bottom - lprcSource->top;
FLOAT outputWidth, outputHeight;
--- 219,227 ----
CHAR szText[64];
! FLOAT viewWidth = (FLOAT)lprcClient->right - lprcClient->left;
! FLOAT viewHeight = (FLOAT)lprcClient->bottom - lprcClient->top;
! FLOAT sourceWidth = (FLOAT)lprcSource->right - lprcSource->left;
! FLOAT sourceHeight = (FLOAT)lprcSource->bottom - lprcSource->top;
FLOAT outputWidth, outputHeight;
***************
*** 231,235 ****
if (XGetVideoFlags() & XC_VIDEO_FLAGS_WIDESCREEN)
{
! aspectRatio -= WIDE_SCREEN_RATIO_COMPENSATION;
}
--- 231,235 ----
if (XGetVideoFlags() & XC_VIDEO_FLAGS_WIDESCREEN)
{
! aspectRatio -= (FLOAT)WIDE_SCREEN_RATIO_COMPENSATION;
}
***************
*** 260,268 ****
}
! lprcOutput->left = lprcClient->left + ((viewWidth - outputWidth)/2);
! lprcOutput->top = lprcClient->top + ((viewHeight - outputHeight)/2);
! lprcOutput->right = lprcOutput->left + outputWidth;
! lprcOutput->bottom = lprcOutput->top + outputHeight;
if (bLog)
--- 260,268 ----
}
! lprcOutput->left = (LONG)(lprcClient->left + ((viewWidth - outputWidth)/2));
! lprcOutput->top = (LONG)(lprcClient->top + ((viewHeight - outputHeight)/2));
! lprcOutput->right = (LONG)(lprcOutput->left + outputWidth);
! lprcOutput->bottom = (LONG)(lprcOutput->top + outputHeight);
if (bLog)
Index: RatioInterface.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/RatioInterface.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RatioInterface.cpp 28 Nov 2002 21:47:34 -0000 1.1
--- RatioInterface.cpp 3 Dec 2002 17:47:05 -0000 1.2
***************
*** 48,52 ****
}
! m_dhkAspect.SetFloatRange( -0.8, 0.8);
m_dhkAspect.SetPosition(398,336+21);
--- 48,52 ----
}
! m_dhkAspect.SetFloatRange( (float)-0.8, (float)0.8);
m_dhkAspect.SetPosition(398,336+21);
***************
*** 82,87 ****
FLOAT width, height, ratio;
! width = g_playerSettings.rSource.right-g_playerSettings.rSource.left;
! height = g_playerSettings.rSource.bottom-g_playerSettings.rSource.top;
if ((width<=0) || (height<=0))
{
--- 82,87 ----
FLOAT width, height, ratio;
! width = (FLOAT)g_playerSettings.rSource.right-g_playerSettings.rSource.left;
! height = (FLOAT)g_playerSettings.rSource.bottom-g_playerSettings.rSource.top;
if ((width<=0) || (height<=0))
{
***************
*** 96,101 ****
m_pfntCommon13->DrawText( 78, 336+18, 0xFFB2D4F5, wszText);
! width = g_playerSettings.rOutput.right-g_playerSettings.rOutput.left;
! height = g_playerSettings.rOutput.bottom-g_playerSettings.rOutput.top;
ratio = width/height;
--- 96,101 ----
m_pfntCommon13->DrawText( 78, 336+18, 0xFFB2D4F5, wszText);
! width = (FLOAT)g_playerSettings.rOutput.right-g_playerSettings.rOutput.left;
! height = (FLOAT)g_playerSettings.rOutput.bottom-g_playerSettings.rOutput.top;
ratio = width/height;
***************
*** 103,107 ****
( g_playerSettings.rSource.right!=g_playerSettings.rSource.bottom) )
{
! ratio += WIDE_SCREEN_RATIO_COMPENSATION;
}
--- 103,107 ----
( g_playerSettings.rSource.right!=g_playerSettings.rSource.bottom) )
{
! ratio += (FLOAT)WIDE_SCREEN_RATIO_COMPENSATION;
}
***************
*** 132,136 ****
! FLOAT fY = pGamepad->fY1*0.01;
if (fY>0)
--- 132,136 ----
! FLOAT fY = (FLOAT)pGamepad->fY1 * (FLOAT)0.01;
if (fY>0)
***************
*** 140,146 ****
if (g_playerSettings.fRatioCorrection>0.8)
! g_playerSettings.fRatioCorrection=0.8;
else if (g_playerSettings.fRatioCorrection<-0.8)
! g_playerSettings.fRatioCorrection=-0.8;
return S_OK;
--- 140,146 ----
if (g_playerSettings.fRatioCorrection>0.8)
! g_playerSettings.fRatioCorrection=(FLOAT)0.8;
else if (g_playerSettings.fRatioCorrection<-0.8)
! g_playerSettings.fRatioCorrection=(FLOAT)-0.8;
return S_OK;
***************
*** 151,162 ****
{
if (bDown)
! g_playerSettings.fRatioCorrection += 0.01;
else
! g_playerSettings.fRatioCorrection -= 0.01;
if (g_playerSettings.fRatioCorrection>0.8)
! g_playerSettings.fRatioCorrection=0.8;
else if (g_playerSettings.fRatioCorrection<-0.8)
! g_playerSettings.fRatioCorrection=-0.8;
}
--- 151,162 ----
{
if (bDown)
! g_playerSettings.fRatioCorrection += (FLOAT)0.01;
else
! g_playerSettings.fRatioCorrection -= (FLOAT)0.01;
if (g_playerSettings.fRatioCorrection>0.8)
! g_playerSettings.fRatioCorrection=(FLOAT)0.8;
else if (g_playerSettings.fRatioCorrection<-0.8)
! g_playerSettings.fRatioCorrection=(FLOAT)-0.8;
}
Index: ScreenInterface.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/ScreenInterface.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ScreenInterface.cpp 28 Nov 2002 21:47:34 -0000 1.1
--- ScreenInterface.cpp 3 Dec 2002 17:47:05 -0000 1.2
***************
*** 192,197 ****
FLOAT CScreenInterface::GetRatio(LPRECT pRectangle)
{
! FLOAT fWidth = pRectangle->right - pRectangle->left;
! FLOAT fHeight= pRectangle->bottom - pRectangle->top;
return (fWidth / fHeight);
}
--- 192,197 ----
FLOAT CScreenInterface::GetRatio(LPRECT pRectangle)
{
! FLOAT fWidth = (FLOAT)pRectangle->right - pRectangle->left;
! FLOAT fHeight= (FLOAT)pRectangle->bottom - pRectangle->top;
return (fWidth / fHeight);
}
***************
*** 204,219 ****
if (XGetVideoFlags() & XC_VIDEO_FLAGS_WIDESCREEN)
{
! fScreenRatio += WIDE_SCREEN_RATIO_COMPENSATION;
}
! FLOAT fSourceWidth = pSource->right - pSource->left;
! FLOAT fSourceHeight= pSource->bottom - pSource->top;
if (fSourceRatio<fScreenRatio)
{
// clip height
! FLOAT fNewSourceHeight = fSourceWidth / fScreenRatio;
! FLOAT fClipHeight = fSourceHeight - fNewSourceHeight;
! pClip->top = fClipHeight/2;
pClip->bottom = -pClip->top;
pClip->left = 0;
--- 204,219 ----
if (XGetVideoFlags() & XC_VIDEO_FLAGS_WIDESCREEN)
{
! fScreenRatio += (FLOAT)WIDE_SCREEN_RATIO_COMPENSATION;
}
! FLOAT fSourceWidth = (FLOAT)pSource->right - pSource->left;
! FLOAT fSourceHeight= (FLOAT)pSource->bottom - pSource->top;
if (fSourceRatio<fScreenRatio)
{
// clip height
! FLOAT fNewSourceHeight = (FLOAT)fSourceWidth / (FLOAT)fScreenRatio;
! FLOAT fClipHeight = (FLOAT)fSourceHeight - (FLOAT)fNewSourceHeight;
! pClip->top = (LONG)(fClipHeight/2);
pClip->bottom = -pClip->top;
pClip->left = 0;
***************
*** 225,229 ****
FLOAT fNewSourceWidth = fSourceHeight * fScreenRatio;
FLOAT fClipWidth = fSourceWidth - fNewSourceWidth;
! pClip->left = fClipWidth/2;
pClip->right = -pClip->left;
pClip->top = 0;
--- 225,229 ----
FLOAT fNewSourceWidth = fSourceHeight * fScreenRatio;
FLOAT fClipWidth = fSourceWidth - fNewSourceWidth;
! pClip->left = (LONG)(fClipWidth/2);
pClip->right = -pClip->left;
pClip->top = 0;
Index: SettingsInterface.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/SettingsInterface.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SettingsInterface.cpp 28 Nov 2002 21:47:34 -0000 1.1
--- SettingsInterface.cpp 3 Dec 2002 17:47:05 -0000 1.2
***************
*** 10,14 ****
//////////////////////////////////////////////////////////////////////
! CSettingsInterface::CSettingsInterface()
{
m_uiState = IN_SETTINGS_GENERAL;
--- 10,15 ----
//////////////////////////////////////////////////////////////////////
! CSettingsInterface::CSettingsInterface(CAudioStreamChangedCallback* callback )
! :m_pcallback (callback )
{
m_uiState = IN_SETTINGS_GENERAL;
***************
*** 20,24 ****
}
! HRESULT CSettingsInterface::Create( LPDIRECT3DDEVICE8 pd3dDevice, CFontManager* pfntManager, LPVOID lpvCookie )
{
m_pd3dDevice = pd3dDevice;
--- 21,25 ----
}
! HRESULT CSettingsInterface::Create( LPDIRECT3DDEVICE8 pd3dDevice, CFontManager* pfntManager, LPVOID lpvCookie)
{
m_pd3dDevice = pd3dDevice;
***************
*** 66,71 ****
// Create Audio Settings User Interface
! m_pSettingsInterfaces[IN_SETTINGS_AUDIO] = new CAudioSettingsInterface();
! if( FAILED( m_pSettingsInterfaces[IN_SETTINGS_AUDIO]->Create( m_pd3dDevice, pfntManager, this ) ) )
{
OutputDebugString("Unable to create audio settings interface.\n");
--- 67,72 ----
// Create Audio Settings User Interface
! m_pSettingsInterfaces[IN_SETTINGS_AUDIO] = new CAudioSettingsInterface(m_pcallback);
! if( FAILED( m_pSettingsInterfaces[IN_SETTINGS_AUDIO]->Create( m_pd3dDevice, pfntManager, this) ) )
{
OutputDebugString("Unable to create audio settings interface.\n");
Index: SettingsInterface.h
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/SettingsInterface.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SettingsInterface.h 28 Nov 2002 21:47:34 -0000 1.1
--- SettingsInterface.h 3 Dec 2002 17:47:05 -0000 1.2
***************
*** 18,22 ****
#include "AudioSettingsInterface.h"
#include "GeneralSettingsInterface.h"
!
#define SETTINGS_INTERFACES 3
--- 18,22 ----
#include "AudioSettingsInterface.h"
#include "GeneralSettingsInterface.h"
! #include "../AudioStreamChangedCallback.h"
#define SETTINGS_INTERFACES 3
***************
*** 30,37 ****
{
public:
! CSettingsInterface();
virtual ~CSettingsInterface();
! HRESULT Create( LPDIRECT3DDEVICE8 pd3dDevice, CFontManager* pfntManager, LPVOID lpvCookie );
HRESULT FrameMove(XBGAMEPAD* pGamepad, XBIR_REMOTE* pRemote, LPDWORD pdwState);
HRESULT Render();
--- 30,37 ----
{
public:
! CSettingsInterface(CAudioStreamChangedCallback* callback );
virtual ~CSettingsInterface();
! HRESULT Create( LPDIRECT3DDEVICE8 pd3dDevice, CFontManager* pfntManager, LPVOID lpvCookie);
HRESULT FrameMove(XBGAMEPAD* pGamepad, XBIR_REMOTE* pRemote, LPDWORD pdwState);
HRESULT Render();
***************
*** 48,56 ****
CSettingsPanel m_bplSettings;
CFont* m_pfntCommon13;
-
CApplication* m_pApplication;
DWORD m_uiState;
CUserInterface* m_pSettingsInterfaces[SETTINGS_INTERFACES];
};
--- 48,56 ----
CSettingsPanel m_bplSettings;
CFont* m_pfntCommon13;
CApplication* m_pApplication;
DWORD m_uiState;
CUserInterface* m_pSettingsInterfaces[SETTINGS_INTERFACES];
+ CAudioStreamChangedCallback* m_pcallback ;
};
|
Update of /cvsroot/xbyamp/xbmp/player/mplayer
In directory sc8-pr-cvs1:/tmp/cvs-serv25740/player/mplayer
Modified Files:
af_equalizer.c ao_plugin.c find_sub.c font_load.c helper.c
spudec.c subreader.cpp libmpcodecs.lib libmpdemux.lib
Log Message:
removed compiler warnings
Index: af_equalizer.c
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/mplayer/af_equalizer.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** af_equalizer.c 28 Nov 2002 21:47:32 -0000 1.1
--- af_equalizer.c 3 Dec 2002 17:46:59 -0000 1.2
***************
*** 105,109 ****
// Generate filter taps
for(k=0;k<s->K;k++)
! bp2( s->a[k],s->b[k], (float)(F[k]/(af->data->rate)),Q );
// Calculate how much this plugin adds to the overall time delay
--- 105,109 ----
// Generate filter taps
for(k=0;k<s->K;k++)
! bp2( s->a[k],s->b[k], (float)(F[k]/(af->data->rate)),(float)Q );
// Calculate how much this plugin adds to the overall time delay
Index: ao_plugin.c
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/mplayer/ao_plugin.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ao_plugin.c 2 Dec 2002 18:46:48 -0000 1.2
--- ao_plugin.c 3 Dec 2002 17:46:59 -0000 1.3
***************
*** 10,13 ****
--- 10,14 ----
#include "audio_plugin.h"
+ #include "mp_msg.h"
static ao_info_t info =
Index: find_sub.c
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/mplayer/find_sub.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** find_sub.c 2 Dec 2002 18:46:52 -0000 1.2
--- find_sub.c 3 Dec 2002 17:47:00 -0000 1.3
***************
*** 40,49 ****
if(vo_sub)
{
! if(key>=vo_sub->start && key<=vo_sub->end)
return; // OK!
}
else
{
! if(key>nosub_range_start && key<nosub_range_end)
return; // OK!
}
--- 40,49 ----
if(vo_sub)
{
! if(key>=(int)vo_sub->start && key<=(int)vo_sub->end)
return; // OK!
}
else
{
! if(key>(int)nosub_range_start && key<(int)nosub_range_end)
return; // OK!
}
***************
*** 64,68 ****
if(current_sub>=0 && current_sub+1<sub_num)
{
! if(key>subtitles[current_sub].end && key<subtitles[current_sub+1].start)
{
// no sub
--- 64,68 ----
if(current_sub>=0 && current_sub+1<sub_num)
{
! if(key>(int)subtitles[current_sub].end && key<(int)subtitles[current_sub+1].start)
{
// no sub
***************
*** 75,79 ****
++current_sub;
vo_sub=&subtitles[current_sub];
! if(key>=vo_sub->start && key<=vo_sub->end)
return; // OK!
}
--- 75,79 ----
++current_sub;
vo_sub=&subtitles[current_sub];
! if(key>=(int)vo_sub->start && key<=(int)vo_sub->end)
return; // OK!
}
***************
*** 90,96 ****
current_sub=(i+j+1)/2;
vo_sub=&subtitles[current_sub];
! if(key<vo_sub->start)
j=current_sub-1;
! else if(key>vo_sub->end)
i=current_sub+1;
else
--- 90,96 ----
current_sub=(i+j+1)/2;
vo_sub=&subtitles[current_sub];
! if(key<(int)vo_sub->start)
j=current_sub-1;
! else if(key>(int)vo_sub->end)
i=current_sub+1;
else
***************
*** 101,105 ****
// check where are we...
! if(key<vo_sub->start)
{
if(current_sub<=0)
--- 101,105 ----
// check where are we...
! if(key<(int)vo_sub->start)
{
if(current_sub<=0)
***************
*** 113,117 ****
}
--current_sub;
! if(key>subtitles[current_sub].end && key<subtitles[current_sub+1].start)
{
// no sub
--- 113,117 ----
}
--current_sub;
! if(key>(int)subtitles[current_sub].end && key<(int)subtitles[current_sub+1].start)
{
// no sub
***************
*** 126,130 ****
else
{
! if(key<=vo_sub->end)
mp_msg(0,0,"JAJJ! ");
else
--- 126,130 ----
else
{
! if(key<=(int)vo_sub->end)
mp_msg(0,0,"JAJJ! ");
else
***************
*** 139,143 ****
}
else
! if(key>subtitles[current_sub].end && key<subtitles[current_sub+1].start)
{
// no sub
--- 139,143 ----
}
else
! if(key>(int)subtitles[current_sub].end && key<(int)subtitles[current_sub+1].start)
{
// no sub
Index: font_load.c
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/mplayer/font_load.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** font_load.c 2 Dec 2002 18:46:52 -0000 1.2
--- font_load.c 3 Dec 2002 17:47:00 -0000 1.3
***************
*** 321,325 ****
{
// re-sample alpha
! int f=factor*256.0f;
int size=desc->pic_a[i]->w*desc->pic_a[i]->h;
int j;
--- 321,325 ----
{
// re-sample alpha
! int f=(int)(factor*256.0f);
int size=desc->pic_a[i]->w*desc->pic_a[i]->h;
int j;
Index: helper.c
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/mplayer/helper.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** helper.c 30 Nov 2002 16:03:08 -0000 1.3
--- helper.c 3 Dec 2002 17:47:00 -0000 1.4
***************
*** 161,166 ****
LARGE_INTEGER qwTicksPerSec;
QueryPerformanceFrequency( &qwTicksPerSec ); // ticks/sec
! m_fuSecsPerTick = ((FLOAT)(qwTicksPerSec.QuadPart)) /1000.0; // tics/msec
! m_fuSecsPerTick = m_fuSecsPerTick/1000.0; // tics/usec
QueryPerformanceCounter( &m_lStartTime );
--- 161,166 ----
LARGE_INTEGER qwTicksPerSec;
QueryPerformanceFrequency( &qwTicksPerSec ); // ticks/sec
! m_fuSecsPerTick = (FLOAT)(((FLOAT)(qwTicksPerSec.QuadPart)) /1000.0); // tics/msec
! m_fuSecsPerTick = (FLOAT)(m_fuSecsPerTick/1000.0); // tics/usec
QueryPerformanceCounter( &m_lStartTime );
Index: spudec.c
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/mplayer/spudec.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** spudec.c 2 Dec 2002 18:46:56 -0000 1.2
--- spudec.c 3 Dec 2002 17:47:00 -0000 1.3
***************
*** 579,583 ****
src_step = (delta_src << 16) / delta_tar >>1;
for (t = 0; t<=delta_tar; src += (src_step << 1), t++){
! table[t].position= MIN(src >> 16, end_src - 1);
table[t].right_down = src & 0xffff;
table[t].left_up = 0x10000 - table[t].right_down;
--- 579,583 ----
src_step = (delta_src << 16) / delta_tar >>1;
for (t = 0; t<=delta_tar; src += (src_step << 1), t++){
! table[t].position= MIN(src >> 16, (int)end_src - 1);
table[t].right_down = src & 0xffff;
table[t].left_up = 0x10000 - table[t].right_down;
Index: subreader.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/mplayer/subreader.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** subreader.cpp 2 Dec 2002 18:46:57 -0000 1.2
--- subreader.cpp 3 Dec 2002 17:47:00 -0000 1.3
***************
*** 660,666 ****
while (sscanf (line, "%f %f", &a, &b) !=2);
! mpsub_position += a*(sub_uses_time ? 100.0 : 1.0);
current->start=(int) mpsub_position;
! mpsub_position += b*(sub_uses_time ? 100.0 : 1.0);
current->end=(int) mpsub_position;
--- 660,666 ----
while (sscanf (line, "%f %f", &a, &b) !=2);
! mpsub_position += (float)(a*(sub_uses_time ? 100.0 : 1.0));
current->start=(int) mpsub_position;
! mpsub_position += (float)(b*(sub_uses_time ? 100.0 : 1.0));
current->end=(int) mpsub_position;
***************
*** 1221,1225 ****
subtitle* nextsub;
int i = sub_num;
! unsigned long subfms = (sub_uses_time ? 100 : fps) * subtime;
n=m=0;
--- 1221,1225 ----
subtitle* nextsub;
int i = sub_num;
! unsigned long subfms = (unsigned long)((sub_uses_time ? 100 : fps) * subtime);
n=m=0;
***************
*** 1260,1265 ****
if(sub_uses_time && sub_fps)
{
! sub->start *= sub_fps/fps;
! sub->end *= sub_fps/fps;
}
}
--- 1260,1265 ----
if(sub_uses_time && sub_fps)
{
! sub->start *= (unsigned long)(sub_fps/fps);
! sub->end *= (unsigned long)(sub_fps/fps);
}
}
***************
*** 1599,1753 ****
mp_msg(0,0,"Read %i subtitles, %i errors.\n", sub_num, sub_errs);
- }
- void dump_srt(subtitle* subs, float fps)
- {
- int i,j;
- int h,m,s,ms;
- FILE* fd;
- subtitle * onesub;
- unsigned long temp;
-
- if (!sub_uses_time && sub_fps == 0)
- sub_fps = fps;
- fd=fopen("dumpsub.srt","w");
- if(!fd)
- {
- perror("dump_srt: fopen");
- return;
- }
- for(i=0;i<sub_num;i++)
- {
- onesub=subs+i; //=&subs[i];
- fprintf(fd,"%d\n",i+1);//line number
-
- temp=onesub->start;
- if (!sub_uses_time)
- temp = temp * 100 / sub_fps;
- temp -= sub_delay * 100;
- h=temp/360000;
- temp%=360000; //h =1*100*60*60
- m=temp/6000;
- temp%=6000; //m =1*100*60
- s=temp/100;
- temp%=100; //s =1*100
- ms=temp*10; //ms=1*10
- fprintf(fd,"%02d:%02d:%02d,%03d --> ",h,m,s,ms);
-
- temp=onesub->end;
- if (!sub_uses_time)
- temp = temp * 100 / sub_fps;
- temp -= sub_delay * 100;
- h=temp/360000;
- temp%=360000;
- m=temp/6000;
- temp%=6000;
- s=temp/100;
- temp%=100;
- ms=temp*10;
- fprintf(fd,"%02d:%02d:%02d,%03d\n",h,m,s,ms);
-
- for(j=0;j<onesub->lines;j++)
- fprintf(fd,"%s\n",onesub->text[j]);
-
- fprintf(fd,"\n");
- }
- fclose(fd);
- mp_msg(MSGT_SUBREADER,MSGL_INFO,"SUB: Subtitles dumped in \'dumpsub.srt\'.\n");
- }
-
- void dump_mpsub(subtitle* subs, float fps)
- {
- int i,j;
- FILE*fd;
- float a,b;
-
- mpsub_position=sub_uses_time?(sub_delay*100):(sub_delay*fps);
- if (sub_fps==0)
- sub_fps=fps;
-
- fd=fopen ("dump.mpsub", "w");
- if (!fd)
- {
- perror ("dump_mpsub: fopen");
- return;
- }
-
-
- if (sub_uses_time)
- fprintf (fd,"FORMAT=TIME\n\n");
- else
- fprintf (fd, "FORMAT=%5.2f\n\n", fps);
-
- for(j=0;j<sub_num;j++)
- {
- subtitle* egysub=&subs[j];
- if (sub_uses_time)
- {
- a=((egysub->start-mpsub_position)/100.0);
- b=((egysub->end-egysub->start)/100.0);
- if ( (float)((int)a) == a)
- fprintf (fd, "%.0f",a);
- else
- fprintf (fd, "%.2f",a);
-
- if ( (float)((int)b) == b)
- fprintf (fd, " %.0f\n",b);
- else
- fprintf (fd, " %.2f\n",b);
- }
- else
- {
- fprintf (fd, "%ld %ld\n", (long)((egysub->start*(fps/sub_fps))-((mpsub_position*(fps/sub_fps)))),
- (long)(((egysub->end)-(egysub->start))*(fps/sub_fps)));
- }
-
- mpsub_position = egysub->end;
- for (i=0; i<egysub->lines; i++)
- {
- fprintf (fd, "%s\n",egysub->text[i]);
- }
- fprintf (fd, "\n");
- }
- fclose (fd);
- mp_msg(MSGT_SUBREADER,MSGL_INFO,"SUB: Subtitles dumped in \'dump.mpsub\'.\n");
- }
-
- void dump_microdvd(subtitle* subs, float fps)
- {
- int i, delay;
- FILE*fd;
- if (sub_fps == 0)
- sub_fps = fps;
- fd = fopen("dumpsub.txt", "w");
- if (!fd)
- {
- perror("dumpsub.txt: fopen");
- return;
- }
- delay = sub_delay * sub_fps;
- for (i = 0; i < sub_num; ++i)
- {
- int j, start, end;
- start = subs[i].start;
- end = subs[i].end;
- if (sub_uses_time)
- {
- start = start * sub_fps / 100 ;
- end = end * sub_fps / 100;
- }
- else
- {
- start = start * sub_fps / fps;
- end = end * sub_fps / fps;
- }
- start -= delay;
- end -= delay;
- fprintf(fd, "{%d}{%d}", start, end);
- for (j = 0; j < subs[i].lines; ++j)
- fprintf(fd, "%s%s", j ? "|" : "", subs[i].text[j]);
- fprintf(fd, "\n");
- }
- fclose(fd);
- mp_msg(MSGT_SUBREADER,MSGL_INFO,"SUB: Subtitles dumped in \'dumpsub.txt\'.\n");
}
--- 1599,1602 ----
Index: libmpcodecs.lib
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/mplayer/libmpcodecs.lib,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
Binary files /tmp/cvsy1hnIm and /tmp/cvsczPMqO differ
Index: libmpdemux.lib
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/mplayer/libmpdemux.lib,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
Binary files /tmp/cvsbZVKRW and /tmp/cvsmn74pQ differ
|
|
From: <ya...@us...> - 2002-12-03 17:47:10
|
Update of /cvsroot/xbyamp/xbmp/player/common
In directory sc8-pr-cvs1:/tmp/cvs-serv25740/player/common
Modified Files:
MediaSample.h
Log Message:
removed compiler warnings
Index: MediaSample.h
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/common/MediaSample.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MediaSample.h 28 Nov 2002 21:47:35 -0000 1.1
--- MediaSample.h 3 Dec 2002 17:47:06 -0000 1.2
***************
*** 1,8 ****
! #ifndef MEDIA_SAMPLE_H
! #define MEDIA_SAMPLE_H
class MediaSample
{
public:
};
! #endif
\ No newline at end of file
--- 1,162 ----
! #ifndef __COMMON_MEDIASAMPLE_H_
! #define __COMMON_MEDIASAMPLE_H_
!
! #include "..\Common.h"
!
! const uint32_t AllSections = (uint32_t)0xffffffff;
!
! class MediaSample;
! class ReleaseClassMediaSample
! {
! public:
! virtual void ReleaseMediaSample(MediaSample*) = 0;
! };
class MediaSample
{
+ protected:
+ ReleaseClassMediaSample* mReleaseClass;
+ long mReferences;
+
+ uint8_t* mBuffer;
+ uint32_t mSize;
+ uint64_t mOffset;
+ uint32_t mStream;
+ bool mHasPTS;
+ uint64_t mPTS;
+ CodecID mCodecId;
+ virtual void _Release();
+ virtual void OnRelease() {;}
+
+ public:
+ MediaSample();
+ MediaSample(ReleaseClassMediaSample*);
+ virtual ~MediaSample();
+
+ virtual void AddRef();
+ virtual void Release();
+
+ virtual uint8_t* GetBuffer(uint32_t);
+ virtual uint32_t GetSize(uint32_t);
+ virtual uint64_t GetOffset();
+ virtual uint32_t GetStream();
+ virtual uint32_t GetNumSegments();
+ virtual MediaSample* GetSegmentFromOffset(uint32_t, uint32_t*);
+
+ virtual bool HasPTS();
+ virtual uint64_t GetPTS();
+ virtual void ResetPTS();
+ virtual void SetPTS(uint64_t PTS);
+ virtual void SetOffset(uint64_t offset);
+
+ virtual CodecID GetCodecId();
+ virtual void SetCodecId(CodecID);
+ };
+
+ class MemMediaSample;
+ class ReleaseClassMemMediaSample
+ {
public:
+ virtual void ReleaseMediaSample(MemMediaSample*) = 0;
};
!
! class MemMediaSample : public MediaSample
! {
! protected:
! ReleaseClassMemMediaSample* mReleaseClass;
! uint32_t mBufferSize;
!
! virtual void _Release();
! int Realloc(uint32_t size);
! void Free();
!
! public:
! MemMediaSample();
! MemMediaSample(ReleaseClassMemMediaSample*);
! virtual ~MemMediaSample();
!
! virtual void SetOffset(uint64_t offset);
! virtual void SetSize(uint32_t size);
! virtual void SetStream(uint32_t stream);
!
! // Made public for easy access.
! MemMediaSample* Next;
! };
!
! class ProxyMediaSample;
! class ReleaseClassProxyMediaSample
! {
! public:
! virtual void ReleaseMediaSample(ProxyMediaSample*) = 0;
! };
!
! // A Proxy Media Sample is a media sample that owns no allocated space.
! class ProxyMediaSample : public MediaSample {
! protected:
! ReleaseClassProxyMediaSample* mReleaseClass;
! MediaSample* mParent;
!
! virtual void _Release();
! virtual void OnRelease();
!
! public:
! ProxyMediaSample();
! ProxyMediaSample(ReleaseClassProxyMediaSample*);
! virtual ~ProxyMediaSample();
!
! virtual void SetOffset(uint64_t offset);
! virtual void SetSize(uint32_t size);
! virtual void SetBuffer(void* buffer);
! virtual void SetStream(uint32_t stream);
! virtual void SetParent(MediaSample* pSample);
!
! // Made public for easy access.
! ProxyMediaSample* Next;
! };
!
! class MediaSampleSet;
! class ReleaseClassMediaSampleSet
! {
! public:
! virtual void ReleaseMediaSample(MediaSampleSet*) = 0;
! };
!
! class MediaSampleSet : public MediaSample
! {
! public:
! MediaSampleSet();
! MediaSampleSet(ReleaseClassMediaSampleSet*);
! virtual ~MediaSampleSet();
! virtual void Release();
!
! virtual uint8_t* GetBuffer(uint32_t);
! virtual uint32_t GetSize(uint32_t);
! virtual uint32_t GetStream();
! virtual void AddMediaSample(ProxyMediaSample* mediaSample);
! virtual uint32_t GetNumSegments();
! virtual MediaSample* GetSegmentFromOffset(uint32_t, uint32_t*);
!
! MediaSampleSet* Next;
!
! protected:
!
! virtual void OnRelease();
! virtual void _Release();
! ProxyMediaSample* GetSampleFromNum(uint32_t sampleNum);
! ProxyMediaSample* GetSampleFromOffset(uint32_t sampleOffset);
!
! ReleaseClassMediaSampleSet* mReleaseClass;
!
! uint32_t mNumSegments;
! uint32_t mTotalSetSize;
! uint32_t cachedSampleOffset;
! uint32_t cachedSampleNum;
! ProxyMediaSample* cachedMediaSample;
! ProxyMediaSample* mMediaSampleListHead;
! };
!
! #ifndef SAFE_RELEASE
! #define SAFE_RELEASE(c) { if (c) { (c)->Release(); (c) = 0; } }
! #endif
!
! #endif // __COMMON_MEDIASAMPLE_H_
|
|
From: <ya...@us...> - 2002-12-03 17:47:09
|
Update of /cvsroot/xbyamp/xbmp/player
In directory sc8-pr-cvs1:/tmp/cvs-serv25740/player
Modified Files:
AVRenderer.h buildtime.h FileRelax.cpp MediaPlayer.h
MoviePlayer.cpp MoviePlayer.h xbox_video.cpp
XBoxMediaPlayer.cpp XBMediaPlayer.dsp XBMediaPlayer.plg
Log Message:
removed compiler warnings
Index: AVRenderer.h
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/AVRenderer.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AVRenderer.h 28 Nov 2002 21:47:35 -0000 1.1
--- AVRenderer.h 3 Dec 2002 17:47:05 -0000 1.2
***************
*** 3,7 ****
#include "Common.h"
! #include "Common\MediaSample.h"
--- 3,7 ----
#include "Common.h"
! #include "Common/MediaSample.h"
***************
*** 22,25 ****
--- 22,48 ----
virtual HRESULT SetCurrentVolume(LONG nVolume)=0;
virtual bool SupportsSurroundSound() = 0;
+ };
+ class VideoRenderer {
+ public:
+ virtual HRESULT Create( LPDIRECT3DDEVICE8 pd3dDevice, D3DPRESENT_PARAMETERS* pd3dpp) = 0;
+ virtual HRESULT Initialize(HWND* hWnd, uint32_t Width, uint32_t Height, bool Fullscreen) = 0;
+ virtual HRESULT Deinitialize() = 0;
+ virtual HRESULT Draw(MediaSample* pSample, int bIsBuffered) = 0;
+ };
+
+ class OSPlayer {
+ public:
+ virtual HRESULT ProcessPerFrame() = 0;
+ virtual HRESULT Process(uint64_t) = 0;
+ virtual uint64_t GetTime() = 0;
+ virtual void SetTime(uint64_t) = 0;
+ virtual void OnPlaybackComplete()=0;
+ };
+
+ class AVRenderer {
+ public:
+ virtual HRESULT InitializeAudio(int bRenderAudio, WAVEFORMATEX* pWfx) = 0;
+ virtual HRESULT InitializeVideo(int bRenderVideo, int width, int height) = 0;
+ virtual HRESULT RenderAudio(PBYTE buffer, uint32_t size, uint64_t pts) = 0;
};
Index: buildtime.h
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/buildtime.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** buildtime.h 2 Dec 2002 18:47:30 -0000 1.4
--- buildtime.h 3 Dec 2002 17:47:05 -0000 1.5
***************
*** 1,4 ****
#ifndef BUILD_TIME_H
#define BUILD_TIME_H
! #define BUILD_TIME L"build:2-dec-2002 19:40"
#endif
--- 1,4 ----
#ifndef BUILD_TIME_H
#define BUILD_TIME_H
! #define BUILD_TIME L"build:3-dec-2002 17:45"
#endif
Index: FileRelax.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/FileRelax.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FileRelax.cpp 28 Nov 2002 21:47:35 -0000 1.1
--- FileRelax.cpp 3 Dec 2002 17:47:05 -0000 1.2
***************
*** 87,91 ****
if (!m_bOpened) return -1;
// send request
! ultoa(m_filePos,szOffset,10);
sprintf(cmd,"READ,%s,%u",szOffset,uiBufSize);
send(m_socket,cmd,strlen(cmd),0);
--- 87,91 ----
if (!m_bOpened) return -1;
// send request
! ultoa((unsigned long)m_filePos,szOffset,10);
sprintf(cmd,"READ,%s,%u",szOffset,uiBufSize);
send(m_socket,cmd,strlen(cmd),0);
***************
*** 93,97 ****
// get response
recv(m_socket,cmd,32,0);
! INT64 sending = atol(cmd);
if (sending<=0)
{
--- 93,97 ----
// get response
recv(m_socket,cmd,32,0);
! long sending = atol(cmd);
if (sending<=0)
{
***************
*** 99,106 ****
}
// read
! int bytesRead = 0;
while( bytesRead < sending)
{
! bytesRead += recv(m_socket,pBuffer+bytesRead,sending-bytesRead,0);
}
--- 99,106 ----
}
// read
! long bytesRead = 0;
while( bytesRead < sending)
{
! bytesRead += recv(m_socket,pBuffer+bytesRead, sending-(long)bytesRead,0);
}
Index: MediaPlayer.h
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/MediaPlayer.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MediaPlayer.h 28 Nov 2002 21:47:35 -0000 1.1
--- MediaPlayer.h 3 Dec 2002 17:47:05 -0000 1.2
***************
*** 2,5 ****
--- 2,6 ----
#define __MEDIAPLAYER_H_
+ #include "AudioStreamChangedCallback.h"
typedef struct {
***************
*** 21,25 ****
} RENDER_TYPE;
! class MediaPlayer
{
public:
--- 22,26 ----
} RENDER_TYPE;
! class MediaPlayer : public CAudioStreamChangedCallback
{
public:
Index: MoviePlayer.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/MoviePlayer.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** MoviePlayer.cpp 2 Dec 2002 18:47:31 -0000 1.13
--- MoviePlayer.cpp 3 Dec 2002 17:47:05 -0000 1.14
***************
*** 11,14 ****
--- 11,16 ----
// - duo's HW ac3 decoder
// - .m3u
+ // - select audio stream
+ // - after a few files i can not play any file anymore???
//
//
***************
*** 66,69 ****
--- 68,72 ----
extern void free_font_desc(font_desc_t *desc);
extern void vo_init_osd();
+ extern void resync_audio_stream(sh_audio_t *sh_audio);
int stream_cache_size=16384;
***************
*** 273,277 ****
#endif
vo_init_osd();
! return true;
}
--- 276,307 ----
#endif
vo_init_osd();
!
!
! DWORD dwSpeakerConfig=XGetAudioFlags();
! if ( XC_AUDIO_FLAGS_BASIC( dwSpeakerConfig ) == XC_AUDIO_FLAGS_MONO )
! {
! mp_msg(0,0,"mono output");
! audio_output_channels=1;
! }
!
! if ( XC_AUDIO_FLAGS_BASIC( dwSpeakerConfig ) == XC_AUDIO_FLAGS_STEREO )
! {
! mp_msg(0,0,"stereo output");
! audio_output_channels=2;
! }
!
! if ( XC_AUDIO_FLAGS_ENCODED( dwSpeakerConfig ) & XC_AUDIO_FLAGS_ENABLE_DTS )
! {
! mp_msg(0,0,"DTS output (4 channels)");
! audio_output_channels=4;
! }
!
! if ( XC_AUDIO_FLAGS_ENCODED( dwSpeakerConfig ) & XC_AUDIO_FLAGS_ENABLE_AC3 )
! {
! mp_msg(0,0,"ac3 output (6 channels)");
! audio_output_channels=6;
! }
!
! return true;
}
***************
*** 534,545 ****
// fix files which have either mono
// or ac3 sound
! audio_output_channels = sh_audio->channels;
! if (audio_output_channels>2) audio_output_channels=2;
//const ao_info_t *info=audio_out->info;
if(!(audio_out=init_best_audio_out(audio_driver_list,
(ao_plugin_cfg.plugin_list!=NULL), // plugin flag
! (force_srate ? force_srate:sh_audio->samplerate*playback_speed),
! (audio_output_channels ? audio_output_channels:sh_audio->channels),
! (sh_audio->sample_format),
0)))
--- 564,575 ----
// fix files which have either mono
// or ac3 sound
! int iAudioChannels=sh_audio->channels;
! if (iAudioChannels > audio_output_channels ) iAudioChannels =audio_output_channels ;
//const ao_info_t *info=audio_out->info;
if(!(audio_out=init_best_audio_out(audio_driver_list,
(ao_plugin_cfg.plugin_list!=NULL), // plugin flag
! (int)(force_srate ? force_srate:sh_audio->samplerate*playback_speed),
! iAudioChannels ,//(int)(audio_output_channels ? audio_output_channels:sh_audio->channels),
! (int)(sh_audio->sample_format),
0)))
***************
*** 670,674 ****
! ao_data.pts=(( (sh_video?sh_video->timer:0)+sh_audio->delay)*(float)90000.0);
playsize=audio_out->get_space();
--- 700,704 ----
! ao_data.pts=(int)(( (sh_video?sh_video->timer:0)+sh_audio->delay)*(float)90000.0);
playsize=audio_out->get_space();
***************
*** 749,753 ****
// get it!
//mp_msg(0,0,"STEP4");
! in_size=(int)video_read_frame(sh_video,&next_frame_time,&start,force_fps);
//mp_msg(0,0,"STEP5");
if(in_size<0)
--- 779,783 ----
// get it!
//mp_msg(0,0,"STEP4");
! in_size=(int)video_read_frame(sh_video,&next_frame_time,&start,(int)force_fps);
//mp_msg(0,0,"STEP5");
if(in_size<0)
***************
*** 851,855 ****
delay=0.25;
else if(delay<0.10)
! delay=0.10;
if(time_frame>delay*0.6)
{
--- 881,885 ----
delay=0.25;
else if(delay<0.10)
! delay=(float)0.10;
if(time_frame>delay*0.6)
{
***************
*** 884,888 ****
{
// -------- USLEEP + SOFTSLEEP -----------
! float min=softsleep?0.021:0.005;
while(time_frame>min )
{
--- 914,918 ----
{
// -------- USLEEP + SOFTSLEEP -----------
! float min=softsleep?(float)0.021:(float)0.005;
while(time_frame>min )
{
***************
*** 992,996 ****
float x;
AV_delay=(a_pts-delay-audio_delay)-v_pts;
! if(drop_frame_cnt > 50+drop_message*250 && AV_delay>0.5)
{
++drop_message;
--- 1022,1026 ----
float x;
AV_delay=(a_pts-delay-audio_delay)-v_pts;
! if(drop_frame_cnt > (unsigned long)(50+drop_message*250) && AV_delay>0.5)
{
++drop_message;
***************
*** 1053,1057 ****
if (pts > sub_last_pts || pts < sub_last_pts-1.0 )
{
! find_sub(subtitles,sub_uses_time?(100*(pts+sub_delay)):((pts+sub_delay)*sub_fps)); // FIXME! frame counter...
sub_last_pts = pts;
}
--- 1083,1087 ----
if (pts > sub_last_pts || pts < sub_last_pts-1.0 )
{
! find_sub(subtitles,sub_uses_time ? (int)(100*(pts+sub_delay)) : (int)((pts+sub_delay)*sub_fps)); // FIXME! frame counter...
sub_last_pts = pts;
}
***************
*** 1300,1304 ****
void CMoviePlayer::SetSubtitleDelay(INT64 iDelay)
{
! float fDelay=iDelay;
fDelay/=1000.0;
sub_delay=fDelay;
--- 1330,1334 ----
void CMoviePlayer::SetSubtitleDelay(INT64 iDelay)
{
! float fDelay=(float)iDelay;
fDelay/=1000.0;
sub_delay=fDelay;
***************
*** 1308,1312 ****
void CMoviePlayer::SetAVDelay(int iMilliSeconds)
{
! float fDelay=iMilliSeconds;
fDelay/=1000.0;
audio_delay += fDelay;
--- 1338,1342 ----
void CMoviePlayer::SetAVDelay(int iMilliSeconds)
{
! float fDelay=(float)iMilliSeconds;
fDelay/=1000.0;
audio_delay += fDelay;
***************
*** 1323,1325 ****
--- 1353,1388 ----
if (!stream) return 0;
return (DWORD)demuxer_get_time_length(demuxer);
+ }
+
+ //*************************************************************************************
+ void CMoviePlayer::SelectAudioStream(int iStream)
+ {
+ // 0-3, 0 = auto
+
+ if (!demuxer) return;
+ if (!sh_audio) return ;
+
+ if ( NULL==demuxer->a_streams[iStream]) return;
+ // MPG/SUB 0-31
+ // AVI/OGM 1-99
+ // ASF/RM 0-127
+ // VOB 128-159
+ // LPCM 160-191
+ if (d_audio && audio_id!=iStream)
+ {
+ d_audio->id=iStream;
+ audio_id =iStream;
+ resync_audio_stream(sh_audio);
+ }
+ }
+
+ bool CMoviePlayer::HasAudioStream(int iStream)
+ {
+ if (iStream < 0 || iStream > 255) return false;
+ if (!demuxer) return false;
+
+ if (!sh_audio) return false;
+
+ if ( NULL==demuxer->a_streams[iStream]) return false;
+ return true;
}
Index: MoviePlayer.h
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/MoviePlayer.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MoviePlayer.h 2 Dec 2002 17:01:17 -0000 1.3
--- MoviePlayer.h 3 Dec 2002 17:47:05 -0000 1.4
***************
*** 68,71 ****
--- 68,73 ----
{
public:
+ bool HasAudioStream(int iStream);
+ void SelectAudioStream(int iStream);
DWORD GetPlaybackTime();
void SetAVDelay(int iMilliSeconds);
Index: xbox_video.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/xbox_video.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** xbox_video.cpp 2 Dec 2002 17:01:18 -0000 1.8
--- xbox_video.cpp 3 Dec 2002 17:47:05 -0000 1.9
***************
*** 267,272 ****
CalculateOutputRectangle( &g_playerSettings.rOveride,
! &rSource,
! &g_playerSettings.rOutput, FALSE);
break;
--- 267,272 ----
CalculateOutputRectangle( &g_playerSettings.rOveride,
! &rSource,
! &g_playerSettings.rOutput, FALSE);
break;
***************
*** 274,279 ****
CalculateOutputRectangle( &g_playerSettings.rScreen,
! &rSource,
! &g_playerSettings.rOutput, FALSE);
break;
}
--- 274,279 ----
CalculateOutputRectangle( &g_playerSettings.rScreen,
! &rSource,
! &g_playerSettings.rOutput, FALSE);
break;
}
***************
*** 549,557 ****
void CXboxVideoRenderer::CalculateOutputRectangle(LPRECT lprcClient, LPRECT lprcSource, LPRECT lprcOutput, BOOL bLog)
{
! FLOAT viewWidth = lprcClient->right - lprcClient->left;
! FLOAT viewHeight = lprcClient->bottom - lprcClient->top;
! FLOAT sourceWidth = lprcSource->right - lprcSource->left;
! FLOAT sourceHeight = lprcSource->bottom - lprcSource->top;
FLOAT outputWidth, outputHeight;
--- 549,557 ----
void CXboxVideoRenderer::CalculateOutputRectangle(LPRECT lprcClient, LPRECT lprcSource, LPRECT lprcOutput, BOOL bLog)
{
! FLOAT viewWidth = (FLOAT)lprcClient->right - lprcClient->left;
! FLOAT viewHeight = (FLOAT)lprcClient->bottom - lprcClient->top;
! FLOAT sourceWidth = (FLOAT)lprcSource->right - lprcSource->left;
! FLOAT sourceHeight = (FLOAT)lprcSource->bottom - lprcSource->top;
FLOAT outputWidth, outputHeight;
***************
*** 561,565 ****
if (XGetVideoFlags() & XC_VIDEO_FLAGS_WIDESCREEN)
{
! aspectRatio -= WIDE_SCREEN_RATIO_COMPENSATION;
}
--- 561,565 ----
if (XGetVideoFlags() & XC_VIDEO_FLAGS_WIDESCREEN)
{
! aspectRatio -= (FLOAT)WIDE_SCREEN_RATIO_COMPENSATION;
}
***************
*** 590,598 ****
}
! lprcOutput->left = lprcClient->left + ((viewWidth - outputWidth)/2);
! lprcOutput->top = lprcClient->top + ((viewHeight - outputHeight)/2);
! lprcOutput->right = lprcOutput->left + outputWidth;
! lprcOutput->bottom = lprcOutput->top + outputHeight;
if (bLog)
--- 590,598 ----
}
! lprcOutput->left = (LONG)(lprcClient->left + ((viewWidth - outputWidth)/2));
! lprcOutput->top = (LONG)(lprcClient->top + ((viewHeight - outputHeight)/2));
! lprcOutput->right = (LONG)(lprcOutput->left + outputWidth);
! lprcOutput->bottom = (LONG)(lprcOutput->top + outputHeight);
if (bLog)
Index: XBoxMediaPlayer.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/XBoxMediaPlayer.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** XBoxMediaPlayer.cpp 2 Dec 2002 18:47:32 -0000 1.11
--- XBoxMediaPlayer.cpp 3 Dec 2002 17:47:05 -0000 1.12
***************
*** 417,422 ****
// Create Settings User Interface
! m_pUserInterfaces[IN_SETTINGS] = new CSettingsInterface();
! if( FAILED( m_pUserInterfaces[IN_SETTINGS]->Create( m_pd3dDevice, &m_fntManager, this ) ) )
{
OutputDebugString("Unable to create settings interface.\n");
--- 417,423 ----
// Create Settings User Interface
!
! m_pUserInterfaces[IN_SETTINGS] = new CSettingsInterface( m_pMediaPlayer );
! if( FAILED( m_pUserInterfaces[IN_SETTINGS]->Create( m_pd3dDevice, &m_fntManager, this) ) )
{
OutputDebugString("Unable to create settings interface.\n");
***************
*** 794,802 ****
-
-
if (dwCurrentAppState == IN_MOVIE)
{
CMovieInterface* pInterface=(CMovieInterface* )m_pUserInterfaces[m_appState];
if (!pInterface->IsControlPanelVisible())
{
--- 795,802 ----
if (dwCurrentAppState == IN_MOVIE)
{
CMovieInterface* pInterface=(CMovieInterface* )m_pUserInterfaces[m_appState];
+ // when control panel is not visible:
if (!pInterface->IsControlPanelVisible())
{
***************
*** 900,903 ****
--- 900,916 ----
}
}
+
+ // A button = back 2 normal speed
+ if( (m_DefaultGamepad.bPressedAnalogButtons[XINPUT_GAMEPAD_A]) ||
+ (m_DefaultIR_Remote.wPressedButtons== XINPUT_IR_REMOTE_PLAY) )
+ {
+ // back 2 normal play speed
+ if ( m_iFFSpeed )
+ {
+ m_iFFSpeed=-1;
+ OnFastForward();
+ return S_OK;
+ }
+ }
}
}
***************
*** 926,930 ****
Sleep(0);
! return S_OK;
}
--- 939,943 ----
Sleep(0);
! return S_OK;
}
***************
*** 1198,1202 ****
// send request
! ultoa(fileOffset,szOffset,10);
sprintf(cmd,"READ,%s,%u",szOffset,NETCACHE_PACKET_SIZE);
send(s,cmd,strlen(cmd),0);
--- 1211,1215 ----
// send request
! ultoa((unsigned long)fileOffset,szOffset,10);
sprintf(cmd,"READ,%s,%u",szOffset,NETCACHE_PACKET_SIZE);
send(s,cmd,strlen(cmd),0);
***************
*** 1369,1373 ****
if (m_iFFSpeed) m_pMediaPlayer->SetCurrentVolume(m_pMediaPlayer->GetMinimumVolume());
else m_pMediaPlayer->SetCurrentVolume(m_pMediaPlayer->GetMaximumVolume());
! m_player.SetPlaySpeed(m_iFFSpeed); // set FF speed
m_dwShowTime=timeGetTime();
m_dwShowFlags |= SHOW_FF;
--- 1382,1386 ----
if (m_iFFSpeed) m_pMediaPlayer->SetCurrentVolume(m_pMediaPlayer->GetMinimumVolume());
else m_pMediaPlayer->SetCurrentVolume(m_pMediaPlayer->GetMaximumVolume());
! m_player.SetPlaySpeed((float)m_iFFSpeed); // set FF speed
m_dwShowTime=timeGetTime();
m_dwShowFlags |= SHOW_FF;
***************
*** 1386,1390 ****
if (m_iFFSpeed) m_pMediaPlayer->SetCurrentVolume(m_pMediaPlayer->GetMinimumVolume());
else m_pMediaPlayer->SetCurrentVolume(m_pMediaPlayer->GetMaximumVolume());
! m_player.SetPlaySpeed(m_iFFSpeed); // set FF speed
m_dwShowTime=timeGetTime();
m_dwShowFlags |= SHOW_FF;
--- 1399,1403 ----
if (m_iFFSpeed) m_pMediaPlayer->SetCurrentVolume(m_pMediaPlayer->GetMinimumVolume());
else m_pMediaPlayer->SetCurrentVolume(m_pMediaPlayer->GetMaximumVolume());
! m_player.SetPlaySpeed((float)m_iFFSpeed); // set FF speed
m_dwShowTime=timeGetTime();
m_dwShowFlags |= SHOW_FF;
***************
*** 1501,1503 ****
m_iSelectedCount=0;
}
! }
--- 1514,1516 ----
m_iSelectedCount=0;
}
! }
\ No newline at end of file
Index: XBMediaPlayer.dsp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/XBMediaPlayer.dsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** XBMediaPlayer.dsp 2 Dec 2002 18:47:33 -0000 1.3
--- XBMediaPlayer.dsp 3 Dec 2002 17:47:05 -0000 1.4
***************
*** 105,112 ****
# Begin Source File
- SOURCE=.\ao_xbox.cpp
- # End Source File
- # Begin Source File
-
SOURCE=.\UI\ArtistInterface.cpp
# End Source File
--- 105,108 ----
***************
*** 121,124 ****
--- 117,124 ----
# Begin Source File
+ SOURCE=.\AudioStreamChangedCallback.cpp
+ # End Source File
+ # Begin Source File
+
SOURCE=.\UI\CalibrateInterface.cpp
# End Source File
***************
*** 213,220 ****
# Begin Source File
- SOURCE=.\Xbox\MediaPlayer.cpp
- # End Source File
- # Begin Source File
-
SOURCE=.\UI\MovieInterface.cpp
# End Source File
--- 213,216 ----
***************
*** 261,272 ****
# Begin Source File
- SOURCE=.\streaming.cpp
- # End Source File
- # Begin Source File
-
- SOURCE=.\mplayer\subreader.cpp
- # End Source File
- # Begin Source File
-
SOURCE=.\Thread.cpp
# End Source File
--- 257,260 ----
***************
*** 305,312 ****
# Begin Source File
- SOURCE=.\xbox_video.cpp
- # End Source File
- # Begin Source File
-
SOURCE=.\XBoxMediaPlayer.cpp
# End Source File
--- 293,296 ----
***************
*** 357,360 ****
--- 341,348 ----
# Begin Source File
+ SOURCE=.\AudioStreamChangedCallback.h
+ # End Source File
+ # Begin Source File
+
SOURCE=.\AVRenderer.h
# End Source File
***************
*** 469,472 ****
--- 457,468 ----
# Begin Source File
+ SOURCE=.\duo\Accelerations\MotionCompensation\MotionCompensation.h
+ # End Source File
+ # Begin Source File
+
+ SOURCE=.\duo\Accelerations\MotionCompensation\MotionCompensationPrivate.h
+ # End Source File
+ # Begin Source File
+
SOURCE=.\UI\MovieInterface.h
# End Source File
***************
*** 477,480 ****
--- 473,480 ----
# Begin Source File
+ SOURCE=.\duo\Accelerations\Idct\PermutedIdct\PermutedIdct.h
+ # End Source File
+ # Begin Source File
+
SOURCE=.\UI\PhotoInterface.h
# End Source File
***************
*** 513,516 ****
--- 513,520 ----
# Begin Source File
+ SOURCE=.\duo\Accelerations\Idct\StandardIdct\StandardIdct.h
+ # End Source File
+ # Begin Source File
+
SOURCE=.\streaming.h
# End Source File
***************
*** 621,624 ****
--- 625,632 ----
# Begin Source File
+ SOURCE=.\ao_xbox.cpp
+ # End Source File
+ # Begin Source File
+
SOURCE=.\mplayer\aspect.c
# End Source File
***************
*** 649,652 ****
--- 657,664 ----
# Begin Source File
+ SOURCE=.\Xbox\MediaPlayer.cpp
+ # End Source File
+ # Begin Source File
+
SOURCE=.\mplayer\osd.c
# End Source File
***************
*** 661,664 ****
--- 673,680 ----
# Begin Source File
+ SOURCE=.\streaming.cpp
+ # End Source File
+ # Begin Source File
+
SOURCE=.\mplayer\sub.c
# End Source File
***************
*** 669,672 ****
--- 685,692 ----
# Begin Source File
+ SOURCE=.\mplayer\subreader.cpp
+ # End Source File
+ # Begin Source File
+
SOURCE=.\mplayer\video_out.c
# End Source File
***************
*** 678,681 ****
--- 698,705 ----
SOURCE=.\mplayer\window.c
+ # End Source File
+ # Begin Source File
+
+ SOURCE=.\xbox_video.cpp
# End Source File
# End Group
Index: XBMediaPlayer.plg
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/XBMediaPlayer.plg,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** XBMediaPlayer.plg 2 Dec 2002 18:47:34 -0000 1.3
--- XBMediaPlayer.plg 3 Dec 2002 17:47:05 -0000 1.4
***************
*** 7,24 ****
</h3>
<h3>Command Lines</h3>
! Creating temporary file "D:\DOCUME~1\erwin\LOCALS~1\Temp\RSP732.tmp" with contents
[
/nologo /MT /W3 /Gm /GX /Zi /Od /I "D:\Program Files\Microsoft Xbox SDK\samples\xbox\common\include" /I ".." /D "WIN32" /D "_XBOX" /D "NDEBUG" /D "_NETWORKDEBUG" /D "_XDK" /Fp"Release/XBMediaPlayer.pch" /YX /Fo"Release/" /Fd"Release/" /FD /Ztmp /G6 /c
"D:\xbmp2\xbmp\player\UI\HomeInterface.cpp"
]
! Creating command line "cl.exe @D:\DOCUME~1\erwin\LOCALS~1\Temp\RSP732.tmp"
! Creating temporary file "D:\DOCUME~1\erwin\LOCALS~1\Temp\RSP733.tmp" with contents
[
xapilib.lib d3d8.lib d3dx8.lib xgraphics.lib dsound.lib dmusic.lib xboxkrnl.lib xonline.lib /nologo /incremental:no /pdb:"Release/XBMediaPlayer.pdb" /debug /machine:I386 /nodefaultlib:"libc" /out:"Release/XBMediaPlayer.exe" /subsystem:xbox /opt:ref /fixed:no /TMP
.\Release\AlbumInterface.obj
- .\Release\ao_xbox.obj
.\Release\ArtistInterface.obj
.\Release\AsyncDirectSound.obj
.\Release\AudioSettingsInterface.obj
.\Release\CalibrateInterface.obj
.\Release\Catalogue.obj
--- 7,41 ----
</h3>
<h3>Command Lines</h3>
! Creating temporary file "D:\DOCUME~1\erwin\LOCALS~1\Temp\RSP339.tmp" with contents
[
/nologo /MT /W3 /Gm /GX /Zi /Od /I "D:\Program Files\Microsoft Xbox SDK\samples\xbox\common\include" /I ".." /D "WIN32" /D "_XBOX" /D "NDEBUG" /D "_NETWORKDEBUG" /D "_XDK" /Fp"Release/XBMediaPlayer.pch" /YX /Fo"Release/" /Fd"Release/" /FD /Ztmp /G6 /c
+ "D:\xbmp2\xbmp\player\UI\AlbumInterface.cpp"
+ "D:\xbmp2\xbmp\player\UI\ArtistInterface.cpp"
+ "D:\xbmp2\xbmp\player\UI\AudioSettingsInterface.cpp"
+ "D:\xbmp2\xbmp\player\UI\CalibrateInterface.cpp"
+ "D:\xbmp2\xbmp\player\UI\CatalogueInterface.cpp"
+ "D:\xbmp2\xbmp\player\UI\ClipInterface.cpp"
+ "D:\xbmp2\xbmp\player\UI\GeneralSettingsInterface.cpp"
"D:\xbmp2\xbmp\player\UI\HomeInterface.cpp"
+ "D:\xbmp2\xbmp\player\UI\MovieInterface.cpp"
+ "D:\xbmp2\xbmp\player\UI\PhotoInterface.cpp"
+ "D:\xbmp2\xbmp\player\UI\RatioInterface.cpp"
+ "D:\xbmp2\xbmp\player\UI\ScreenInterface.cpp"
+ "D:\xbmp2\xbmp\player\UI\SettingsInterface.cpp"
+ "D:\xbmp2\xbmp\player\UI\SongsInterface.cpp"
+ "D:\xbmp2\xbmp\player\UI\UMusic.cpp"
+ "D:\xbmp2\xbmp\player\UI\UPictures.cpp"
+ "D:\xbmp2\xbmp\player\UI\UVideos.cpp"
+ "D:\xbmp2\xbmp\player\XBoxMediaPlayer.cpp"
]
! Creating command line "cl.exe @D:\DOCUME~1\erwin\LOCALS~1\Temp\RSP339.tmp"
! Creating temporary file "D:\DOCUME~1\erwin\LOCALS~1\Temp\RSP33A.tmp" with contents
[
xapilib.lib d3d8.lib d3dx8.lib xgraphics.lib dsound.lib dmusic.lib xboxkrnl.lib xonline.lib /nologo /incremental:no /pdb:"Release/XBMediaPlayer.pdb" /debug /machine:I386 /nodefaultlib:"libc" /out:"Release/XBMediaPlayer.exe" /subsystem:xbox /opt:ref /fixed:no /TMP
.\Release\AlbumInterface.obj
.\Release\ArtistInterface.obj
.\Release\AsyncDirectSound.obj
.\Release\AudioSettingsInterface.obj
+ .\Release\AudioStreamChangedCallback.obj
.\Release\CalibrateInterface.obj
.\Release\Catalogue.obj
***************
*** 44,48 ****
.\Release\LocalCatalogue.obj
.\Release\Main.obj
- .\Release\MediaPlayer.obj
.\Release\MovieInterface.obj
.\Release\MoviePlayer.obj
--- 61,64 ----
***************
*** 56,61 ****
.\Release\SingleLock.obj
.\Release\SongsInterface.obj
- .\Release\streaming.obj
- .\Release\subreader.obj
.\Release\Thread.obj
.\Release\UMusic.obj
--- 72,75 ----
***************
*** 67,71 ****
.\Release\XBInputEx.obj
.\Release\xbNet.obj
- .\Release\xbox_video.obj
.\Release\XBoxMediaPlayer.obj
.\Release\xbresource.obj
--- 81,84 ----
***************
*** 85,88 ****
--- 98,102 ----
.\Release\afmt.obj
.\Release\ao_plugin.obj
+ .\Release\ao_xbox.obj
.\Release\aspect.obj
.\Release\audio_out.obj
***************
*** 92,108 ****
.\Release\geometry.obj
.\Release\helper.obj
.\Release\osd.obj
.\Release\osd_template.obj
.\Release\spudec.obj
.\Release\sub.obj
.\Release\video_out.obj
.\Release\vo_null.obj
.\Release\window.obj
]
! Creating command line "link.exe @D:\DOCUME~1\erwin\LOCALS~1\Temp\RSP733.tmp"
Creating command line "imagebld.exe /nologo /testid:"0xFACE007" /testname:"Xbox Media Player" /stack:0x30000 /initflags:0x0 /out:"root\xbplayer.xbe" /limitmem /titleimage:"titleimage.xbx" /testmediatypes:0x80000007 .\Release\XBMediaPlayer.exe "
<h3>Output Window</h3>
Compiling...
HomeInterface.cpp
Linking...
Creating Xbox image...
--- 106,144 ----
.\Release\geometry.obj
.\Release\helper.obj
+ .\Release\MediaPlayer.obj
.\Release\osd.obj
.\Release\osd_template.obj
.\Release\spudec.obj
+ .\Release\streaming.obj
.\Release\sub.obj
+ .\Release\subreader.obj
.\Release\video_out.obj
.\Release\vo_null.obj
.\Release\window.obj
+ .\Release\xbox_video.obj
]
! Creating command line "link.exe @D:\DOCUME~1\erwin\LOCALS~1\Temp\RSP33A.tmp"
Creating command line "imagebld.exe /nologo /testid:"0xFACE007" /testname:"Xbox Media Player" /stack:0x30000 /initflags:0x0 /out:"root\xbplayer.xbe" /limitmem /titleimage:"titleimage.xbx" /testmediatypes:0x80000007 .\Release\XBMediaPlayer.exe "
<h3>Output Window</h3>
Compiling...
+ AlbumInterface.cpp
+ SettingsInterface.cpp
+ Skipping... (no relevant changes detected)
+ ArtistInterface.cpp
+ AudioSettingsInterface.cpp
+ CalibrateInterface.cpp
+ CatalogueInterface.cpp
+ ClipInterface.cpp
+ GeneralSettingsInterface.cpp
HomeInterface.cpp
+ MovieInterface.cpp
+ PhotoInterface.cpp
+ RatioInterface.cpp
+ ScreenInterface.cpp
+ SongsInterface.cpp
+ UMusic.cpp
+ UPictures.cpp
+ UVideos.cpp
+ XBoxMediaPlayer.cpp
Linking...
Creating Xbox image...
***************
*** 112,116 ****
Transferring file to Xbox...xe:\xbplayer\xbplayer.xbe
<h3>Output Window</h3>
! Creating temporary file "D:\DOCUME~1\erwin\LOCALS~1\Temp\RSP735.bat" with contents
[
@echo off
--- 148,152 ----
Transferring file to Xbox...xe:\xbplayer\xbplayer.xbe
<h3>Output Window</h3>
! Creating temporary file "D:\DOCUME~1\erwin\LOCALS~1\Temp\RSP33C.bat" with contents
[
@echo off
***************
*** 119,123 ****
rem del Root\xbplayer.bak
]
! Creating command line "D:\DOCUME~1\erwin\LOCALS~1\Temp\RSP735.bat"
Patching for retail XBox
--- 155,159 ----
rem del Root\xbplayer.bak
]
! Creating command line "D:\DOCUME~1\erwin\LOCALS~1\Temp\RSP33C.bat"
Patching for retail XBox
|
|
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;
|
|
From: <ya...@us...> - 2002-12-02 18:48:13
|
Update of /cvsroot/xbyamp/xbmp/player/mplayer
In directory sc8-pr-cvs1:/tmp/cvs-serv26575/player/mplayer
Modified Files:
af_dummy.c ao_plugin.c aspect.c audio_out.c demuxer.h
find_sub.c font_load.c mp_image.h spudec.c sub.c subreader.cpp
video_out.c vo_aa.c vo_md5.c vo_null.c vo_yuv4mpeg.c
libmpcodecs.lib libmpdemux.lib
Log Message:
fixed manual a/v sync correction
Index: af_dummy.c
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/mplayer/af_dummy.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** af_dummy.c 28 Nov 2002 21:47:32 -0000 1.1
--- af_dummy.c 2 Dec 2002 18:46:46 -0000 1.2
***************
*** 59,63 ****
// Do something necessary to get rid of annoying warning during compile
if(!af)
! printf("EEEK: Argument af == NULL in af_dummy.c play().");
return data;
}
--- 59,63 ----
// Do something necessary to get rid of annoying warning during compile
if(!af)
! mp_msg(0,0,"EEEK: Argument af == NULL in af_dummy.c play().");
return data;
}
Index: ao_plugin.c
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/mplayer/ao_plugin.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ao_plugin.c 28 Nov 2002 21:47:32 -0000 1.1
--- ao_plugin.c 2 Dec 2002 18:46:48 -0000 1.2
***************
*** 88,92 ****
cnt++;
}
! printf("[plugin]: Invalid plugin: %s \n",cfg);
return 0;
}
--- 88,92 ----
cnt++;
}
! mp_msg(0,0,"[plugin]: Invalid plugin: %s \n",cfg);
return 0;
}
***************
*** 105,109 ****
cnt++;
}
! printf("[plugin]: Invalid plugin: %s \n",cfg);
return 0;
}
--- 105,109 ----
cnt++;
}
! mp_msg(0,0,"[plugin]: Invalid plugin: %s \n",cfg);
return 0;
}
Index: aspect.c
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/mplayer/aspect.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** aspect.c 28 Nov 2002 21:47:32 -0000 1.1
--- aspect.c 2 Dec 2002 18:46:48 -0000 1.2
***************
*** 65,70 ****
#ifdef ASPECT_DEBUG
! printf("aspect(0) fitin: %dx%d zoom: %d \n",aspdat.scrw,aspdat.scrh,zoom);
! printf("aspect(1) wh: %dx%d (org: %dx%d)\n",*srcw,*srch,aspdat.prew,aspdat.preh);
#endif
if(zoom){
--- 65,70 ----
#ifdef ASPECT_DEBUG
! mp_msg(0,0,"aspect(0) fitin: %dx%d zoom: %d \n",aspdat.scrw,aspdat.scrh,zoom);
! mp_msg(0,0,"aspect(1) wh: %dx%d (org: %dx%d)\n",*srcw,*srch,aspdat.prew,aspdat.preh);
#endif
if(zoom){
***************
*** 79,83 ****
*srch+= *srch%2; // round
#ifdef ASPECT_DEBUG
! printf("aspect(2) wh: %dx%d (org: %dx%d)\n",*srcw,*srch,aspdat.prew,aspdat.preh);
#endif
if(*srch>aspdat.scrh || *srch<aspdat.orgh){
--- 79,83 ----
*srch+= *srch%2; // round
#ifdef ASPECT_DEBUG
! mp_msg(0,0,"aspect(2) wh: %dx%d (org: %dx%d)\n",*srcw,*srch,aspdat.prew,aspdat.preh);
#endif
if(*srch>aspdat.scrh || *srch<aspdat.orgh){
***************
*** 96,100 ****
mp_msg(MSGT_VO,MSGL_WARN,"aspect: Warning: no suitable new res found!\n");
#else
! printf("error: no new size found that fits into res!\n");
#endif
}
--- 96,100 ----
mp_msg(MSGT_VO,MSGL_WARN,"aspect: Warning: no suitable new res found!\n");
#else
! mp_msg(0,0,"error: no new size found that fits into res!\n");
#endif
}
***************
*** 102,106 ****
aspdat.asp=*srcw / (float)*srch;
#ifdef ASPECT_DEBUG
! printf("aspect(3) wh: %dx%d (org: %dx%d)\n",*srcw,*srch,aspdat.prew,aspdat.preh);
#endif
}
--- 102,106 ----
aspdat.asp=*srcw / (float)*srch;
#ifdef ASPECT_DEBUG
! mp_msg(0,0,"aspect(3) wh: %dx%d (org: %dx%d)\n",*srcw,*srch,aspdat.prew,aspdat.preh);
#endif
}
Index: audio_out.c
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/mplayer/audio_out.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** audio_out.c 28 Nov 2002 21:47:32 -0000 1.1
--- audio_out.c 2 Dec 2002 18:46:49 -0000 1.2
***************
*** 64,70 ****
{
const ao_info_t *info = audio_out_drivers[i++]->info;
! printf("\t%s\t%s\n", info->short_name, info->name);
}
! printf("\n");
}
--- 64,70 ----
{
const ao_info_t *info = audio_out_drivers[i++]->info;
! mp_msg(0,0,"\t%s\t%s\n", info->short_name, info->name);
}
! mp_msg(0,0,"\n");
}
Index: demuxer.h
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/mplayer/demuxer.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** demuxer.h 2 Dec 2002 17:01:23 -0000 1.2
--- demuxer.h 2 Dec 2002 18:46:52 -0000 1.3
***************
*** 194,202 ****
if(ds->buffer_pos>=ds->buffer_size){
if(!ds_fill_buffer(ds)){
! // printf("DEMUX_GETC: EOF reached!\n");
return -1; // EOF
}
}
! // printf("[%02X]",ds->buffer[ds->buffer_pos]);
return ds->buffer[ds->buffer_pos++];
}
--- 194,202 ----
if(ds->buffer_pos>=ds->buffer_size){
if(!ds_fill_buffer(ds)){
! // mp_msg(0,0,"DEMUX_GETC: EOF reached!\n");
return -1; // EOF
}
}
! // mp_msg(0,0,"[%02X]",ds->buffer[ds->buffer_pos]);
return ds->buffer[ds->buffer_pos++];
}
Index: find_sub.c
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/mplayer/find_sub.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** find_sub.c 28 Nov 2002 21:47:32 -0000 1.1
--- find_sub.c 2 Dec 2002 18:46:52 -0000 1.2
***************
*** 59,63 ****
}
! // printf("\r---- sub changed ----\n");
// check next sub.
--- 59,63 ----
}
! // mp_msg(0,0,"\r---- sub changed ----\n");
// check next sub.
***************
*** 79,83 ****
}
! // printf("\r---- sub log search... ----\n");
// use logarithmic search:
--- 79,83 ----
}
! // mp_msg(0,0,"\r---- sub log search... ----\n");
// use logarithmic search:
***************
*** 85,89 ****
i=0;
j=sub_num-1;
! // printf("Searching %d in %d..%d\n",key,subtitles[i].start,subtitles[j].end);
while(j>=i)
{
--- 85,89 ----
i=0;
j=sub_num-1;
! // mp_msg(0,0,"Searching %d in %d..%d\n",key,subtitles[i].start,subtitles[j].end);
while(j>=i)
{
***************
*** 108,112 ****
nosub_range_start=key-1; // tricky
nosub_range_end=vo_sub->start;
! // printf("FIRST... key=%d end=%d \n",key,vo_sub->start);
vo_sub=NULL;
return;
--- 108,112 ----
nosub_range_start=key-1; // tricky
nosub_range_end=vo_sub->start;
! // mp_msg(0,0,"FIRST... key=%d end=%d \n",key,vo_sub->start);
vo_sub=NULL;
return;
***************
*** 118,122 ****
nosub_range_start=subtitles[current_sub].end;
nosub_range_end=subtitles[current_sub+1].start;
! // printf("No sub... 1 \n");
vo_sub=NULL;
return;
--- 118,122 ----
nosub_range_start=subtitles[current_sub].end;
nosub_range_end=subtitles[current_sub+1].start;
! // mp_msg(0,0,"No sub... 1 \n");
vo_sub=NULL;
return;
***************
*** 134,138 ****
nosub_range_start=vo_sub->end;
nosub_range_end=0x7FFFFFFF; // MAXINT
! // printf("END!?\n");
vo_sub=NULL;
return;
--- 134,138 ----
nosub_range_start=vo_sub->end;
nosub_range_end=0x7FFFFFFF; // MAXINT
! // mp_msg(0,0,"END!?\n");
vo_sub=NULL;
return;
***************
*** 144,148 ****
nosub_range_start=subtitles[current_sub].end;
nosub_range_end=subtitles[current_sub+1].start;
! // printf("No sub... 2 \n");
vo_sub=NULL;
return;
--- 144,148 ----
nosub_range_start=subtitles[current_sub].end;
nosub_range_end=subtitles[current_sub+1].start;
! // mp_msg(0,0,"No sub... 2 \n");
vo_sub=NULL;
return;
Index: font_load.c
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/mplayer/font_load.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** font_load.c 28 Nov 2002 21:47:32 -0000 1.1
--- font_load.c 2 Dec 2002 18:46:52 -0000 1.2
***************
*** 38,42 ****
if(raw->c>256)
return NULL; // too many colors!?
! //if(verbose) printf("RAW: %s %d x %d, %d colors\n",name,raw->w,raw->h,raw->c);
if(raw->c)
{
--- 38,42 ----
if(raw->c>256)
return NULL; // too many colors!?
! //if(verbose) mp_msg(0,0,"RAW: %s %d x %d, %d colors\n",name,raw->w,raw->h,raw->c);
if(raw->c)
{
***************
*** 166,171 ****
*d=0;
! // printf("params=%d sor=%s\n",pdb,sor);
! // for(i=0;i<pdb;i++) printf(" param %d = '%s'\n",i,p[i]);
if(pdb==1 && p[0][0]=='[')
--- 166,171 ----
*d=0;
! // mp_msg(0,0,"params=%d sor=%s\n",pdb,sor);
! // for(i=0;i<pdb;i++) mp_msg(0,0," param %d = '%s'\n",i,p[i]);
if(pdb==1 && p[0][0]=='[')
***************
*** 298,302 ****
desc->width[chr]=end-start+1;
desc->font[chr]=fontdb;
! // printf("char %d '%c' start=%d width=%d\n",chr,chr,desc->start[chr],desc->width[chr]);
++chardb;
}
--- 298,302 ----
desc->width[chr]=end-start+1;
desc->font[chr]=fontdb;
! // mp_msg(0,0,"char %d '%c' start=%d width=%d\n",chr,chr,desc->start[chr],desc->width[chr]);
++chardb;
}
***************
*** 309,313 ****
fclose(f);
! //printf("font: pos of U = %d\n",desc->start[218]);
for(i=0;i<=fontdb;i++)
--- 309,313 ----
fclose(f);
! //mp_msg(0,0,"font: pos of U = %d\n",desc->start[218]);
for(i=0;i<=fontdb;i++)
Index: mp_image.h
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/mplayer/mp_image.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mp_image.h 28 Nov 2002 21:47:32 -0000 1.1
--- mp_image.h 2 Dec 2002 18:46:56 -0000 1.2
***************
*** 180,184 ****
return;
}
! // printf("mp_image: Unknown out_fmt: 0x%X\n",out_fmt);
mpi->bpp=0;
}
--- 180,184 ----
return;
}
! // USE_SVQ1"mp_image: Unknown out_fmt: 0x%X\n",out_fmt);
mpi->bpp=0;
}
Index: spudec.c
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/mplayer/spudec.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** spudec.c 28 Nov 2002 21:47:32 -0000 1.1
--- spudec.c 2 Dec 2002 18:46:56 -0000 1.2
***************
*** 151,155 ****
first_y = fy / this->stride;
last_y = ly / this->stride;
! //printf("first_y: %d, last_y: %d\n", first_y, last_y);
this->start_row += first_y;
--- 151,155 ----
first_y = fy / this->stride;
last_y = ly / this->stride;
! //mp_msg(0,0,"first_y: %d, last_y: %d\n", first_y, last_y);
this->start_row += first_y;
***************
*** 161,165 ****
}
! //printf("new h %d new start %d (sz %d st %d)---\n\n", this->height, this->start_row, this->image_size, this->stride);
image = malloc(2 * this->stride * this->height);
--- 161,165 ----
}
! //mp_msg(0,0,"new h %d new start %d (sz %d st %d)---\n\n", this->height, this->start_row, this->image_size, this->stride);
image = malloc(2 * this->stride * this->height);
***************
*** 512,516 ****
spudec_handle_t *spu = (spudec_handle_t *)this;
int ret=(spu->start_pts <= spu->now_pts && spu->now_pts < spu->end_pts);
! // printf("spu visible: %d \n",ret);
return ret;
}
--- 512,516 ----
spudec_handle_t *spu = (spudec_handle_t *)this;
int ret=(spu->start_pts <= spu->now_pts && spu->now_pts < spu->end_pts);
! // mp_msg(0,0,"spu visible: %d \n",ret);
return ret;
}
Index: sub.c
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/mplayer/sub.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sub.c 28 Nov 2002 21:47:32 -0000 1.1
--- sub.c 2 Dec 2002 18:46:57 -0000 1.2
***************
*** 256,260 ****
! // printf("osd.progbar width=%d xpos=%d\n",width,x);
c=vo_osd_progbar_type;
--- 256,260 ----
! // mp_msg(0,0,"osd.progbar width=%d xpos=%d\n",width,x);
c=vo_osd_progbar_type;
***************
*** 369,373 ****
len=strlen(t)-1;
! // printf("sub(%d) '%s'\n",len,t);
// if(len<0) memy -=h; // according to max of vo_font->pic_a[font]->h
// else
--- 369,373 ----
len=strlen(t)-1;
! // mp_msg(0,0,"sub(%d) '%s'\n",len,t);
// if(len<0) memy -=h; // according to max of vo_font->pic_a[font]->h
// else
***************
*** 460,464 ****
h=vo_font->height;
}
! // printf("h: %d -> %d \n",vo_font->height,h);
obj->y -=h; // according to max of vo_font->pic_a[font]->h
prevc = -1;
--- 460,464 ----
h=vo_font->height;
}
! // mp_msg(0,0,"h: %d -> %d \n",vo_font->height,h);
obj->y -=h; // according to max of vo_font->pic_a[font]->h
prevc = -1;
Index: subreader.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/mplayer/subreader.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** subreader.cpp 28 Nov 2002 21:47:32 -0000 1.1
--- subreader.cpp 2 Dec 2002 18:46:57 -0000 1.2
***************
*** 224,228 ****
char *p=source;
! // printf("src=%p dest=%p \n",source,dest);
while ( !eol(*p) && *p!= '|' )
--- 224,228 ----
char *p=source;
! // mp_msg(0,0,"src=%p dest=%p \n",source,dest);
while ( !eol(*p) && *p!= '|' )
***************
*** 465,469 ****
}
if (p==NULL) {
! printf("SUB: Skipping incorrect subtitle line!\n");
continue;
}
--- 465,469 ----
}
if (p==NULL) {
! mp_msg(0,0,"SUB: Skipping incorrect subtitle line!\n");
continue;
}
***************
*** 688,692 ****
{
current->text[num]=strdup(p);
! // printf (">%s<\n",p);
current->lines = ++num;
}
--- 688,692 ----
{
current->text[num]=strdup(p);
! // mp_msg(0,0,">%s<\n",p);
current->lines = ++num;
}
***************
*** 1357,1361 ****
#endif
! // printf ("SUB: Subtitle format %s time.\n", sub_uses_time?"uses":"doesn't use");
mp_msg(MSGT_SUBREADER,MSGL_INFO,"SUB: Read %i subtitles", sub_num);
if (sub_errs)
--- 1357,1361 ----
#endif
! // mp_msg(0,0,"SUB: Subtitle format %s time.\n", sub_uses_time?"uses":"doesn't use");
mp_msg(MSGT_SUBREADER,MSGL_INFO,"SUB: Read %i subtitles", sub_num);
if (sub_errs)
***************
*** 1560,1564 ****
#endif
strcpy(j?aviptr1:aviptr2,sub_exts[i]);
! // printf("trying: '%s'\n",sub_name);
if((f=fopen( sub_name,"rt" )))
{
--- 1560,1564 ----
#endif
strcpy(j?aviptr1:aviptr2,sub_exts[i]);
! // mp_msg(0,0,"trying: '%s'\n",sub_name);
if((f=fopen( sub_name,"rt" )))
{
***************
*** 1584,1588 ****
{
subtitle* egysub=&subs[j];
! printf ("%i line%c (%li-%li) ",
egysub->lines,
(1==egysub->lines)?' ':'s',
--- 1584,1588 ----
{
subtitle* egysub=&subs[j];
! mp_msg(0,0,"%i line%c (%li-%li) ",
egysub->lines,
(1==egysub->lines)?' ':'s',
***************
*** 1591,1601 ****
for (i=0; i<egysub->lines; i++)
{
! printf ("%s%s",egysub->text[i], i==egysub->lines-1?"":" <BREAK> ");
}
! printf ("\n");
}
! printf ("Subtitle format %s time.\n", sub_uses_time?"uses":"doesn't use");
! printf ("Read %i subtitles, %i errors.\n", sub_num, sub_errs);
}
--- 1591,1601 ----
for (i=0; i<egysub->lines; i++)
{
! mp_msg(0,0,"%s%s",egysub->text[i], i==egysub->lines-1?"":" <BREAK> ");
}
! mp_msg(0,0,"\n");
}
! mp_msg(0,0,"Subtitle format %s time.\n", sub_uses_time?"uses":"doesn't use");
! mp_msg(0,0,"Read %i subtitles, %i errors.\n", sub_num, sub_errs);
}
***************
*** 1777,1781 ****
if(argc<2)
{
! printf("\nUsage: subreader filename.sub\n\n");
exit(1);
}
--- 1777,1781 ----
if(argc<2)
{
! mp_msg(0,0,"\nUsage: subreader filename.sub\n\n");
exit(1);
}
***************
*** 1784,1788 ****
if(!subs)
{
! printf("Couldn't load file.\n");
exit(1);
}
--- 1784,1788 ----
if(!subs)
{
! mp_msg(0,0,"Couldn't load file.\n");
exit(1);
}
Index: video_out.c
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/mplayer/video_out.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** video_out.c 28 Nov 2002 21:47:32 -0000 1.1
--- video_out.c 2 Dec 2002 18:46:58 -0000 1.2
***************
*** 201,207 ****
while (video_out_drivers[i]) {
const vo_info_t *info = video_out_drivers[i++]->get_info ();
! printf("\t%s\t%s\n", info->short_name, info->name);
}
! printf("\n");
}
--- 201,207 ----
while (video_out_drivers[i]) {
const vo_info_t *info = video_out_drivers[i++]->get_info ();
! mp_msg(0,0,"\t%s\t%s\n", info->short_name, info->name);
}
! mp_msg(0,0,"\n");
}
***************
*** 280,284 ****
goto out_err;
if (!(r = (range_t *) realloc(r, sizeof(*r) * (i + 2)))) {
! printf("can't realloc 'r'\n");
return NULL;
}
--- 280,284 ----
goto out_err;
if (!(r = (range_t *) realloc(r, sizeof(*r) * (i + 2)))) {
! mp_msg(0,0,"can't realloc 'r'\n");
return NULL;
}
Index: vo_aa.c
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/mplayer/vo_aa.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** vo_aa.c 28 Nov 2002 21:47:32 -0000 1.1
--- vo_aa.c 2 Dec 2002 18:47:00 -0000 1.2
***************
*** 694,710 ****
else if (!strcasecmp(opt, "aahelp"))
{
! printf("Here are the aalib options:\n");
help=strdup(aa_help); /* aa_help is const :( */
x=strtok(help,"-");
! printf(x);
while ((x=strtok(NULL, "-")))
{
if (*(x-2)==' ')
! printf("-aa");
else
! printf("-");
! printf("%s", x);
}
! printf(
"\n"
"\n"
--- 694,710 ----
else if (!strcasecmp(opt, "aahelp"))
{
! mp_msg(0,0,"Here are the aalib options:\n");
help=strdup(aa_help); /* aa_help is const :( */
x=strtok(help,"-");
! mp_msg(0,0,x);
while ((x=strtok(NULL, "-")))
{
if (*(x-2)==' ')
! mp_msg(0,0,"-aa");
else
! mp_msg(0,0,"-");
! mp_msg(0,0,"%s", x);
}
! mp_msg(0,0,
"\n"
"\n"
***************
*** 842,846 ****
m_config_set_flag(mconfig,"quiet",0); /* disable mplayer outputs */
/* disable console blanking */
! printf("\033[9;0]");
}
--- 842,846 ----
m_config_set_flag(mconfig,"quiet",0); /* disable mplayer outputs */
/* disable console blanking */
! mp_msg(0,0,"\033[9;0]");
}
Index: vo_md5.c
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/mplayer/vo_md5.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** vo_md5.c 28 Nov 2002 21:47:32 -0000 1.1
--- vo_md5.c 2 Dec 2002 18:47:01 -0000 1.2
***************
*** 115,119 ****
if(arg)
{
! printf("vo_md5: Unknown subdevice: %s\n",arg);
return -1;
}
--- 115,119 ----
if(arg)
{
! mp_msg(0,0,"vo_md5: Unknown subdevice: %s\n",arg);
return -1;
}
Index: vo_null.c
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/mplayer/vo_null.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** vo_null.c 28 Nov 2002 21:47:32 -0000 1.1
--- vo_null.c 2 Dec 2002 18:47:01 -0000 1.2
***************
*** 109,113 ****
if(arg)
{
! printf("vo_null: Unknown subdevice: %s\n",arg);
return -1;
}
--- 109,113 ----
if(arg)
{
! mp_msg(0,0,"vo_null: Unknown subdevice: %s\n",arg);
return -1;
}
Index: vo_yuv4mpeg.c
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/mplayer/vo_yuv4mpeg.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** vo_yuv4mpeg.c 28 Nov 2002 21:47:32 -0000 1.1
--- vo_yuv4mpeg.c 2 Dec 2002 18:47:01 -0000 1.2
***************
*** 100,104 ****
if (using_format == IMGFMT_YV12)
! printf("yuv4mpeg: WARNING: Input not RGB; Can't seperate chrominance by fields!\n");
}
--- 100,104 ----
if (using_format == IMGFMT_YV12)
! mp_msg(0,0,"yuv4mpeg: WARNING: Input not RGB; Can't seperate chrominance by fields!\n");
}
***************
*** 439,443 ****
if (arg_unrecognized == 2)
{
! printf("vo_yuv4mpeg: Unknown subdevice: %s\n", arg);
return -1;
}
--- 439,443 ----
if (arg_unrecognized == 2)
{
! mp_msg(0,0,"vo_yuv4mpeg: Unknown subdevice: %s\n", arg);
return -1;
}
***************
*** 448,458 ****
{
case Y4M_ILACE_TOP_FIRST:
! printf("vo_yuv4mpeg: Interlaced output mode, top-field first\n");
break;
case Y4M_ILACE_BOTTOM_FIRST:
! printf("vo_yuv4mpeg: Interlaced output mode, bottom-field first\n");
break;
default:
! printf("vo_yuv4mpeg: Using (default) progressive frame mode\n");
break;
}
--- 448,458 ----
{
case Y4M_ILACE_TOP_FIRST:
! mp_msg(0,0,"vo_yuv4mpeg: Interlaced output mode, top-field first\n");
break;
case Y4M_ILACE_BOTTOM_FIRST:
! mp_msg(0,0,"vo_yuv4mpeg: Interlaced output mode, bottom-field first\n");
break;
default:
! mp_msg(0,0,"vo_yuv4mpeg: Using (default) progressive frame mode\n");
break;
}
Index: libmpcodecs.lib
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/mplayer/libmpcodecs.lib,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
Binary files /tmp/cvsI793KE and /tmp/cvsKUe7hx differ
Index: libmpdemux.lib
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/mplayer/libmpdemux.lib,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
Binary files /tmp/cvsJY9fLj and /tmp/cvsQaBohz differ
|
1 message has been excluded from this view by a project administrator.
