[Xbyamp-cvs] xbmp/player AVRenderer.h,1.1,1.2 buildtime.h,1.4,1.5 FileRelax.cpp,1.1,1.2 MediaPlayer.
Status: Pre-Alpha
Brought to you by:
yamp
Menu
▾
▴
[Xbyamp-cvs] xbmp/player AVRenderer.h,1.1,1.2 buildtime.h,1.4,1.5 FileRelax.cpp,1.1,1.2 MediaPlayer.h,1.1,1.2 MoviePlayer.cpp,1.13,1.14 MoviePlayer.h,1.3,1.4 xbox_video.cpp,1.8,1.9 XBoxMediaPlayer.cpp,1.11,1.12 XBMediaPlayer.dsp,1.3,1.4 XBMediaPlayer.plg,1.3,1.4
|
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
|
