Warning fixes, source cleaning.

[wxWidgets.git] / contrib / src / mmedia / vidwin.cpp

diff --git a/contrib/src/mmedia/vidwin.cpp b/contrib/src/mmedia/vidwin.cpp
index 1d9bf5c7c11a5a991c523e6a31635b014bdf3c0a..ddfe966bf859cc74adeb0487704eed6e62359e55 100644 (file)
--- a/contrib/src/mmedia/vidwin.cpp
+++ b/contrib/src/mmedia/vidwin.cpp
@@ -18,7 +18,9 @@
 #include "wx/wx.h"
 #endif
 
 #include "wx/wx.h"
 #endif
 

-#if defined(__WINDOWS__) && !defined(__GNUWIN32__) && !defined(__WATCOMC__)
+#if defined(__WINDOWS__) && !defined(__MINGW32__) && !defined(__WATCOMC__)
+// versions of Open Watcom and MinGW tested against this source does not
+// deliver "digitalv.h" required in this feature

 
 #ifdef __BORLANDC__
     #pragma hdrstop
 
 #ifdef __BORLANDC__
     #pragma hdrstop


@@ -47,10 +49,10 @@ wxVideoWindows::wxVideoWindows(wxInputStream& str)
   : wxVideoBaseDriver(str)
 {
     m_internal    = new wxVIDWinternal;
   : wxVideoBaseDriver(str)
 {
     m_internal    = new wxVIDWinternal;

-    m_remove_file = TRUE;
+    m_remove_file = true;

     m_filename    = wxGetTempFileName(_T("wxvid"));
     m_filename    = wxGetTempFileName(_T("wxvid"));

-    m_paused      = FALSE;
-    m_stopped     = TRUE;
+    m_paused      = false;
+    m_stopped     = true;

     m_frameRate   = 1.0;
     
     wxFileOutputStream temp_file(m_filename);
     m_frameRate   = 1.0;
     
     wxFileOutputStream temp_file(m_filename);


@@ -63,10 +65,10 @@ wxVideoWindows::wxVideoWindows(const wxString& filename)
   : wxVideoBaseDriver(filename)
 {
     m_internal    = new wxVIDWinternal;
   : wxVideoBaseDriver(filename)
 {
     m_internal    = new wxVIDWinternal;

-    m_remove_file = FALSE;
+    m_remove_file = false;

     m_filename    = filename;
     m_filename    = filename;

-    m_paused      = FALSE;
-    m_stopped     = TRUE;
+    m_paused      = false;
+    m_stopped     = true;

     m_frameRate   = 1.0;
     OpenFile();
 }
     m_frameRate   = 1.0;
     OpenFile();
 }


@@ -86,11 +88,11 @@ void wxVideoWindows::OpenFile()
     MCI_STATUS_PARMS statusStruct;
 
     openStruct.lpstrDeviceType = _T("avivideo");
     MCI_STATUS_PARMS statusStruct;
 
     openStruct.lpstrDeviceType = _T("avivideo");

-    openStruct.lpstrElementName = (wxChar *)m_filename.mb_str().data();
+    openStruct.lpstrElementName = (wxChar *)m_filename.c_str();

     openStruct.hWndParent = 0;
     
     mciSendCommand(0, MCI_OPEN,
     openStruct.hWndParent = 0;
     
     mciSendCommand(0, MCI_OPEN,

-                        MCI_OPEN_ELEMENT|MCI_DGV_OPEN_PARENT|MCI_OPEN_TYPE|MCI_DGV_OPEN_32BIT,
+             MCI_OPEN_ELEMENT|MCI_DGV_OPEN_PARENT|MCI_OPEN_TYPE|MCI_DGV_OPEN_32BIT,

                          (DWORD)(LPVOID)&openStruct);
     m_internal->m_dev_id = openStruct.wDeviceID;
 
                          (DWORD)(LPVOID)&openStruct);
     m_internal->m_dev_id = openStruct.wDeviceID;
 


@@ -120,16 +122,16 @@ void wxVideoWindows::OpenFile()
 bool wxVideoWindows::Pause()
 {
     if (m_paused || m_stopped)
 bool wxVideoWindows::Pause()
 {
     if (m_paused || m_stopped)

-        return TRUE;
-    m_paused = TRUE;
+        return true;
+    m_paused = true;

     return (mciSendCommand(m_internal->m_dev_id, MCI_PAUSE, MCI_WAIT, 0) == 0);
 }
 
 bool wxVideoWindows::Resume()
 {
     if (!m_paused || m_stopped)
     return (mciSendCommand(m_internal->m_dev_id, MCI_PAUSE, MCI_WAIT, 0) == 0);
 }
 
 bool wxVideoWindows::Resume()
 {
     if (!m_paused || m_stopped)

-        return TRUE;
-    m_paused = FALSE;
+        return true;
+    m_paused = false;

     return (mciSendCommand(m_internal->m_dev_id, MCI_RESUME, 0, 0) == 0);
 }
 
     return (mciSendCommand(m_internal->m_dev_id, MCI_RESUME, 0, 0) == 0);
 }
 


@@ -147,15 +149,15 @@ bool wxVideoWindows::GetSize(wxSize& size) const
 {
     size.SetWidth(200);
     size.SetHeight(200);
 {
     size.SetWidth(200);
     size.SetHeight(200);

-    return TRUE;
+    return true;

 }
 
 bool wxVideoWindows::SetSize(wxSize WXUNUSED(size))
 {
 }
 
 bool wxVideoWindows::SetSize(wxSize WXUNUSED(size))
 {

-    return TRUE;
+    return true;

 }
 
 }
 

-bool wxVideoWindows::IsCapable(wxVideoType v_type)
+bool wxVideoWindows::IsCapable(wxVideoType v_type) const

 {
     return (v_type == wxVIDEO_MSAVI);
 }
 {
     return (v_type == wxVIDEO_MSAVI);
 }


@@ -165,12 +167,12 @@ bool wxVideoWindows::AttachOutput(wxWindow& output)
     MCI_DGV_WINDOW_PARMS win_struct;
     
     if (!wxVideoBaseDriver::AttachOutput(output))
     MCI_DGV_WINDOW_PARMS win_struct;
     
     if (!wxVideoBaseDriver::AttachOutput(output))

-        return FALSE;
+        return false;

     
     win_struct.hWnd = (HWND)output.GetHWND();
     mciSendCommand(m_internal->m_dev_id, MCI_WINDOW,
     
     win_struct.hWnd = (HWND)output.GetHWND();
     mciSendCommand(m_internal->m_dev_id, MCI_WINDOW,

-                  MCI_DGV_WINDOW_HWND, (DWORD)(LPVOID)&win_struct);
-    return TRUE;
+           MCI_DGV_WINDOW_HWND, (DWORD)(LPVOID)&win_struct);
+    return true;

 }
 
 void wxVideoWindows::DetachOutput()
 }
 
 void wxVideoWindows::DetachOutput()


