[Xbyamp-cvs] xbmp/player/UI AlbumInterface.cpp,1.1,1.2 ArtistInterface.cpp,1.1,1.2 AudioSettingsInte
Status: Pre-Alpha
Brought to you by:
yamp
Update of /cvsroot/xbyamp/xbmp/player/UI
In directory sc8-pr-cvs1:/tmp/cvs-serv26514/player/UI
Modified Files:
AlbumInterface.cpp ArtistInterface.cpp
AudioSettingsInterface.cpp AudioSettingsInterface.h
CalibrateInterface.cpp CatalogueInterface.cpp
ClipInterface.cpp GeneralSettingsInterface.cpp
HomeInterface.cpp LegacyCatalogue.cpp MovieInterface.cpp
PhotoInterface.cpp PhotoInterface.h RatioInterface.cpp
ScreenInterface.cpp SettingsInterface.cpp SettingsInterface.h
SongsInterface.cpp UMusic.cpp UMusic.h UPictures.cpp
UVideos.cpp
Log Message:
no message
Index: AlbumInterface.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/AlbumInterface.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AlbumInterface.cpp 28 Nov 2002 21:47:34 -0000 1.1
--- AlbumInterface.cpp 4 Dec 2002 20:56:31 -0000 1.2
***************
*** 5,12 ****
#include "AlbumInterface.h"
! #include "UI\LocalCatalogue.h"
! #include "UI\RemoteCatalogue.h"
! #include "XboxMediaPlayer.h"
#include "Crc32.h"
--- 5,12 ----
#include "AlbumInterface.h"
! #include "LocalCatalogue.h"
! #include "RemoteCatalogue.h"
! #include "..\XboxMediaPlayer.h"
#include "Crc32.h"
Index: ArtistInterface.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/ArtistInterface.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ArtistInterface.cpp 28 Nov 2002 21:47:34 -0000 1.1
--- ArtistInterface.cpp 4 Dec 2002 20:56:33 -0000 1.2
***************
*** 5,12 ****
#include "ArtistInterface.h"
! #include "UI\LocalCatalogue.h"
! #include "UI\RemoteCatalogue.h"
! #include "XboxMediaPlayer.h"
#define NETCACHE_PACKET_SIZE 28000
--- 5,12 ----
#include "ArtistInterface.h"
! #include "LocalCatalogue.h"
! #include "RemoteCatalogue.h"
! #include "..\XboxMediaPlayer.h"
#define NETCACHE_PACKET_SIZE 28000
Index: AudioSettingsInterface.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/AudioSettingsInterface.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AudioSettingsInterface.cpp 3 Dec 2002 17:47:04 -0000 1.2
--- AudioSettingsInterface.cpp 4 Dec 2002 20:56:36 -0000 1.3
***************
*** 3,15 ****
//////////////////////////////////////////////////////////////////////
! #include "XboxMediaPlayer.h"
#include "AudioSettingsInterface.h"
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
//////////////////////////////////////////////////////////////////////
! CAudioSettingsInterface::CAudioSettingsInterface(CAudioStreamChangedCallback* callback )
! :m_pCallback (callback )
{
--- 3,16 ----
//////////////////////////////////////////////////////////////////////
! #include "../XboxMediaPlayer.h"
#include "AudioSettingsInterface.h"
+ #include "../AudioStreamChangedCallback.h"
+ extern CAudioStreamChangedCallback* callback ;
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
//////////////////////////////////////////////////////////////////////
! CAudioSettingsInterface::CAudioSettingsInterface()
{
***************
*** 40,55 ****
return E_FAIL;
}
m_dhkStream.SetPosition(440,126);
- m_iCurrentStream=1;
- m_dhkStream.SetRange( 1, 10);
- m_dhkStream.SetValue( 1 );
return S_OK;
}
-
-
VOID CAudioSettingsInterface::OnActive(LPVOID lpvCookie)
{
}
--- 41,54 ----
return E_FAIL;
}
+
+ m_dhkStream.SetRange( 0, 3);
m_dhkStream.SetPosition(440,126);
return S_OK;
}
VOID CAudioSettingsInterface::OnActive(LPVOID lpvCookie)
{
+ m_dhkStream.SetValue( g_playerSettings.dwAudioStream );
}
***************
*** 76,79 ****
--- 75,80 ----
g_playerSettings.dwAudioStream = pThis->m_mapAudioStreams[pThis->m_iCurrentStream-1];
+ pThis->m_dhkStream.SetValue(pThis->m_iCurrentStream);
+ callback->OnAudioStreamChanged();
}
else if ((!bDown) && (pThis->m_iCurrentStream>1))
***************
*** 84,88 ****
pThis->m_dhkStream.SetValue(pThis->m_iCurrentStream);
! pThis->m_pCallback->OnAudioStreamChanged();
}
}
--- 85,89 ----
pThis->m_dhkStream.SetValue(pThis->m_iCurrentStream);
! callback->OnAudioStreamChanged();
}
}
***************
*** 103,107 ****
for (int i=0; i <=255; i++)
{
! if (m_pCallback->HasAudioStream(i) )
{
m_mapAudioStreams[iNumber]=i;
--- 104,108 ----
for (int i=0; i <=255; i++)
{
! if (callback->HasAudioStream(i) )
{
m_mapAudioStreams[iNumber]=i;
***************
*** 109,114 ****
}
}
- m_dhkStream.SetRange( 1, iNumber);
- m_dhkStream.SetValue(m_iCurrentStream);
CControl* pControl = m_pSettingsInterface->GetControlFromId(m_pSettingsInterface->GetFocusId());
if (!pControl)
--- 110,113 ----
***************
*** 150,152 ****
return S_OK;
}
-
--- 149,150 ----
Index: AudioSettingsInterface.h
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/AudioSettingsInterface.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AudioSettingsInterface.h 3 Dec 2002 17:47:04 -0000 1.2
--- AudioSettingsInterface.h 4 Dec 2002 20:56:39 -0000 1.3
***************
*** 15,27 ****
#include "Dohickey.h"
#include "../AudioStreamChangedCallback.h"
- class CSettingsInterface;
#include <map>
using namespace std;
class CAudioSettingsInterface : public CUserInterface
{
public:
! CAudioSettingsInterface(CAudioStreamChangedCallback* callback );
virtual ~CAudioSettingsInterface();
--- 15,28 ----
#include "Dohickey.h"
#include "../AudioStreamChangedCallback.h"
#include <map>
using namespace std;
+ class CSettingsInterface;
+
class CAudioSettingsInterface : public CUserInterface
{
public:
! CAudioSettingsInterface();
virtual ~CAudioSettingsInterface();
***************
*** 36,45 ****
private:
- int m_iCurrentStream;
CFont* m_pfntCommon13;
CDohickey m_dhkStream;
! CAudioStreamChangedCallback* m_pCallback ;
CSettingsInterface* m_pSettingsInterface;
map<int,int> m_mapAudioStreams;
typedef map<int,int> imapAudioStreams;
--- 37,47 ----
private:
CFont* m_pfntCommon13;
CDohickey m_dhkStream;
!
CSettingsInterface* m_pSettingsInterface;
+
+ int m_iCurrentStream;
map<int,int> m_mapAudioStreams;
typedef map<int,int> imapAudioStreams;
Index: CalibrateInterface.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/CalibrateInterface.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CalibrateInterface.cpp 3 Dec 2002 17:47:05 -0000 1.3
--- CalibrateInterface.cpp 4 Dec 2002 20:56:41 -0000 1.4
***************
*** 3,7 ****
//////////////////////////////////////////////////////////////////////
! #include "XboxMediaPlayer.h"
#include "CalibrateInterface.h"
#include "Configuration.h"
--- 3,7 ----
//////////////////////////////////////////////////////////////////////
! #include "../XboxMediaPlayer.h"
#include "CalibrateInterface.h"
#include "Configuration.h"
Index: CatalogueInterface.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/CatalogueInterface.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CatalogueInterface.cpp 28 Nov 2002 21:47:34 -0000 1.1
--- CatalogueInterface.cpp 4 Dec 2002 20:56:44 -0000 1.2
***************
*** 5,14 ****
#include "CatalogueInterface.h"
! #include "UI\LocalCatalogue.h"
! #include "UI\RemoteCatalogue.h"
! #include "XboxMediaPlayer.h"
#include "Crc32.h"
! #include "xbox/iosupport.h"
#define NETCACHE_PACKET_SIZE 28000
--- 5,14 ----
#include "CatalogueInterface.h"
! #include "LocalCatalogue.h"
! #include "RemoteCatalogue.h"
! #include "..\XboxMediaPlayer.h"
#include "Crc32.h"
! #include "../xbox/iosupport.h"
#define NETCACHE_PACKET_SIZE 28000
Index: ClipInterface.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/ClipInterface.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ClipInterface.cpp 3 Dec 2002 17:47:05 -0000 1.2
--- ClipInterface.cpp 4 Dec 2002 20:56:46 -0000 1.3
***************
*** 3,7 ****
//////////////////////////////////////////////////////////////////////
! #include "XboxMediaPlayer.h"
#include "ClipInterface.h"
--- 3,7 ----
//////////////////////////////////////////////////////////////////////
! #include "../XboxMediaPlayer.h"
#include "ClipInterface.h"
Index: GeneralSettingsInterface.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/GeneralSettingsInterface.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GeneralSettingsInterface.cpp 28 Nov 2002 21:47:34 -0000 1.1
--- GeneralSettingsInterface.cpp 4 Dec 2002 20:56:46 -0000 1.2
***************
*** 3,7 ****
//////////////////////////////////////////////////////////////////////
! #include "XboxMediaPlayer.h"
#include "GeneralSettingsInterface.h"
--- 3,7 ----
//////////////////////////////////////////////////////////////////////
! #include "../XboxMediaPlayer.h"
#include "GeneralSettingsInterface.h"
Index: HomeInterface.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/HomeInterface.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** HomeInterface.cpp 1 Dec 2002 18:17:12 -0000 1.2
--- HomeInterface.cpp 4 Dec 2002 20:56:47 -0000 1.3
***************
*** 3,9 ****
//////////////////////////////////////////////////////////////////////
! #include "XboxMediaPlayer.h"
#include "HomeInterface.h"
! #include "buildtime.h"
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
--- 3,9 ----
//////////////////////////////////////////////////////////////////////
! #include "../XboxMediaPlayer.h"
#include "HomeInterface.h"
! #include "..\buildtime.h"
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
Index: LegacyCatalogue.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/LegacyCatalogue.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LegacyCatalogue.cpp 28 Nov 2002 21:47:34 -0000 1.1
--- LegacyCatalogue.cpp 4 Dec 2002 20:56:48 -0000 1.2
***************
*** 6,10 ****
#include "Configuration.h"
! #include "Xbox\iso9660.h"
#define MAX_PATH_SIZE 256
--- 6,10 ----
#include "Configuration.h"
! #include "..\Xbox\iso9660.h"
#define MAX_PATH_SIZE 256
Index: MovieInterface.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/MovieInterface.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MovieInterface.cpp 2 Dec 2002 17:01:13 -0000 1.3
--- MovieInterface.cpp 4 Dec 2002 20:56:49 -0000 1.4
***************
*** 4,8 ****
#include "MovieInterface.h"
! #include "XboxMediaPlayer.h"
#include "Configuration.h"
--- 4,8 ----
#include "MovieInterface.h"
! #include "..\XboxMediaPlayer.h"
#include "Configuration.h"
Index: PhotoInterface.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/PhotoInterface.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PhotoInterface.cpp 3 Dec 2002 17:47:05 -0000 1.2
--- PhotoInterface.cpp 4 Dec 2002 20:56:50 -0000 1.3
***************
*** 4,8 ****
#include "PhotoInterface.h"
! #include "XboxMediaPlayer.h"
//////////////////////////////////////////////////////////////////////
--- 4,8 ----
#include "PhotoInterface.h"
! #include "..\XboxMediaPlayer.h"
//////////////////////////////////////////////////////////////////////
Index: PhotoInterface.h
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/PhotoInterface.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PhotoInterface.h 28 Nov 2002 21:47:34 -0000 1.1
--- PhotoInterface.h 4 Dec 2002 20:56:52 -0000 1.2
***************
*** 13,17 ****
#include "Font.h"
#include "JpegImage.h"
! #include "Xbox\Playlist.h"
class CApplication;
--- 13,17 ----
#include "Font.h"
#include "JpegImage.h"
! #include "..\Xbox\Playlist.h"
class CApplication;
Index: RatioInterface.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/RatioInterface.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RatioInterface.cpp 3 Dec 2002 17:47:05 -0000 1.2
--- RatioInterface.cpp 4 Dec 2002 20:57:01 -0000 1.3
***************
*** 3,7 ****
//////////////////////////////////////////////////////////////////////
! #include "XboxMediaPlayer.h"
#include "RatioInterface.h"
--- 3,7 ----
//////////////////////////////////////////////////////////////////////
! #include "..\XboxMediaPlayer.h"
#include "RatioInterface.h"
Index: ScreenInterface.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/ScreenInterface.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ScreenInterface.cpp 3 Dec 2002 17:47:05 -0000 1.2
--- ScreenInterface.cpp 4 Dec 2002 20:57:09 -0000 1.3
***************
*** 3,7 ****
//////////////////////////////////////////////////////////////////////
! #include "XboxMediaPlayer.h"
#include "ScreenInterface.h"
--- 3,7 ----
//////////////////////////////////////////////////////////////////////
! #include "..\XboxMediaPlayer.h"
#include "ScreenInterface.h"
Index: SettingsInterface.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/SettingsInterface.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SettingsInterface.cpp 3 Dec 2002 17:47:05 -0000 1.2
--- SettingsInterface.cpp 4 Dec 2002 20:57:11 -0000 1.3
***************
*** 3,7 ****
//////////////////////////////////////////////////////////////////////
! #include "XboxMediaPlayer.h"
#include "SettingsInterface.h"
--- 3,7 ----
//////////////////////////////////////////////////////////////////////
! #include "../XboxMediaPlayer.h"
#include "SettingsInterface.h"
***************
*** 10,15 ****
//////////////////////////////////////////////////////////////////////
! CSettingsInterface::CSettingsInterface(CAudioStreamChangedCallback* callback )
! :m_pcallback (callback )
{
m_uiState = IN_SETTINGS_GENERAL;
--- 10,14 ----
//////////////////////////////////////////////////////////////////////
! CSettingsInterface::CSettingsInterface()
{
m_uiState = IN_SETTINGS_GENERAL;
***************
*** 21,25 ****
}
! HRESULT CSettingsInterface::Create( LPDIRECT3DDEVICE8 pd3dDevice, CFontManager* pfntManager, LPVOID lpvCookie)
{
m_pd3dDevice = pd3dDevice;
--- 20,24 ----
}
! HRESULT CSettingsInterface::Create( LPDIRECT3DDEVICE8 pd3dDevice, CFontManager* pfntManager, LPVOID lpvCookie )
{
m_pd3dDevice = pd3dDevice;
***************
*** 67,72 ****
// Create Audio Settings User Interface
! m_pSettingsInterfaces[IN_SETTINGS_AUDIO] = new CAudioSettingsInterface(m_pcallback);
! if( FAILED( m_pSettingsInterfaces[IN_SETTINGS_AUDIO]->Create( m_pd3dDevice, pfntManager, this) ) )
{
OutputDebugString("Unable to create audio settings interface.\n");
--- 66,71 ----
// Create Audio Settings User Interface
! m_pSettingsInterfaces[IN_SETTINGS_AUDIO] = new CAudioSettingsInterface();
! if( FAILED( m_pSettingsInterfaces[IN_SETTINGS_AUDIO]->Create( m_pd3dDevice, pfntManager, this ) ) )
{
OutputDebugString("Unable to create audio settings interface.\n");
***************
*** 106,110 ****
m_bplSettings.SetPosition(66,120);
m_bplSettings.Render();
-
m_pfntCommon13->Begin();
--- 105,108 ----
***************
*** 204,214 ****
VOID CSettingsInterface::SendMessage(DWORD dwInterface, DWORD dwMessage, LPVOID lpvCookie)
{
- char szDebug[64];
- sprintf(szDebug,"Sending message to interface %u via settings interface.\n",dwInterface);
- OutputDebugString(szDebug);
-
m_pSettingsInterfaces[dwInterface]->OnMessage(dwMessage, lpvCookie);
-
- OutputDebugString("Message sent.\n");
}
--- 202,206 ----
Index: SettingsInterface.h
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/SettingsInterface.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SettingsInterface.h 3 Dec 2002 17:47:05 -0000 1.2
--- SettingsInterface.h 4 Dec 2002 20:57:13 -0000 1.3
***************
*** 18,22 ****
#include "AudioSettingsInterface.h"
#include "GeneralSettingsInterface.h"
! #include "../AudioStreamChangedCallback.h"
#define SETTINGS_INTERFACES 3
--- 18,22 ----
#include "AudioSettingsInterface.h"
#include "GeneralSettingsInterface.h"
!
#define SETTINGS_INTERFACES 3
***************
*** 30,37 ****
{
public:
! CSettingsInterface(CAudioStreamChangedCallback* callback );
virtual ~CSettingsInterface();
! HRESULT Create( LPDIRECT3DDEVICE8 pd3dDevice, CFontManager* pfntManager, LPVOID lpvCookie);
HRESULT FrameMove(XBGAMEPAD* pGamepad, XBIR_REMOTE* pRemote, LPDWORD pdwState);
HRESULT Render();
--- 30,37 ----
{
public:
! CSettingsInterface();
virtual ~CSettingsInterface();
! HRESULT Create( LPDIRECT3DDEVICE8 pd3dDevice, CFontManager* pfntManager, LPVOID lpvCookie );
HRESULT FrameMove(XBGAMEPAD* pGamepad, XBIR_REMOTE* pRemote, LPDWORD pdwState);
HRESULT Render();
***************
*** 48,56 ****
CSettingsPanel m_bplSettings;
CFont* m_pfntCommon13;
CApplication* m_pApplication;
DWORD m_uiState;
CUserInterface* m_pSettingsInterfaces[SETTINGS_INTERFACES];
- CAudioStreamChangedCallback* m_pcallback ;
};
--- 48,56 ----
CSettingsPanel m_bplSettings;
CFont* m_pfntCommon13;
+
CApplication* m_pApplication;
DWORD m_uiState;
CUserInterface* m_pSettingsInterfaces[SETTINGS_INTERFACES];
};
Index: SongsInterface.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/SongsInterface.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SongsInterface.cpp 28 Nov 2002 21:47:34 -0000 1.1
--- SongsInterface.cpp 4 Dec 2002 20:57:14 -0000 1.2
***************
*** 5,12 ****
#include "SongsInterface.h"
! #include "UI\LocalCatalogue.h"
! #include "UI\RemoteCatalogue.h"
! #include "XboxMediaPlayer.h"
#define NETCACHE_PACKET_SIZE 28000
--- 5,12 ----
#include "SongsInterface.h"
! #include "LocalCatalogue.h"
! #include "RemoteCatalogue.h"
! #include "..\XboxMediaPlayer.h"
#define NETCACHE_PACKET_SIZE 28000
Index: UMusic.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/UMusic.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** UMusic.cpp 1 Dec 2002 16:21:48 -0000 1.2
--- UMusic.cpp 4 Dec 2002 20:57:19 -0000 1.3
***************
*** 4,8 ****
#include "UMusic.h"
! #include "XboxMediaPlayer.h"
#include "MusicPanel.h"
--- 4,8 ----
#include "UMusic.h"
! #include "..\XboxMediaPlayer.h"
#include "MusicPanel.h"
Index: UMusic.h
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/UMusic.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** UMusic.h 28 Nov 2002 21:47:34 -0000 1.1
--- UMusic.h 4 Dec 2002 20:57:25 -0000 1.2
***************
*** 10,19 ****
#endif // _MSC_VER > 1000
! #include "UI\CatalogueInterface.h"
! #include "UI\Configuration.h"
! #include "UI\AlbumInterface.h"
! #include "UI\ArtistInterface.h"
! #include "UI\SongsInterface.h"
#define MUSIC_INTERFACES 4
--- 10,19 ----
#endif // _MSC_VER > 1000
! #include "CatalogueInterface.h"
! #include "Configuration.h"
! #include "AlbumInterface.h"
! #include "ArtistInterface.h"
! #include "SongsInterface.h"
#define MUSIC_INTERFACES 4
Index: UPictures.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/UPictures.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** UPictures.cpp 28 Nov 2002 21:47:34 -0000 1.1
--- UPictures.cpp 4 Dec 2002 20:57:35 -0000 1.2
***************
*** 5,9 ****
#include "UPictures.h"
#include "PicturePanel.h"
! #include "XboxMediaPlayer.h"
//////////////////////////////////////////////////////////////////////
--- 5,9 ----
#include "UPictures.h"
#include "PicturePanel.h"
! #include "..\XboxMediaPlayer.h"
//////////////////////////////////////////////////////////////////////
Index: UVideos.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/UI/UVideos.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** UVideos.cpp 1 Dec 2002 16:21:48 -0000 1.2
--- UVideos.cpp 4 Dec 2002 20:57:36 -0000 1.3
***************
*** 5,9 ****
#include "UVideos.h"
#include "VideoPanel.h"
! #include "XboxMediaPlayer.h"
//////////////////////////////////////////////////////////////////////
--- 5,9 ----
#include "UVideos.h"
#include "VideoPanel.h"
! #include "..\XboxMediaPlayer.h"
//////////////////////////////////////////////////////////////////////
|