Changed : "Pause" message in OSD stay until play command

Fixed   : improved DVD resume
Added   : debug messages with OSD
Added   : command line switch to set http webserver port
Changed : background for Shockwave, hack to run in "show all" mode


git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@2011 10f7b99b-c216-0410-bff0-8a66a9350fd8

1 files changed, 7 insertions, 0 deletions

diff --git a/src/apps/mplayerc/VMROSD.h b/src/apps/mplayerc/VMROSD.h
index 58dc78fa0..1a8d9b4f4 100644
--- a/src/apps/mplayerc/VMROSD.h
+++ b/src/apps/mplayerc/VMROSD.h
@@ -36,6 +36,7 @@ typedef enum
     OSD_TEXT,

     OSD_BAR,

     OSD_CURSOR,

+	OSD_DEBUGCLR,

     OSD_LAST

 } OSD_COLORS;

 

@@ -44,6 +45,7 @@ typedef enum
     OSD_NOMESSAGE,

     OSD_TOPLEFT,

     OSD_TOPRIGHT,

+	OSD_DEBUG,

 } OSD_MESSAGEPOS;

 

 

@@ -58,6 +60,7 @@ public:
     void Stop();

 

     void DisplayMessage (OSD_MESSAGEPOS nPos, LPCTSTR strMsg, int nDuration = 5000, int FontSize = 0, CString OSD_Font = _T(""));

+	void DebugMessage( LPCTSTR format, ... );

     void ClearMessage();

 

     __int64 GetPos();

@@ -86,6 +89,8 @@ private :
     CPen	m_penCursor;

     CBrush	m_brushBack;

     CBrush	m_brushBar;

+	CPen	m_debugPenBorder;

+	CBrush	m_debugBrushBack;

     int		m_FontSize;

     CString m_OSD_Font;

 

@@ -105,6 +110,7 @@ private :
     // Messages

     CString		m_strMessage;

     OSD_MESSAGEPOS	m_nMessagePos;

+	CList<CString>  m_debugMessages;

 

     void UpdateBitmap();

     void CalcRect();

@@ -113,6 +119,7 @@ private :
     void DrawRect(CRect* rect, CBrush* pBrush = NULL, CPen* pPen = NULL);

     void Invalidate();

     void DrawMessage();

+	void DrawDebug();

 

     static void CALLBACK TimerFunc(HWND hWnd, UINT nMsg, UINT nIDEvent, DWORD dwTime);