[Xbyamp-cvs] xbmp/player/UI AudioSettingsInterface.cpp,1.1,1.2 AudioSettingsInterface.h,1.1,1.2 Cali
Status: Pre-Alpha
Brought to you by:
yamp
Menu
▾
▴
[Xbyamp-cvs] xbmp/player/UI AudioSettingsInterface.cpp,1.1,1.2 AudioSettingsInterface.h,1.1,1.2 CalibrateInterface.cpp,1.2,1.3 ClipInterface.cpp,1.1,1.2 PhotoInterface.cpp,1.1,1.2 RatioInterface.cpp,1.1,1.2 ScreenInterface.cpp,1.1,1.2 SettingsInterface.cpp,1.1,1.2 SettingsInterface.h,1.1,1.2
|
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 ;
};
|