@@ -181,14 +183,14 @@ void wxVideoWindows::DetachOutput()
     
     win_struct.hWnd = 0;
     mciSendCommand(m_internal->m_dev_id, MCI_WINDOW,
     
     win_struct.hWnd = 0;
     mciSendCommand(m_internal->m_dev_id, MCI_WINDOW,

-                  MCI_DGV_WINDOW_HWND, (DWORD)(LPVOID)&win_struct);
+           MCI_DGV_WINDOW_HWND, (DWORD)(LPVOID)&win_struct);

 }
 
 bool wxVideoWindows::Play()
 {
     if (!m_stopped)
 }
 
 bool wxVideoWindows::Play()
 {
     if (!m_stopped)

-        return FALSE;
-    m_stopped = FALSE;
+        return false;
+    m_stopped = false;

     return (mciSendCommand(m_internal->m_dev_id, MCI_PLAY, 0, NULL) == 0);
 }
 
     return (mciSendCommand(m_internal->m_dev_id, MCI_PLAY, 0, NULL) == 0);
 }
 


@@ -197,10 +199,10 @@ bool wxVideoWindows::Stop()
     MCI_SEEK_PARMS seekStruct;
 
     if (m_stopped)
     MCI_SEEK_PARMS seekStruct;
 
     if (m_stopped)

-        return FALSE;
-    m_stopped = TRUE;
+        return false;
+    m_stopped = true;

     if (::mciSendCommand(m_internal->m_dev_id, MCI_STOP, MCI_WAIT, NULL) != 0)
     if (::mciSendCommand(m_internal->m_dev_id, MCI_STOP, MCI_WAIT, NULL) != 0)

-      return FALSE;
+      return false;

 
     seekStruct.dwCallback = 0;
     seekStruct.dwTo = 0;
 
     seekStruct.dwCallback = 0;
     seekStruct.dwTo = 0;