Menu
▾
▴
xbplayer-cvs — XboxMediaPlayer CVS Updates Mailing List
You can subscribe to this list here.
| 2003 |
Jan
(466) |
Feb
(545) |
Mar
(314) |
Apr
(96) |
May
(138) |
Jun
(134) |
Jul
(49) |
Aug
(71) |
Sep
(27) |
Oct
(76) |
Nov
(26) |
Dec
(24) |
|---|
|
From: <mon...@us...> - 2003-12-13 03:40:57
|
Update of /cvsroot/xbplayer/XBMP/mplayerlibs/libaf
In directory sc8-pr-cvs1:/tmp/cvs-serv12637/mplayerlibs/libaf
Modified Files:
afmt.c
Log Message:
AC3 passthrough, No DTS yet, menu settings works now
Index: afmt.c
===================================================================
RCS file: /cvsroot/xbplayer/XBMP/mplayerlibs/libaf/afmt.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** afmt.c 4 Feb 2003 11:40:23 -0000 1.1
--- afmt.c 13 Dec 2003 03:40:54 -0000 1.2
***************
*** 62,65 ****
--- 62,66 ----
case AFMT_U16_LE:
case AFMT_U16_BE:
+ case AFMT_AC3:
return 16;//16 bits
***************
*** 85,89 ****
case AFMT_U8:
case AFMT_MPEG:
! case AFMT_AC3:
default:
return 8;//default 1 byte
--- 86,90 ----
case AFMT_U8:
case AFMT_MPEG:
! // case AFMT_AC3:
default:
return 8;//default 1 byte
|
|
From: <mon...@us...> - 2003-12-13 03:40:06
|
Update of /cvsroot/xbplayer/XBMP/mplayerlibs/libmpcodecs
In directory sc8-pr-cvs1:/tmp/cvs-serv12528/mplayerlibs/libmpcodecs
Modified Files:
ad_liba52.c
Log Message:
AC3 passthrough, No DTS yet, menu settings works now
Index: ad_liba52.c
===================================================================
RCS file: /cvsroot/xbplayer/XBMP/mplayerlibs/libmpcodecs/ad_liba52.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ad_liba52.c 19 Oct 2003 16:04:18 -0000 1.8
--- ad_liba52.c 13 Dec 2003 03:40:03 -0000 1.9
***************
*** 16,20 ****
#include "../bswap.h"
-
#include "../config.h"
#ifdef USE_LIBA52
--- 16,19 ----
***************
*** 41,45 ****
static ad_info_t info =
{
! "AC3 decoding with liba52",
"liba52",
"Nick Kurshev",
--- 40,44 ----
static ad_info_t info =
{
! "AC3/liba52 with auto SPDIF passthrough",
"liba52",
"Nick Kurshev",
***************
*** 51,54 ****
--- 50,54 ----
extern int audio_output_channels;
+ extern int getAc3PassthruSettings(void);
int a52_fillbuff(sh_audio_t *sh_audio)
***************
*** 155,159 ****
/* Dolby AC3 audio: */
/* however many channels, 2 bytes in a word, 256 samples in a block, 6 blocks in a frame */
! sh->audio_out_minsize=audio_output_channels*2*256*6;
sh->audio_in_minsize=3840;
return 1;
--- 155,159 ----
/* Dolby AC3 audio: */
/* however many channels, 2 bytes in a word, 256 samples in a block, 6 blocks in a frame */
! //sh->audio_out_minsize=audio_output_channels*2*256*6; move to init function
sh->audio_in_minsize=3840;
return 1;
***************
*** 185,193 ****
a52_printinfo(sh_audio);
sh_audio->channels=audio_output_channels;
// delete code that try to work back AC3 format from channel numbers,
//lost infomation
-
while(sh_audio->channels>0)
--- 185,205 ----
a52_printinfo(sh_audio);
+
+ if ( (getAc3PassthruSettings()==1) && (sh_audio->samplerate == 48000) )
+ {
+ sh_audio->channels =2;
+ sh_audio->samplesize=2;
+ sh_audio->audio_out_minsize=4*256*6;
+ sh_audio->sample_format=AFMT_AC3;
+ mp_msg(MSGT_DECAUDIO,MSGL_INFO,"AC3 auto passthrough selected\n");
+ return 1;
+ }
+ else
+ {
+
sh_audio->channels=audio_output_channels;
// delete code that try to work back AC3 format from channel numbers,
//lost infomation
while(sh_audio->channels>0)
***************
*** 213,217 ****
--- 225,231 ----
return 0;
}
+ sh_audio->audio_out_minsize=sh_audio->channels*2*256*6;
return 1;
+ }
}
***************
*** 238,247 ****
sample_t level=1, bias=384;
int flags=a52_flags|A52_ADJUST_LEVEL;
! int i,len=-1;
! if(!sh_audio->a_in_buffer_len)
! if(a52_fillbuff(sh_audio)<0)
return len; /* EOF */
sh_audio->a_in_buffer_len=0;
! if (a52_frame (a52_state, sh_audio->a_in_buffer, &flags, &level, bias))
{
mp_msg(MSGT_DECAUDIO,MSGL_ERR,"a52: error decoding frame\n");
--- 252,287 ----
sample_t level=1, bias=384;
int flags=a52_flags|A52_ADJUST_LEVEL;
! int i;
! int len=sh_audio->a_in_buffer_len;
! if(len<=0)
! if((len=a52_fillbuff(sh_audio))<=0)
return len; /* EOF */
sh_audio->a_in_buffer_len=0;
!
! if ( (getAc3PassthruSettings()==1) && (sh_audio->samplerate == 48000) )
! {
! // int ac3_iec958_build_burst(int length, int data_type, int big_endian, unsigned char * data, unsigned char * out)
! // len = ac3_iec958_build_burst(len, 0x01, 1, sh_audio->a_in_buffer, buf);
!
! buf[0] = 0x72;
! buf[1] = 0xF8;
! buf[2] = 0x1F;
! buf[3] = 0x4E;
! buf[4] = 0x01; //(length) ? data_type : 0; /* & 0x1F; */
! buf[5] = 0x00;
! buf[6] = (len << 3) & 0xFF;
! buf[7] = (len >> 5) & 0xFF;
! swab(sh_audio->a_in_buffer, buf + 8, len);
! //memcpy(buf + 8, sh_audio->a_in_buffer, len);
! memset(buf + 8 + len, 0, 6144 - 8 - len);
!
! sh_audio->channels = 2;
!
! return 6144;
! }
! else
! {
!
! if (a52_frame (a52_state, sh_audio->a_in_buffer, &flags, &level, bias))
{
mp_msg(MSGT_DECAUDIO,MSGL_ERR,"a52: error decoding frame\n");
***************
*** 262,265 ****
--- 302,306 ----
}
return len;
+ }
}
#endif
|
|
From: <mon...@us...> - 2003-12-13 03:39:17
|
Update of /cvsroot/xbplayer/XBMP/xbox In directory sc8-pr-cvs1:/tmp/cvs-serv12414/xbox Modified Files: MediaPlayer.cpp Log Message: AC3 passthrough, No DTS yet, menu settings works now Index: MediaPlayer.cpp =================================================================== RCS file: /cvsroot/xbplayer/XBMP/xbox/MediaPlayer.cpp,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** MediaPlayer.cpp 23 Sep 2003 07:24:04 -0000 1.39 --- MediaPlayer.cpp 13 Dec 2003 03:39:14 -0000 1.40 *************** *** 4,8 **** #include "MediaPlayer.h" ! #include "../AsyncDirectSound.h" #include "debugclient.h" #include "../UI/configuration.h" --- 4,8 ---- #include "MediaPlayer.h" ! #include "../IDirectSoundRenderer.h" #include "debugclient.h" #include "../UI/configuration.h" *************** *** 19,23 **** ////////////////////////////////////////////////////////////////////// extern CXboxVideoRenderer* m_pVideoRenderer; ! extern CASyncDirectSound* m_pAudioDecoder; extern CConfiguration::PlayerSettings g_playerSettings; CAudioStreamChangedCallback* callback ; --- 19,23 ---- ////////////////////////////////////////////////////////////////////// extern CXboxVideoRenderer* m_pVideoRenderer; ! extern IDirectSoundRenderer * m_pAudioDecoder; extern CConfiguration::PlayerSettings g_playerSettings; CAudioStreamChangedCallback* callback ; |
Update of /cvsroot/xbplayer/XBMP
In directory sc8-pr-cvs1:/tmp/cvs-serv12147
Modified Files:
AsyncDirectSound.h XBMediaPlayer.vcproj ao_xbox.cpp
Added Files:
Ac97DirectSound.cpp Ac97DirectSound.h IDirectSoundRenderer.h
Log Message:
AC3 passthrough, No DTS yet, menu settings works now
--- NEW FILE: Ac97DirectSound.cpp ---
/*
* XBoxMediaPlayer
* Copyright (c) 2002 d7o3g4q and RUNTiME
* Portions Copyright (c) by the authors of ffmpeg and xvid
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifdef _XBOX
#include <xtl.h>
#else
#include <windows.h>
#endif
#include <stdio.h>
#include "Ac97DirectSound.h"
//#include "../../settings.h"
#include "../../mplayerlibs/mp_msg.h"
#define VOLUME_MIN -6000
#define VOLUME_MAX DSBVOLUME_MAX
#define CALC_DELAY_START 0
#define CALC_DELAY_STARTED 1
#define CALC_DELAY_DONE 2
//***********************************************************************************************
void CALLBACK CAc97DirectSound::StaticStreamCallback(LPVOID pStreamContext, LPVOID pPacketContext, DWORD dwStatus)
{
CAc97DirectSound* This = (CAc97DirectSound*) pStreamContext;
This->StreamCallback(pPacketContext, dwStatus);
}
//***********************************************************************************************
void CAc97DirectSound::StreamCallback(LPVOID pPacketContext, DWORD dwStatus)
{
}
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
//////////////////////////////////////////////////////////////////////
//***********************************************************************************************
CAc97DirectSound::CAc97DirectSound(IAudioCallback* pCallback,int iChannels, unsigned int uiSamplesPerSec, unsigned int uiBitsPerSample)
{
m_pCallback=pCallback;
m_dwPacketSize = 1152 * (uiBitsPerSample/8) * iChannels;
m_bPause = false;
m_bIsAllocated = false;
m_pDSound = NULL;
m_adwStatus = NULL;
ZeroMemory(m_pbSampleData,sizeof(m_pbSampleData));
ZeroMemory(&m_wfx,sizeof(m_wfx));
m_wfx.cbSize=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 / ((uiBitsPerSample/8) * m_wfx.nChannels) )) / 2);
for (DWORD dwX=0; dwX < m_dwNumPackets ; dwX++)
m_pbSampleData[dwX] = (BYTE*)XPhysicalAlloc( m_dwPacketSize, MAXULONG_PTR,0,PAGE_READWRITE|PAGE_NOCACHE);
m_adwStatus = new DWORD[ m_dwNumPackets ];
HRESULT hr;
#if 0
// Create DirectSound
hr= DirectSoundCreate( NULL, &m_pDSound, NULL ) ;
if( DS_OK != hr )
{
OutputDebugString("DirectSoundCreate() failed");
return;
}
#endif
m_nCurrentVolume = GetMaximumVolume();
for( DWORD j = 0; j < m_dwNumPackets; j++ )
m_adwStatus[ j ] = XMEDIAPACKET_STATUS_SUCCESS;
m_pDigitalOutput=NULL;
m_pAnalogOutput=NULL;
hr=Ac97CreateMediaObject(DSAC97_CHANNEL_DIGITAL, NULL, NULL, &m_pDigitalOutput);
if ( hr !=DS_OK )
{
OutputDebugString("failed to create digital Ac97CreateMediaObject()\n");
}
hr=Ac97CreateMediaObject(DSAC97_CHANNEL_ANALOG, NULL, NULL, &m_pAnalogOutput);
if ( hr !=DS_OK )
{
OutputDebugString("failed to create analog Ac97CreateMediaObject()\n");
}
bool bIsEncoded=false;
hr=m_pDigitalOutput->SetMode(bIsEncoded ? DSAC97_MODE_ENCODED : DSAC97_MODE_PCM);
m_bIsAllocated = true;
}
//***********************************************************************************************
CAc97DirectSound::~CAc97DirectSound()
{
Deinitialize();
}
//***********************************************************************************************
HRESULT CAc97DirectSound::Deinitialize()
{
OutputDebugString("CAc97DirectSound::Deinitialize\n");
m_bIsAllocated = false;
if (m_pAnalogOutput)
{
m_pAnalogOutput->Release();
m_pAnalogOutput=NULL;
}
if (m_pDigitalOutput)
{
m_pDigitalOutput->Release();
m_pDigitalOutput=NULL;
}
if ( m_pDSound )
{
m_pDSound->Release() ;
m_pDSound =NULL;
}
for (DWORD dwX=0; dwX < m_dwNumPackets ; dwX++)
{
if (m_pbSampleData[dwX]) XPhysicalFree(m_pbSampleData[dwX]) ;
m_pbSampleData[dwX]=NULL;
}
if ( m_adwStatus )
delete [] m_adwStatus;
m_adwStatus=NULL;
return S_OK;
}
//***********************************************************************************************
HRESULT CAc97DirectSound::Pause()
{
if (m_bPause) return S_OK;
m_bPause=true;
return S_OK;
}
//***********************************************************************************************
HRESULT CAc97DirectSound::Resume()
{
if (!m_bPause) return S_OK;
m_bPause=false;
return S_OK;
}
//***********************************************************************************************
HRESULT CAc97DirectSound::Stop()
{
if (m_bPause) return S_OK;
return S_OK;
}
//***********************************************************************************************
LONG CAc97DirectSound::GetMinimumVolume() const
{
return 0;
}
//***********************************************************************************************
LONG CAc97DirectSound::GetMaximumVolume() const
{
return 6000;
}
//***********************************************************************************************
LONG CAc97DirectSound::GetCurrentVolume() const
{
return 6000;
}
//***********************************************************************************************
HRESULT CAc97DirectSound::SetCurrentVolume(LONG nVolume)
{
if (!m_bIsAllocated) return -1;
return S_OK;
}
//***********************************************************************************************
bool CAc97DirectSound::FindFreePacket( DWORD &dwIndex )
{
if (!m_bIsAllocated) return false;
// Check the status of each packet
for( DWORD i = 0; i < m_dwNumPackets; i++ )
{
// If we find a non-pending packet, return it
if( m_adwStatus[ i ] != XMEDIAPACKET_STATUS_PENDING )
{
dwIndex = i;
return true;
}
}
return false;
}
//***********************************************************************************************
bool CAc97DirectSound::SupportsSurroundSound() const
{
return false;
}
//***********************************************************************************************
DWORD CAc97DirectSound::GetSpace()
{
DWORD iFreePackets(0);
// Check the status of each packet
for( DWORD i = 0; i < m_dwNumPackets; i++ )
{
// If we find a non-pending packet, return it
if( m_adwStatus[ i ] != XMEDIAPACKET_STATUS_PENDING )
{
iFreePackets++;
}
}
DWORD dwSize= iFreePackets*m_dwPacketSize;
return dwSize;
}
//***********************************************************************************************
DWORD CAc97DirectSound::AddPackets(unsigned char *data, DWORD len)
{
HRESULT hr;
DWORD dwIndex = 0;
DWORD iBytesCopied=0;
while (len)
{
if( FindFreePacket(dwIndex) )
{
XMEDIAPACKET xmpAudio = {0};
// DirectSoundDoWork();
DWORD iSize=m_dwPacketSize;
if (len < m_dwPacketSize)
{
// we don't accept half full packets...
iSize=len;
return iBytesCopied;
}
m_adwStatus[ dwIndex ] = XMEDIAPACKET_STATUS_PENDING;
// Set up audio packet
xmpAudio.dwMaxSize = iSize;
xmpAudio.pvBuffer = m_pbSampleData[dwIndex];
xmpAudio.pdwStatus = &m_adwStatus[ dwIndex ];
xmpAudio.pdwCompletedSize = NULL;
xmpAudio.prtTimestamp = NULL;
xmpAudio.pContext = NULL;
memcpy(xmpAudio.pvBuffer,&data[iBytesCopied],iSize);
hr=m_pDigitalOutput->Process( &xmpAudio, NULL );
// hr=m_pAnalogOutput->Process( &xmpAudio, NULL );
iBytesCopied+=iSize;
len -=iSize;
}
else
{
break;
}
}
return iBytesCopied;
}
//***********************************************************************************************
DWORD CAc97DirectSound::GetBytesInBuffer()
{
DWORD dwBytesInBuffer=0;
for( DWORD i = 0; i < m_dwNumPackets; i++ )
{
// If we find a non-pending packet, return it
if( m_adwStatus[ i ] == XMEDIAPACKET_STATUS_PENDING)
{
dwBytesInBuffer+=m_dwPacketSize;
}
}
return dwBytesInBuffer;
}
//***********************************************************************************************
FLOAT CAc97DirectSound::GetDelay()
{
return 0.0;
}
//***********************************************************************************************
DWORD CAc97DirectSound::GetChunkLen()
{
return m_dwPacketSize;
}
//***********************************************************************************************
int CAc97DirectSound::SetPlaySpeed(int iSpeed)
{
return 1;
}
void CAc97DirectSound::RegisterAudioCallback(IAudioCallback *pCallback)
{
if (!m_pCallback)
{
pCallback->OnInitialize(m_wfx.nChannels, m_wfx.nSamplesPerSec, m_wfx.wBitsPerSample );
}
m_pCallback=pCallback;
}
void CAc97DirectSound::UnRegisterAudioCallback()
{
m_pCallback=NULL;
}
--- NEW FILE: Ac97DirectSound.h ---
/*
* XBoxMediaPlayer
* Copyright (c) 2002 d7o3g4q and RUNTiME
* Portions Copyright (c) by the authors of ffmpeg and xvid
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
// AsyncAudioRenderer.h: interface for the CAc97DirectSound class.
//
//////////////////////////////////////////////////////////////////////
#if !defined(AFX_AC97AUDIORENDERER_H__B590A94D_D15E_43A6_A41D_527BD441B5F5__INCLUDED_)
#define AFX_AC97AUDIORENDERER_H__B590A94D_D15E_43A6_A41D_527BD441B5F5__INCLUDED_
#if _MSC_VER > 1000
#pragma once
#endif // _MSC_VER > 1000
#ifdef _XBOX
#include <xtl.h>
#else
#include <windows.h>
#endif
#include "IDirectSoundRenderer.h"
#include "IAudioCallback.h"
extern void RegisterAudioCallback(IAudioCallback* pCallback);
extern void UnRegisterAudioCallback();
class CAc97DirectSound : public IDirectSoundRenderer
{
public:
CAc97DirectSound(IAudioCallback* pCallback, int iChannels, unsigned int uiSamplesPerSec, unsigned int uiBitsPerSample);
virtual ~CAc97DirectSound();
virtual void UnRegisterAudioCallback();
virtual void RegisterAudioCallback(IAudioCallback* pCallback);
virtual DWORD GetChunkLen();
virtual FLOAT GetDelay();
virtual DWORD AddPackets(unsigned char* data, DWORD len);
virtual DWORD GetSpace();
virtual HRESULT Deinitialize();
virtual HRESULT Pause();
virtual HRESULT Stop();
virtual HRESULT Resume();
virtual DWORD GetBytesInBuffer();
virtual LONG GetMinimumVolume() const;
virtual LONG GetMaximumVolume() const;
virtual LONG GetCurrentVolume() const;
virtual HRESULT SetCurrentVolume(LONG nVolume);
virtual bool SupportsSurroundSound() const;
static void CALLBACK StaticStreamCallback(LPVOID pStreamContext, LPVOID pPacketContext, DWORD dwStatus);
void StreamCallback(LPVOID pPacketContext, DWORD dwStatus);
virtual int SetPlaySpeed(int iSpeed);
private:
IAudioCallback* m_pCallback;
LONG m_lFadeVolume;
bool FindFreePacket( DWORD& pdwIndex );
LPAC97MEDIAOBJECT m_pAnalogOutput;
LPAC97MEDIAOBJECT m_pDigitalOutput;
WAVEFORMATEX m_wfx;
LONG m_nCurrentVolume;
DWORD m_dwPacketSize;
bool m_AudioEOF;
DWORD m_dwNumPackets;
PBYTE m_pbSampleData[150];
DWORD* m_adwStatus;
bool m_bPause;
bool m_bIsAllocated;
LONGLONG m_startTime;
WAVEFORMATEXTENSIBLE m_wfxex;
LPDIRECTSOUND8 m_pDSound;
};
#endif // !defined(AFX_AC97AUDIORENDERER_H__B590A94D_D15E_43A6_A41D_527BD441B5F5__INCLUDED_)
--- NEW FILE: IDirectSoundRenderer.h ---
/*
* XBoxMediaPlayer
* Copyright (c) 2002 d7o3g4q and RUNTiME
* Portions Copyright (c) by the authors of ffmpeg and xvid
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
// AsyncAudioRenderer.h: interface for the CAsyncDirectSound class.
//
//////////////////////////////////////////////////////////////////////
#if !defined(AFX_IAUDIORENDERER_H__B590A94D_D15E_43A6_A41D_527BD441B5F5__INCLUDED_)
#define AFX_IAUDIORENDERER_H__B590A94D_D15E_43A6_A41D_527BD441B5F5__INCLUDED_
#if _MSC_VER > 1000
#pragma once
#endif // _MSC_VER > 1000
#ifdef _XBOX
#include <xtl.h>
#else
#include <windows.h>
#endif
#include "IAudioCallback.h"
extern void RegisterAudioCallback(IAudioCallback* pCallback);
extern void UnRegisterAudioCallback();
class IDirectSoundRenderer
{
public:
IDirectSoundRenderer() {};
virtual ~IDirectSoundRenderer() {};
virtual void UnRegisterAudioCallback()=0;
virtual void RegisterAudioCallback(IAudioCallback* pCallback)=0;
virtual FLOAT GetDelay()=0;
virtual DWORD AddPackets(unsigned char* data, DWORD len)=0;
virtual DWORD GetSpace()=0;
virtual HRESULT Deinitialize()=0;
virtual HRESULT Pause()=0;
virtual HRESULT Stop()=0;
virtual HRESULT Resume()=0;
virtual DWORD GetChunkLen()=0;
virtual DWORD GetBytesInBuffer()=0;
virtual LONG GetMinimumVolume() const=0;
virtual LONG GetMaximumVolume() const=0;
virtual LONG GetCurrentVolume() const=0;
virtual HRESULT SetCurrentVolume(LONG nVolume)=0;
virtual bool SupportsSurroundSound() const=0;
virtual int SetPlaySpeed(int iSpeed)=0;
private:};
#endif // !defined(AFX_IAUDIORENDERER_H__B590A94D_D15E_43A6_A41D_527BD441B5F5__INCLUDED_)
Index: AsyncDirectSound.h
===================================================================
RCS file: /cvsroot/xbplayer/XBMP/AsyncDirectSound.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** AsyncDirectSound.h 27 Feb 2003 17:34:14 -0000 1.6
--- AsyncDirectSound.h 13 Dec 2003 03:37:23 -0000 1.7
***************
*** 36,44 ****
#endif
#include "IAudioCallback.h"
extern void RegisterAudioCallback(IAudioCallback* pCallback);
extern void UnRegisterAudioCallback();
! class CASyncDirectSound
{
public:
--- 36,45 ----
#endif
+ #include "IDirectSoundRenderer.h"
#include "IAudioCallback.h"
extern void RegisterAudioCallback(IAudioCallback* pCallback);
extern void UnRegisterAudioCallback();
! class CASyncDirectSound : public IDirectSoundRenderer
{
public:
Index: XBMediaPlayer.vcproj
===================================================================
RCS file: /cvsroot/xbplayer/XBMP/XBMediaPlayer.vcproj,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** XBMediaPlayer.vcproj 12 Oct 2003 01:37:33 -0000 1.9
--- XBMediaPlayer.vcproj 13 Dec 2003 03:37:23 -0000 1.10
***************
*** 2,6 ****
<VisualStudioProject
ProjectType="Visual C++"
! Version="7.0"
Name="XBMediaPlayer"
ProjectGUID="{6422F20F-A2F6-495E-9371-337C4F2843CA}"
--- 2,6 ----
<VisualStudioProject
ProjectType="Visual C++"
! Version="7.10"
Name="XBMediaPlayer"
ProjectGUID="{6422F20F-A2F6-495E-9371-337C4F2843CA}"
***************
*** 135,138 ****
--- 135,141 ----
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
<File
+ RelativePath=".\Ac97DirectSound.cpp">
+ </File>
+ <File
RelativePath=".\ao_xbox.cpp">
</File>
***************
*** 541,544 ****
--- 544,550 ----
Filter="h;hpp;hxx;hm;inl">
<File
+ RelativePath=".\Ac97DirectSound.h">
+ </File>
+ <File
RelativePath=".\UI\AlbumInterface.h">
</File>
***************
*** 775,782 ****
</File>
<File
! RelativePath=".\xbox\MediaPlayer.h">
</File>
<File
! RelativePath=".\MediaPlayer.h">
</File>
<File
--- 781,788 ----
</File>
<File
! RelativePath=".\MediaPlayer.h">
</File>
<File
! RelativePath=".\xbox\MediaPlayer.h">
</File>
<File
Index: ao_xbox.cpp
===================================================================
RCS file: /cvsroot/xbplayer/XBMP/ao_xbox.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ao_xbox.cpp 31 Mar 2003 18:01:27 -0000 1.7
--- ao_xbox.cpp 13 Dec 2003 03:37:23 -0000 1.8
***************
*** 21,25 ****
--- 21,28 ----
#include <xtl.h>
#include "ASyncDirectSound.h"
+ #include "Ac97DirectSound.h"
#include "IAudioCallback.h"
+ #include "UI/configuration.h"
+
#ifdef __cplusplus
extern "C" {
***************
*** 49,53 ****
! CASyncDirectSound* m_pAudioDecoder=NULL;
//******************************************************************************************
--- 52,66 ----
! IDirectSoundRenderer* m_pAudioDecoder=NULL;
! extern "C" int getAc3PassthruSettings(void);
!
! int getAc3PassthruSettings(void)
! {
! bool bSupportsSPDIFOut=((XGetAudioFlags() & (DSSPEAKER_ENABLE_AC3 | DSSPEAKER_ENABLE_DTS)) != 0 );
! if (bSupportsSPDIFOut&&g_playerSettings.bDigitalAudioPassThrough)
! return 1;
! else
! return 0;
! }
//******************************************************************************************
***************
*** 104,113 ****
static int init(int rate,int channels,int format,int flags)
{
! m_pAudioDecoder = new CASyncDirectSound(m_pAudioCallback,channels,rate,audio_out_format_bits(format));
ao_data.channels = channels;
! ao_data.samplerate= rate;
ao_data.format = format;
! ao_data.bps = channels*rate;
if(format != AFMT_U8 && format != AFMT_S8)
--- 117,138 ----
static int init(int rate,int channels,int format,int flags)
{
! bool bAC3File=false;
! if ((format==AFMT_AC3) && (rate==48000) && (channels==2)) //AC3 valid passthrough type
! bAC3File=true;
!
! if ( bAC3File && (getAc3PassthruSettings()==1))
! {
! // ac3 48KHz passthru
! m_pAudioDecoder = new CAc97DirectSound(m_pAudioCallback,channels,rate,audio_out_format_bits(format));
! }
! else
! {
! m_pAudioDecoder = new CASyncDirectSound(m_pAudioCallback,channels,rate,audio_out_format_bits(format));
! }
ao_data.channels = channels;
! ao_data.samplerate = rate;
ao_data.format = format;
! ao_data.bps = channels*rate;
if(format != AFMT_U8 && format != AFMT_S8)
|
|
From: <mon...@us...> - 2003-12-13 02:04:21
|
Update of /cvsroot/xbplayer/XBMP/mplayerlibs/libDLL
In directory sc8-pr-cvs1:/tmp/cvs-serv31918/mplayerlibs/libDLL
Modified Files:
loadlib.cpp
Log Message:
Code clean up
Index: loadlib.cpp
===================================================================
RCS file: /cvsroot/xbplayer/XBMP/mplayerlibs/libDLL/loadlib.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** loadlib.cpp 19 Oct 2003 15:50:42 -0000 1.21
--- loadlib.cpp 13 Dec 2003 02:04:18 -0000 1.22
***************
*** 33,55 ****
extern "C" WIN_BOOL __stdcall HeapFree(HANDLE,DWORD,LPVOID);
extern "C" WINBASEAPI BOOL __stdcall VirtualFree( LPVOID lpAddress, DWORD dwSize, DWORD dwFreeType );
! extern "C" unsigned long __stdcall htonl (unsigned long hostlong);
! extern "C" unsigned long __stdcall ntohl (unsigned long netlong);
! extern "C" WINBASEAPI PVOID __stdcall InterlockedCompareExchange ( PVOID *Destination, PVOID Exchange, PVOID Comperand );
! extern "C" void __stdcall Sleep(DWORD dwMilliseconds);
! extern "C" LONG __stdcall InterlockedExchange(LPLONG Target,LONG Value);
extern "C" void* __stdcall CreateThread(void* pSecAttr, long dwStackSize,void* lpStartAddress, void* lpParameter,long dwFlags, long* dwThreadId);
! extern "C" void* __stdcall CreateEventA(void* pSecAttr, char bManualReset,char bInitialState, const char* name);
! extern "C" void* __stdcall SetEvent(void* event);
! extern "C" void* __stdcall ResetEvent(void* event);
! extern "C" void* __stdcall WaitForSingleObject(void* object, int duration);
! extern "C" LONG __stdcall __stdcall GetVersion(void);
! extern "C" HANDLE __stdcall HeapCreate(long flags, long init_size, long max_size);
! extern "C" long __stdcall HeapDestroy(void* heap);
! extern "C" long __stdcall HeapSize(int heap, int flags, void* pointer);
! extern "C" void* __stdcall HeapReAlloc(HANDLE heap,int flags,void *lpMem,int size);
! extern "C" void __stdcall InitializeCriticalSection(CRITICAL_SECTION *lpCrit);
! extern "C" void __stdcall EnterCriticalSection(CRITICAL_SECTION* c);
! extern "C" static void __stdcall LeaveCriticalSection(CRITICAL_SECTION* c);
! extern "C" void __stdcall DeleteCriticalSection(CRITICAL_SECTION *lpCrit);
extern void* XboxCoTaskMemAlloc(unsigned long cb);
extern void XboxCoTaskMemFree(void* cb);
--- 33,55 ----
extern "C" WIN_BOOL __stdcall HeapFree(HANDLE,DWORD,LPVOID);
extern "C" WINBASEAPI BOOL __stdcall VirtualFree( LPVOID lpAddress, DWORD dwSize, DWORD dwFreeType );
! //extern "C" unsigned long __stdcall htonl (unsigned long hostlong);
! //extern "C" unsigned long __stdcall ntohl (unsigned long netlong);
! //extern "C" WINBASEAPI PVOID __stdcall InterlockedCompareExchange ( PVOID *Destination, PVOID Exchange, PVOID Comperand );
! //extern "C" void __stdcall Sleep(DWORD dwMilliseconds);
! //extern "C" LONG __stdcall InterlockedExchange(LPLONG Target,LONG Value);
extern "C" void* __stdcall CreateThread(void* pSecAttr, long dwStackSize,void* lpStartAddress, void* lpParameter,long dwFlags, long* dwThreadId);
! //extern "C" void* __stdcall CreateEventA(void* pSecAttr, char bManualReset,char bInitialState, const char* name);
! //extern "C" void* __stdcall SetEvent(void* event);
! //extern "C" void* __stdcall ResetEvent(void* event);
! //extern "C" void* __stdcall WaitForSingleObject(void* object, int duration);
! //extern "C" LONG __stdcall __stdcall GetVersion(void);
! //extern "C" HANDLE __stdcall HeapCreate(long flags, long init_size, long max_size);
! //extern "C" long __stdcall HeapDestroy(void* heap);
! //extern "C" long __stdcall HeapSize(int heap, int flags, void* pointer);
! //extern "C" void* __stdcall HeapReAlloc(HANDLE heap,int flags,void *lpMem,int size);
! //extern "C" void __stdcall InitializeCriticalSection(CRITICAL_SECTION *lpCrit);
! //extern "C" void __stdcall EnterCriticalSection(CRITICAL_SECTION* c);
! //extern "C" static void __stdcall LeaveCriticalSection(CRITICAL_SECTION* c);
! //extern "C" void __stdcall DeleteCriticalSection(CRITICAL_SECTION *lpCrit);
extern void* XboxCoTaskMemAlloc(unsigned long cb);
extern void XboxCoTaskMemFree(void* cb);
***************
*** 2427,2431 ****
{
// FIXME --possible use xbox createthread function?
! //return CreateThread(lpThreadAttributes,dwStackSize,lpStartAddress,lpParameter,dwCreationFlags,lpThreadId);
return NULL;
}
--- 2427,2431 ----
{
// FIXME --possible use xbox createthread function?
! return CreateThread(lpThreadAttributes,dwStackSize,lpStartAddress,lpParameter,dwCreationFlags,lpThreadId);
return NULL;
}
***************
*** 2806,2824 ****
};
- /* realplayer8:
- DLL Name: PNCRT.dll
- vma: Hint/Ord Member-Name
- 22ff4 615 free
- 2302e 250 _ftol
- 22fea 666 malloc
- 2303e 609 fprintf
- 2305e 167 _adjust_fdiv
- 23052 280 _initterm
-
- 22ffc 176 _beginthreadex
- 23036 284 _iob
- 2300e 85 __CxxFrameHandler
- 23022 411 _purecall
- */
/* realplayer8:
DLL Name: PNCRT.dll
--- 2806,2809 ----
|
|
From: <mon...@us...> - 2003-12-13 02:03:00
|
Update of /cvsroot/xbplayer/XBMP/mplayerlibs/libDLL/dshow
In directory sc8-pr-cvs1:/tmp/cvs-serv31752/mplayerlibs/libDLL/dshow
Modified Files:
DS_VideoDecoder.cpp
Log Message:
Minor fix image size calculation
Index: DS_VideoDecoder.cpp
===================================================================
RCS file: /cvsroot/xbplayer/XBMP/mplayerlibs/libDLL/dshow/DS_VideoDecoder.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** DS_VideoDecoder.cpp 4 Jun 2003 19:57:44 -0000 1.7
--- DS_VideoDecoder.cpp 13 Dec 2003 02:02:57 -0000 1.8
***************
*** 641,646 ****
pthis->iv.m_obh.biCompression=csp;
pthis->iv.m_obh.biBitCount=bits;
! pthis->iv.m_obh.biSizeImage=labs(pthis->iv.m_obh.biBitCount*
! pthis->iv.m_obh.biWidth*pthis->iv.m_obh.biHeight)>>3;
}
}
--- 641,646 ----
pthis->iv.m_obh.biCompression=csp;
pthis->iv.m_obh.biBitCount=bits;
! pthis->iv.m_obh.biSizeImage=labs(pthis->iv.m_obh.biWidth*pthis->iv.m_obh.biHeight)
! * (pthis->iv.m_obh.biBitCount+7)/8;
}
}
|
|
From: <xc_...@us...> - 2003-12-03 15:48:25
|
Update of /cvsroot/xbplayer/XBMP/freestyle/Media/Resources/screenshots In directory sc8-pr-cvs1:/tmp/cvs-serv24094 Added Files: dummy.txt Log Message: dummy file ... for the screenshot patch --- NEW FILE: dummy.txt --- folder for screenshots |
|
From: <xc_...@us...> - 2003-12-02 16:12:46
|
Update of /cvsroot/xbplayer/XBMP/UI
In directory sc8-pr-cvs1:/tmp/cvs-serv15246
Modified Files:
OSDPanel.cpp
Log Message:
[ 719404 ] Bugfix for 719074 OSB bar
Index: OSDPanel.cpp
===================================================================
RCS file: /cvsroot/xbplayer/XBMP/UI/OSDPanel.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** OSDPanel.cpp 6 May 2003 16:38:17 -0000 1.24
--- OSDPanel.cpp 2 Dec 2003 16:12:42 -0000 1.25
***************
*** 187,190 ****
--- 187,195 ----
if (pGamepad->bPressedAnalogButtons[XINPUT_GAMEPAD_WHITE]|| pGamepad->bPressedAnalogButtons[XINPUT_GAMEPAD_Y])
{
+ // [ 719404 ] Bugfix for 719074 OSB bar - START
+ m_bMenuSelected=false;
+ m_bOptionSelected=false;
+ // [ 719404 ] Bugfix for 719074 OSB bar - END
+
SetFocus(false);
return S_OK;
|
Update of /cvsroot/xbplayer/XBMP/freestyle/Media/Resources In directory sc8-pr-cvs1:/tmp/cvs-serv12731 Modified Files: FileZilla Server.xml XBOX Media Player.cut codecs.conf config.xml copying.txt eldany_skin.rar font.desc iso-8859-1-a.raw iso-8859-1-b.raw listing.xml osd-mplayer-a.raw osd-mplayer-b.raw shoutcaststream1.sc skin.xml tvguide12.xpr tvguide16.xpr tvguide20.xpr Removed Files: CD Player.cut DVD Player.cut Log Message: no message Index: FileZilla Server.xml =================================================================== RCS file: /cvsroot/xbplayer/XBMP/freestyle/Media/Resources/FileZilla Server.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 Index: XBOX Media Player.cut =================================================================== RCS file: /cvsroot/xbplayer/XBMP/freestyle/Media/Resources/XBOX Media Player.cut,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 Index: codecs.conf =================================================================== RCS file: /cvsroot/xbplayer/XBMP/freestyle/Media/Resources/codecs.conf,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 Index: config.xml =================================================================== RCS file: /cvsroot/xbplayer/XBMP/freestyle/Media/Resources/config.xml,v retrieving revision 1.78 retrieving revision 1.79 diff -C2 -d -r1.78 -r1.79 Index: copying.txt =================================================================== RCS file: /cvsroot/xbplayer/XBMP/freestyle/Media/Resources/copying.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Index: eldany_skin.rar =================================================================== RCS file: /cvsroot/xbplayer/XBMP/freestyle/Media/Resources/eldany_skin.rar,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: font.desc =================================================================== RCS file: /cvsroot/xbplayer/XBMP/freestyle/Media/Resources/font.desc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: iso-8859-1-a.raw =================================================================== RCS file: /cvsroot/xbplayer/XBMP/freestyle/Media/Resources/iso-8859-1-a.raw,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: iso-8859-1-b.raw =================================================================== RCS file: /cvsroot/xbplayer/XBMP/freestyle/Media/Resources/iso-8859-1-b.raw,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: listing.xml =================================================================== RCS file: /cvsroot/xbplayer/XBMP/freestyle/Media/Resources/listing.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: osd-mplayer-a.raw =================================================================== RCS file: /cvsroot/xbplayer/XBMP/freestyle/Media/Resources/osd-mplayer-a.raw,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: osd-mplayer-b.raw =================================================================== RCS file: /cvsroot/xbplayer/XBMP/freestyle/Media/Resources/osd-mplayer-b.raw,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: shoutcaststream1.sc =================================================================== RCS file: /cvsroot/xbplayer/XBMP/freestyle/Media/Resources/shoutcaststream1.sc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: skin.xml =================================================================== RCS file: /cvsroot/xbplayer/XBMP/freestyle/Media/Resources/skin.xml,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 Index: tvguide12.xpr =================================================================== RCS file: /cvsroot/xbplayer/XBMP/freestyle/Media/Resources/tvguide12.xpr,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: tvguide16.xpr =================================================================== RCS file: /cvsroot/xbplayer/XBMP/freestyle/Media/Resources/tvguide16.xpr,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: tvguide20.xpr =================================================================== RCS file: /cvsroot/xbplayer/XBMP/freestyle/Media/Resources/tvguide20.xpr,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 --- CD Player.cut DELETED --- --- DVD Player.cut DELETED --- |
|
From: <xc_...@us...> - 2003-12-02 15:54:05
|
Update of /cvsroot/xbplayer/XBMP/freestyle/Media/Resources/screenshots In directory sc8-pr-cvs1:/tmp/cvs-serv11924/screenshots Log Message: Directory /cvsroot/xbplayer/XBMP/freestyle/Media/Resources/screenshots added to the repository |
|
From: <xc_...@us...> - 2003-12-02 15:48:43
|
Update of /cvsroot/xbplayer/XBMP/freestyle/Media/Resources
In directory sc8-pr-cvs1:/tmp/cvs-serv10974
Modified Files:
config.xml
Log Message:
added <screenshots>$HOME\screenshots</screenshots> for the screenshot patch
Index: config.xml
===================================================================
RCS file: /cvsroot/xbplayer/XBMP/freestyle/Media/Resources/config.xml,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** config.xml 13 Oct 2003 16:59:20 -0000 1.77
--- config.xml 2 Dec 2003 15:48:36 -0000 1.78
***************
*** 38,42 ****
<subtitles>$HOME\subtitles</subtitles>
<cddb>$HOME\cddb</cddb>
! <imdb>$HOME\imdb</imdb>
</local>
--- 38,43 ----
<subtitles>$HOME\subtitles</subtitles>
<cddb>$HOME\cddb</cddb>
! <imdb>$HOME\imdb</imdb>
! <screenshots>$HOME\screenshots</screenshots>
</local>
|
|
From: <xc_...@us...> - 2003-12-02 12:02:48
|
Update of /cvsroot/xbplayer/XBMP/freestyle
In directory sc8-pr-cvs1:/tmp/cvs-serv32362
Modified Files:
ListPanel.h
Log Message:
no message
Index: ListPanel.h
===================================================================
RCS file: /cvsroot/xbplayer/XBMP/freestyle/ListPanel.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ListPanel.h 31 Jan 2003 17:53:28 -0000 1.3
--- ListPanel.h 2 Dec 2003 12:02:42 -0000 1.4
***************
*** 33,36 ****
--- 33,37 ----
#include "Panel.h"
#include "Font.h"
+ #define XML_MAX_INNERTEXT_SIZE 1024
class CListPanel : public CControl
***************
*** 40,44 ****
struct ListItem
{
! CHAR szDescription[128];
BOOL bFolder;
};
--- 41,45 ----
struct ListItem
{
! CHAR szDescription[XML_MAX_INNERTEXT_SIZE];
BOOL bFolder;
};
|
|
From: <xc_...@us...> - 2003-12-02 12:02:31
|
Update of /cvsroot/xbplayer/XBMP/freestyle
In directory sc8-pr-cvs1:/tmp/cvs-serv32324
Modified Files:
ListPanel.cpp
Log Message:
no message
Index: ListPanel.cpp
===================================================================
RCS file: /cvsroot/xbplayer/XBMP/freestyle/ListPanel.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** ListPanel.cpp 23 Feb 2003 21:16:24 -0000 1.16
--- ListPanel.cpp 2 Dec 2003 12:02:27 -0000 1.17
***************
*** 192,196 ****
HRESULT CListPanel::Render()
{
! WCHAR wszText[128];
float fPosY = m_nPositionY;
float fPosX = m_nPositionX;
--- 192,196 ----
HRESULT CListPanel::Render()
{
! WCHAR wszText[XML_MAX_INNERTEXT_SIZE];
float fPosY = m_nPositionY;
float fPosX = m_nPositionX;
***************
*** 213,219 ****
ListItem* pListItem = &m_pListItems[iListItem];
if (g_DefaultCharReader != (CharReader)(-1) && g_DefaultCharReader != NULL)
! MultibyteToWchar(g_DefaultCharReader, pListItem->szDescription, wszText, 1000);
! else
! swprintf(wszText,L"%S",pListItem->szDescription);
BOOL bFocus = ( HasFocus() && (iListItem == m_iListFocus) );
--- 213,221 ----
ListItem* pListItem = &m_pListItems[iListItem];
if (g_DefaultCharReader != (CharReader)(-1) && g_DefaultCharReader != NULL)
! MultibyteToWchar(g_DefaultCharReader, pListItem->szDescription, wszText, XML_MAX_INNERTEXT_SIZE);
! else {
! int wchrs = _snwprintf(wszText,XML_MAX_INNERTEXT_SIZE,L"%S",pListItem->szDescription);
! if(wchrs < 0) wszText[XML_MAX_INNERTEXT_SIZE-1] = 0;
! }
BOOL bFocus = ( HasFocus() && (iListItem == m_iListFocus) );
***************
*** 257,265 ****
//Get the double byte suffix
WCHAR wcsSuffix[128];
! swprintf(wcsSuffix,L"%S\0",g_playerSettings.szScrollySuffix);
//Append the double byte suffix onto the end of the text
! wcscat(wszText,wcsSuffix);
! WCHAR szText[1024];
//If we have just selected this item then reset the frame counters
if (iLastItem != iListItem)
--- 259,267 ----
//Get the double byte suffix
WCHAR wcsSuffix[128];
! _snwprintf(wcsSuffix,128,L"%S",g_playerSettings.szScrollySuffix);
//Append the double byte suffix onto the end of the text
! wcsncat(wszText,wcsSuffix,XML_MAX_INNERTEXT_SIZE-1-wcslen(wszText));
! WCHAR szText[XML_MAX_INNERTEXT_SIZE];
//If we have just selected this item then reset the frame counters
if (iLastItem != iListItem)
|
|
From: <xc_...@us...> - 2003-12-01 17:06:32
|
Update of /cvsroot/xbplayer/XBMP/libFileZilla In directory sc8-pr-cvs1:/tmp/cvs-serv9047 Modified Files: XBFileZilla.vcproj Log Message: no message Index: XBFileZilla.vcproj =================================================================== RCS file: /cvsroot/xbplayer/XBMP/libFileZilla/XBFileZilla.vcproj,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** XBFileZilla.vcproj 14 Nov 2003 20:37:18 -0000 1.1 --- XBFileZilla.vcproj 1 Dec 2003 17:06:29 -0000 1.2 *************** *** 442,446 **** Filter=""> <File ! RelativePath="C:\Program Files\Microsoft Xbox SDK\Samples\Xbox\Common\Src\xbapp.cpp"> <FileConfiguration Name="Release|Xbox"> --- 442,446 ---- Filter=""> <File ! RelativePath="$(XDK)\Samples\Xbox\Common\Src\xbapp.cpp"> <FileConfiguration Name="Release|Xbox"> *************** *** 462,469 **** </File> <File ! RelativePath="C:\Program Files\Microsoft Xbox SDK\Samples\Xbox\Common\Include\xbapp.h"> </File> <File ! RelativePath="C:\Program Files\Microsoft Xbox SDK\Samples\Xbox\Common\Src\xbinput.cpp"> <FileConfiguration Name="Release|Xbox"> --- 462,469 ---- </File> <File ! RelativePath="$(XDK)\Samples\Xbox\Common\Include\xbapp.h"> </File> <File ! RelativePath="$(XDK)\Samples\Xbox\Common\Src\xbinput.cpp"> <FileConfiguration Name="Release|Xbox"> *************** *** 485,492 **** </File> <File ! RelativePath="C:\Program Files\Microsoft Xbox SDK\Samples\Xbox\Common\Include\xbinput.h"> </File> <File ! RelativePath="C:\Program Files\Microsoft Xbox SDK\Samples\Xbox\Common\Src\xbutil.cpp"> <FileConfiguration Name="Release|Xbox"> --- 485,492 ---- </File> <File ! RelativePath="$(XDK)\Samples\Xbox\Common\Include\xbinput.h"> </File> <File ! RelativePath="$(XDK)\Samples\Xbox\Common\Src\xbutil.cpp"> <FileConfiguration Name="Release|Xbox"> *************** *** 508,512 **** </File> <File ! RelativePath="C:\Program Files\Microsoft Xbox SDK\Samples\Xbox\Common\Include\xbutil.h"> </File> </Filter> --- 508,512 ---- </File> <File ! RelativePath="$(XDK)\Samples\Xbox\Common\Include\xbutil.h"> </File> </Filter> |
|
From: <xc_...@us...> - 2003-12-01 17:06:12
|
Update of /cvsroot/xbplayer/XBMP/UI In directory sc8-pr-cvs1:/tmp/cvs-serv8996 Modified Files: Configuration.h Log Message: no message Index: Configuration.h =================================================================== RCS file: /cvsroot/xbplayer/XBMP/UI/Configuration.h,v retrieving revision 1.75 retrieving revision 1.76 diff -C2 -d -r1.75 -r1.76 *** Configuration.h 30 Oct 2003 08:13:23 -0000 1.75 --- Configuration.h 1 Dec 2003 17:06:09 -0000 1.76 *************** *** 143,146 **** --- 143,147 ---- char szLocalGateway[32]; char szBookmarks[128]; // will use it to locate the directory when bookmarks are placed + char szLocalScreenshots[128]; // Screenshot - [XC]D-Ice char szLocalNameServer[32]; |
|
From: <xc_...@us...> - 2003-12-01 17:06:00
|
Update of /cvsroot/xbplayer/XBMP/UI
In directory sc8-pr-cvs1:/tmp/cvs-serv8927
Modified Files:
Configuration.cpp
Log Message:
no message
Index: Configuration.cpp
===================================================================
RCS file: /cvsroot/xbplayer/XBMP/UI/Configuration.cpp,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -d -r1.85 -r1.86
*** Configuration.cpp 30 Oct 2003 08:13:22 -0000 1.85
--- Configuration.cpp 1 Dec 2003 17:05:57 -0000 1.86
***************
*** 91,94 ****
--- 91,95 ----
m_pPlayerSettings->szLocalPlaylists[0]=0x00;
m_pPlayerSettings->szLocalSubtitleDir[0]=0x00;
+ m_pPlayerSettings->szLocalScreenshots[0]=0; // Screenshot - [XC]D-Ice
m_pPlayerSettings->szBookmarks[0]=0;
m_pPlayerSettings->szThumbnailDirectory[0]=0;
***************
*** 376,379 ****
--- 377,388 ----
ConvertHomeVar(m_pPlayerSettings->szBookmarks);
CreateDirectory(m_pPlayerSettings->szBookmarks,NULL);
+ // Screenshot - [XC]D-Ice - Start
+ }
+
+ if (grandChild = GetChildNode(childNode, "screenshots"))
+ {
+ strcpy(m_pPlayerSettings->szLocalScreenshots, GetNodeText(grandChild));
+ CreateDirectory(m_pPlayerSettings->szLocalScreenshots, NULL);
+ // Screenshot - [XC]D-Ice - End
}
|
|
From: <xc_...@us...> - 2003-12-01 17:05:42
|
Update of /cvsroot/xbplayer/XBMP In directory sc8-pr-cvs1:/tmp/cvs-serv8839 Modified Files: XBoxMediaPlayer.h Log Message: no message Index: XBoxMediaPlayer.h =================================================================== RCS file: /cvsroot/xbplayer/XBMP/XBoxMediaPlayer.h,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** XBoxMediaPlayer.h 1 Dec 2003 17:00:58 -0000 1.44 --- XBoxMediaPlayer.h 1 Dec 2003 17:05:36 -0000 1.45 *************** *** 160,163 **** --- 160,164 ---- BOOL IsEthernetConnected(); void RenderVisualisation(); + void TakeScreenshot(); // Screenshot - [XC]D-Ice |
|
From: <xc_...@us...> - 2003-12-01 17:05:23
|
Update of /cvsroot/xbplayer/XBMP
In directory sc8-pr-cvs1:/tmp/cvs-serv8738
Modified Files:
XBoxMediaPlayer.cpp
Log Message:
no message
Index: XBoxMediaPlayer.cpp
===================================================================
RCS file: /cvsroot/xbplayer/XBMP/XBoxMediaPlayer.cpp,v
retrieving revision 1.201
retrieving revision 1.202
diff -C2 -d -r1.201 -r1.202
*** XBoxMediaPlayer.cpp 1 Dec 2003 17:01:21 -0000 1.201
--- XBoxMediaPlayer.cpp 1 Dec 2003 17:05:20 -0000 1.202
***************
*** 800,803 ****
--- 800,804 ----
CreateDirectory(g_playerSettings.szBookmarks,NULL);
CreateDirectory(g_playerSettings.szLocalSubtitleDir,NULL);
+ CreateDirectory(g_playerSettings.szLocalScreenshots, NULL); // Screenshot - [XC]D-Ice
CreateDirectory(g_playerSettings.szCddbDir, NULL);
m_dwScreenSave=timeGetTime();
***************
*** 1777,1780 ****
--- 1778,1802 ----
}
}
+ //Screenshot - [XC]D-Ice - Start
+ // added to take screeshot - START - With the RIGHT THUMB //PRESS//
+ if (dwCurrentAppState != IN_MOVIE && dwCurrentAppState != IN_PHOTO)
+ {
+ if (pGamepad->wButtons & XINPUT_GAMEPAD_RIGHT_THUMB)
+ {
+ TakeScreenshot();
+ }
+ }
+ // added to take screenshot - END - With the RIGHT THUMB //PRESS//
+ // added to take screeshot - START - With the IR Remote - Button 9
+ if (dwCurrentAppState != IN_MOVIE && dwCurrentAppState != IN_PHOTO)
+ {
+ if (m_DefaultIR_Remote.wPressedButtons == XINPUT_IR_REMOTE_9)
+ {
+ TakeScreenshot();
+ }
+ }
+ // added to take screenshot - END - With the IR Remote - Button 9
+ // Screenshot - [XC]D-Ice - End
+
}
if (pGamepad->bPressedAnalogButtons[XINPUT_GAMEPAD_BLACK])
***************
*** 1980,1983 ****
--- 2002,2021 ----
}
*/
+
+ // B button = toggle aspect
+ if( m_DefaultGamepad.bPressedAnalogButtons[XINPUT_GAMEPAD_B] )
+ {
+ static int ratioidx = 0;
+ static FLOAT ratios[] = {
+ (FLOAT)0.0,
+ (FLOAT)-0.1,
+ (FLOAT)-0.2
+ };
+ int maxidx = sizeof(ratios) / sizeof(FLOAT);
+
+ g_playerSettings.fRatioCorrection = ratios[ratioidx++];
+ if(ratioidx >= maxidx) ratioidx = 0;
+ }
+
// A button = back 2 normal speed
if( (m_DefaultGamepad.bPressedAnalogButtons[XINPUT_GAMEPAD_A]) ||
***************
*** 3213,3216 ****
--- 3251,3318 ----
}
}
+ //Screenshot - [XC]D-Ice - Start
+ }
+
+ std::string GetNextFilename(const char* fn_template, int max)
+ {
+ // Open the file.
+ char szName[1024];
+
+ INT i;
+
+ WIN32_FIND_DATA wfd;
+ HANDLE hFind;
+
+ if (NULL != strstr(fn_template, "%d"))
+ {
+ for(i = 0; i <= max; i++)
+ {
+ wsprintf(szName, fn_template, i);
+
+ memset(&wfd, 0, sizeof(wfd));
+ if ((hFind = FindFirstFile(szName, &wfd)) != INVALID_HANDLE_VALUE)
+ FindClose(hFind);
+ else
+ {
+ // FindFirstFile didn't find the file 'szName', return it
+ return szName;
+ }
+ }
+ }
+
+ return ""; // no fn generated
+ }
+
+ void CApplication::TakeScreenshot()
+ {
+ LPDIRECT3DSURFACE8 lpSurface = NULL;
+ char fn[1024];
+
+ if (strlen(g_playerSettings.szLocalScreenshots))
+ {
+ wsprintf(fn, "%s\\screenshot%%d.bmp", g_playerSettings.szLocalScreenshots);
+ strcpy(fn, GetNextFilename(fn, 10).c_str());
+
+ if (strlen(fn))
+ {
+ if (SUCCEEDED(g_pd3dDevice->GetBackBuffer(-1, D3DBACKBUFFER_TYPE_MONO, &lpSurface)))
+ {
+ if (FAILED(XGWriteSurfaceToFile(lpSurface, fn)))
+ {
+ ErrorMessage("Screen shot", "Generation of screen shot failed", false);
+ }
+ else
+ {
+ InfoMessage("Screen shot", "Screen shot saved as", fn);
+ }
+ lpSurface->Release();
+ }
+ }
+ else
+ {
+ ErrorMessage("Screen shot", "Too many screen shots or invalid folder", false);
+ }
+ }
+ //Screenshot - [XC]D-Ice - End
}
|
|
From: <xc_...@us...> - 2003-12-01 17:04:59
|
Update of /cvsroot/xbplayer/XBMP/freestyle
In directory sc8-pr-cvs1:/tmp/cvs-serv8587
Modified Files:
JpegImage.cpp
Log Message:
no message
Index: JpegImage.cpp
===================================================================
RCS file: /cvsroot/xbplayer/XBMP/freestyle/JpegImage.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** JpegImage.cpp 1 Dec 2003 17:02:27 -0000 1.31
--- JpegImage.cpp 1 Dec 2003 17:04:56 -0000 1.32
***************
*** 273,276 ****
--- 273,277 ----
void CJpegImage::Scale(RECT rClip)
{
+
//Check to see if we should use zoom mode
__asm emms;
***************
*** 301,304 ****
--- 302,309 ----
else
{
+ /***Zoom and move bug resolved**/
+ m_pImage->Flip();
+ /*******************************/
+
//Get screen size
__asm emms;
***************
*** 353,357 ****
//Make picture with modified screen aspect
__asm emms;
! m_pImage->Resample((DWORD)fModifiedWidth, (DWORD)fModifiedHeight, QUALITY);
//Get zoom picture size
--- 358,362 ----
//Make picture with modified screen aspect
__asm emms;
! m_pImage->Resample((DWORD)fModifiedHeight,(DWORD)fModifiedWidth, QUALITY);
//Get zoom picture size
|
|
From: <xc_...@us...> - 2003-12-01 17:04:32
|
Update of /cvsroot/xbplayer/XBMP/mplayerlibs/libmpdemux
In directory sc8-pr-cvs1:/tmp/cvs-serv8481
Modified Files:
demux_ts.c
Log Message:
no message
Index: demux_ts.c
===================================================================
RCS file: /cvsroot/xbplayer/XBMP/mplayerlibs/libmpdemux/demux_ts.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** demux_ts.c 1 Dec 2003 17:02:00 -0000 1.9
--- demux_ts.c 1 Dec 2003 17:04:26 -0000 1.10
***************
*** 132,136 ****
{
const int buf_size = (TS_FEC_PACKET_SIZE * NUM_CONSECUTIVE_TS_PACKETS);
! unsigned char buf[4096], c, done = 0, *ptr;
uint32_t _read, i, count = 0, is_ts;
int cc[NB_PID_MAX], last_cc[NB_PID_MAX], pid, cc_ok;
--- 132,136 ----
{
const int buf_size = (TS_FEC_PACKET_SIZE * NUM_CONSECUTIVE_TS_PACKETS);
! unsigned char buf[8192], c, done = 0, *ptr;
uint32_t _read, i, count = 0, is_ts;
int cc[NB_PID_MAX], last_cc[NB_PID_MAX], pid, cc_ok;
|
|
From: <xc_...@us...> - 2003-12-01 17:02:30
|
Update of /cvsroot/xbplayer/XBMP/freestyle In directory sc8-pr-cvs1:/tmp/cvs-serv8005 Modified Files: JpegImage.cpp Log Message: no message Index: JpegImage.cpp =================================================================== RCS file: /cvsroot/xbplayer/XBMP/freestyle/JpegImage.cpp,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 |
|
From: <xc_...@us...> - 2003-12-01 17:02:04
|
Update of /cvsroot/xbplayer/XBMP/mplayerlibs/libmpdemux In directory sc8-pr-cvs1:/tmp/cvs-serv7876 Modified Files: demux_ts.c Log Message: no message Index: demux_ts.c =================================================================== RCS file: /cvsroot/xbplayer/XBMP/mplayerlibs/libmpdemux/demux_ts.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 |
|
From: <xc_...@us...> - 2003-12-01 17:01:25
|
Update of /cvsroot/xbplayer/XBMP In directory sc8-pr-cvs1:/tmp/cvs-serv7774 Modified Files: XBoxMediaPlayer.cpp Log Message: no message Index: XBoxMediaPlayer.cpp =================================================================== RCS file: /cvsroot/xbplayer/XBMP/XBoxMediaPlayer.cpp,v retrieving revision 1.200 retrieving revision 1.201 diff -C2 -d -r1.200 -r1.201 |
|
From: <xc_...@us...> - 2003-12-01 17:01:03
|
Update of /cvsroot/xbplayer/XBMP In directory sc8-pr-cvs1:/tmp/cvs-serv7656 Modified Files: XBoxMediaPlayer.h Log Message: no message Index: XBoxMediaPlayer.h =================================================================== RCS file: /cvsroot/xbplayer/XBMP/XBoxMediaPlayer.h,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 |
|
From: <rj...@us...> - 2003-11-15 10:46:54
|
Update of /cvsroot/xbplayer/XBMP In directory sc8-pr-cvs1:/tmp/cvs-serv3430 Modified Files: XBoxMediaPlayer.cpp Log Message: xbfilezilla added and upgraded to 8.7 - admin interface now works Index: XBoxMediaPlayer.cpp =================================================================== RCS file: /cvsroot/xbplayer/XBMP/XBoxMediaPlayer.cpp,v retrieving revision 1.199 retrieving revision 1.200 diff -C2 -d -r1.199 -r1.200 *** XBoxMediaPlayer.cpp 29 Oct 2003 18:41:56 -0000 1.199 --- XBoxMediaPlayer.cpp 15 Nov 2003 10:46:51 -0000 1.200 *************** *** 47,51 **** #include <io.h> #include <xfont.h> ! #include "lib/XBFileZilla.h" #include "libGoAhead/WebServer.h" #include "libfribidi/fribidi.h" --- 47,51 ---- #include <io.h> #include <xfont.h> ! #include "libFilezilla/XBFileZilla.h" #include "libGoAhead/WebServer.h" #include "libfribidi/fribidi.h" |