[Xbyamp-cvs] xbmp/player buildtime.h,1.7,1.8 FileRelax.cpp,1.3,1.4 streaming.cpp,1.3,1.4 XBoxMediaPlayer.cpp,1.14,1.15 XBoxMediaPlayer.h,1.8,1.9

[<ya...@us...>]

Update of /cvsroot/xbyamp/xbmp/player
In directory sc8-pr-cvs1:/tmp/cvs-serv25608

Modified Files:
	buildtime.h FileRelax.cpp streaming.cpp XBoxMediaPlayer.cpp 
	XBoxMediaPlayer.h 
Log Message:
fixed hanging when playing mpeg1 over relax @ and of file

Index: buildtime.h
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/buildtime.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** buildtime.h	5 Dec 2002 16:15:31 -0000	1.7
--- buildtime.h	5 Dec 2002 18:07:45 -0000	1.8
***************
*** 1,4 ****
  #ifndef BUILD_TIME_H
  #define BUILD_TIME_H
! #define BUILD_TIME L"build:5-dec-2002 17:00"
  #endif
--- 1,4 ----
  #ifndef BUILD_TIME_H
  #define BUILD_TIME_H
! #define BUILD_TIME L"build:5-dec-2002 19:00"
  #endif

Index: FileRelax.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/FileRelax.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FileRelax.cpp	5 Dec 2002 16:15:31 -0000	1.3
--- FileRelax.cpp	5 Dec 2002 18:07:46 -0000	1.4
***************
*** 118,123 ****
  		char result[32];
  
! 		send(m_socket,"CLSE",4,0);
! 		recv(m_socket,result,32,0);
  		closesocket(m_socket);	
  	}
--- 118,124 ----
  		char result[32];
  
! 		int iBytesSend=send(m_socket,"CLSE",4,0);
! 		int iBytesRecv=recv(m_socket,result,32,0);
! 		
  		closesocket(m_socket);	
  	}

Index: streaming.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/streaming.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** streaming.cpp	5 Dec 2002 16:15:31 -0000	1.3
--- streaming.cpp	5 Dec 2002 18:07:46 -0000	1.4
***************
*** 193,207 ****
  {
  	m_eventStarted.Set();
! 	while (!m_bStop)
  	{
! 
! 		while ( Need2Refill() && !m_bEOFReached)
  		{
  			m_eventNeedFilling.Wait();
  			Fill();
  		}
- 		Need2Refill() ;
- 			m_eventNeedFilling.Wait();
  	}
  	mp_msg(0,0,"process done");
  }
--- 193,211 ----
  {
  	m_eventStarted.Set();
! 	while (!m_bStop && !m_bEOFReached)
  	{
! 		if ( Need2Refill() )
  		{
  			m_eventNeedFilling.Wait();
  			Fill();
  		}
  	}
+ 	if (m_pFile)
+ 	{
+ 		m_pFile->Close();
+ 		delete m_pFile;
+ 	}
+ 	m_pFile=NULL;
+ 
  	mp_msg(0,0,"process done");
  }

Index: XBoxMediaPlayer.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/XBoxMediaPlayer.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** XBoxMediaPlayer.cpp	5 Dec 2002 16:15:31 -0000	1.14
--- XBoxMediaPlayer.cpp	5 Dec 2002 18:07:46 -0000	1.15
***************
*** 1090,1093 ****
--- 1090,1102 ----
  				m_pd3dDevice->BlockUntilVerticalBlank();
  			}
+ 			else
+ 			{
+ 				CMovieInterface* pInterface=(CMovieInterface* )m_pUserInterfaces[m_appState];
+ 				// when control panel is visible:
+ 				if (pInterface->IsControlPanelVisible())
+ 				{
+ 					m_pd3dDevice->BlockUntilVerticalBlank();
+ 				}
+ 			}
  		}
  	}

Index: XBoxMediaPlayer.h
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/XBoxMediaPlayer.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** XBoxMediaPlayer.h	4 Dec 2002 20:57:52 -0000	1.8
--- XBoxMediaPlayer.h	5 Dec 2002 18:07:47 -0000	1.9
***************
*** 134,137 ****
--- 134,139 ----
  	virtual void						SetTime(uint64_t);
  	virtual void						OnPlaybackComplete();
+ 	void										OnFastBackward();
+ 	void										OnFastForward();
  
  	CMediaPlayer*						m_pMediaPlayer;
***************
*** 157,162 ****
  	BOOL										GetAlbumTexture(CHAR* szThumbnailPath, LPCSTR szPath);
  	VOID										GetThumbnailFile(CHAR* szThumbnailPath, CHAR* szItemPath);
- 	void										OnFastBackward();
- 	void										OnFastForward();
  	void										OnKey(char chKey);
  	BOOL										InitializeNetwork();
--- 159,162 ----