AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Applied patch [ 795423 ] Unicode and warning fixes in contrib/mmedia lib and sample

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23502 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2003-09-11 09:55:21 +00:00
parent c3f815fa63
commit 2bbf230a16
6 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/include/wx/mmedia/sndwin.h
View File

@ -24,7 +24,7 @@ class WXDLLIMPEXP_MMEDIA wxSoundStreamWin : public wxSoundStream {
wxSoundStream& Write(const void *buffer, wxUint32 len); wxSoundStream& Write(const void *buffer, wxUint32 len);
wxSoundStream& Read(void *buffer, wxUint32 len); wxSoundStream& Read(void *buffer, wxUint32 len);
bool SetSoundFormat(wxSoundFormatBase& base); bool SetSoundFormat(const wxSoundFormatBase& base);
bool StartProduction(int evt); bool StartProduction(int evt);
bool StopProduction(); bool StopProduction();

2
contrib/include/wx/mmedia/vidwin.h
View File

@ -90,7 +90,7 @@ public:
// Return the total number of frames in the movie // Return the total number of frames in the movie
wxUint32 GetNbFrames() const; wxUint32 GetNbFrames() const;
bool IsCapable(wxVideoType v_type); bool IsCapable(wxVideoType v_type) const;
bool AttachOutput(wxWindow& output); bool AttachOutput(wxWindow& output);
void DetachOutput(void); void DetachOutput(void);

23
contrib/samples/mmedia/mmbman.cpp
View File

@ -248,7 +248,7 @@ bool MMBoardSoundFile::NeedWindow()
return FALSE; return FALSE;
} }
void MMBoardSoundFile::SetWindow(wxWindow *window) void MMBoardSoundFile::SetWindow(wxWindow *WXUNUSED(window))
{ {
} }
@ -277,14 +277,25 @@ wxString MMBoardSoundFile::GetStringType()
switch (m_file_type) { switch (m_file_type) {
case MMBoard_WAVE: case MMBoard_WAVE:
return wxString(wxT("WAVE file")); return wxString(wxT("WAVE file"));
#if 0
// break is not reachable after return
break; break;
#endif
case MMBoard_AIFF: case MMBoard_AIFF:
return wxString(wxT("AIFF file")); return wxString(wxT("AIFF file"));
#if 0
// break is not reachable after return
break; break;
#endif
#if 0
// default moved outside switch for those compilers
// which complain about lack of return in function
default: default:
return wxString(wxT("Unknown file")); return wxString(wxT("Unknown file"));
break; break;
#endif
} }
return wxString(wxT("Unknown file"));
} }
wxString MMBoardSoundFile::GetStringInformation() wxString MMBoardSoundFile::GetStringInformation()
@ -419,7 +430,7 @@ MMBoardTime MMBoardVideoFile::GetLength()
return btime; return btime;
} }
void MMBoardVideoFile::SetPosition(MMBoardTime btime) void MMBoardVideoFile::SetPosition(MMBoardTime WXUNUSED(btime))
{ {
} }
@ -443,12 +454,12 @@ wxString MMBoardVideoFile::GetStringInformation()
wxString info; wxString info;
info = wxT("Video codec: "); info = wxT("Video codec: ");
info += m_video_driver->GetMovieCodec() + "\n"; info += m_video_driver->GetMovieCodec() + _T("\n");
info += wxT("Audio codec: "); info += wxT("Audio codec: ");
info += m_video_driver->GetAudioCodec(); info += m_video_driver->GetAudioCodec();
info += wxString::Format(" Sample rate: %d Channels: %d\n", m_video_driver->GetSampleRate(), info += wxString::Format(_T(" Sample rate: %d Channels: %d\n"), m_video_driver->GetSampleRate(),
m_video_driver->GetBPS()); m_video_driver->GetBPS());
info += wxString::Format(" Frame rate: %.01f", m_video_driver->GetFrameRate()); info += wxString::Format(_T(" Frame rate: %.01f"), m_video_driver->GetFrameRate());
return info; return info;
} }
@ -509,7 +520,7 @@ wxSoundStream *MMBoardManager::OpenSoundStream()
return new wxSoundStreamWin(); return new wxSoundStreamWin();
#endif #endif
wxMessageBox("You are trying to open a multimedia but you have not devices", "Error", wxOK | wxICON_ERROR, NULL); wxMessageBox(_T("You are trying to open a multimedia but you have not devices"), _T("Error"), wxOK | wxICON_ERROR, NULL);
return NULL; return NULL;
} }

18
contrib/samples/mmedia/mmboard.cpp
View File

@ -164,7 +164,7 @@ IMPLEMENT_APP(MMBoardApp)
bool MMBoardApp::OnInit() bool MMBoardApp::OnInit()
{ {
// create the main application window // create the main application window
MMBoardFrame *frame = new MMBoardFrame("Multimedia Board", MMBoardFrame *frame = new MMBoardFrame(_T("Multimedia Board"),
wxPoint(50, 50), wxSize(450, 340)); wxPoint(50, 50), wxSize(450, 340));
// and show it (the frames, unlike simple controls, are not shown when // and show it (the frames, unlike simple controls, are not shown when
@ -174,16 +174,16 @@ bool MMBoardApp::OnInit()
m_caps = TestMultimediaCaps(); m_caps = TestMultimediaCaps();
if (!m_caps) { if (!m_caps) {
wxMessageBox("Your system has no multimedia capabilities. We are exiting now.", "Major error !", wxOK | wxICON_ERROR, NULL); wxMessageBox(_T("Your system has no multimedia capabilities. We are exiting now."), _T("Major error !"), wxOK | wxICON_ERROR, NULL);
return FALSE; return FALSE;
} }
wxString msg; wxString msg;
msg.Printf("Detected : %s%s%s", (m_caps & MM_SOUND_OSS) ? "OSS " : "", msg.Printf(_T("Detected : %s%s%s"), (m_caps & MM_SOUND_OSS) ? _T("OSS ") : _T(""),
(m_caps & MM_SOUND_ESD) ? "ESD " : "", (m_caps & MM_SOUND_ESD) ? _T("ESD ") : _T(""),
(m_caps & MM_SOUND_WIN) ? "WIN" : ""); (m_caps & MM_SOUND_WIN) ? _T("WIN") : _T(""));
wxMessageBox(msg, "Good !", wxOK | wxICON_INFORMATION, NULL); wxMessageBox(msg, _T("Good !"), wxOK | wxICON_INFORMATION, NULL);
// success: wxApp::OnRun() will be called which will enter the main message // success: wxApp::OnRun() will be called which will enter the main message
// loop and the application will run. If we returned FALSE here, the // loop and the application will run. If we returned FALSE here, the
@ -298,7 +298,7 @@ MMBoardFrame::MMBoardFrame(const wxString& title, const wxPoint& pos, const wxSi
m_fileType = new wxStaticText(infoPanel, -1, wxT("")); m_fileType = new wxStaticText(infoPanel, -1, wxT(""));
wxStaticLine *line = new wxStaticLine(infoPanel, -1); wxStaticLine *line = new wxStaticLine(infoPanel, -1);
m_infoText = new wxStaticText(infoPanel, -1, ""); m_infoText = new wxStaticText(infoPanel, -1, _T(""));
UpdateInfoText(); UpdateInfoText();
@ -402,7 +402,7 @@ void MMBoardFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
wxT("an example of the capabilities of the wxWindows multimedia classes.\n") wxT("an example of the capabilities of the wxWindows multimedia classes.\n")
wxT("Copyright 1999, 2000, Guilhem Lavaux.\n")); wxT("Copyright 1999, 2000, Guilhem Lavaux.\n"));
wxMessageBox(msg, "About MMBoard", wxOK | wxICON_INFORMATION, this); wxMessageBox(msg, _T("About MMBoard"), wxOK | wxICON_INFORMATION, this);
} }
void MMBoardFrame::OnOpen(wxCommandEvent& WXUNUSED(event)) void MMBoardFrame::OnOpen(wxCommandEvent& WXUNUSED(event))
@ -418,7 +418,7 @@ void MMBoardFrame::OnOpen(wxCommandEvent& WXUNUSED(event))
} }
// select a file to be opened // select a file to be opened
selected_file = wxLoadFileSelector("multimedia", "*", NULL, this); selected_file = wxLoadFileSelector(_T("multimedia"), _T("*"), NULL, this);
if (selected_file.IsNull()) if (selected_file.IsNull())
return; return;

2
contrib/src/mmedia/sndwin.cpp
View File

@ -693,7 +693,7 @@ void wxSoundStreamWin::NotifyDoneBuffer(wxUint32 WXUNUSED(dev_handle), int flag)
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
// SetSoundFormat() // SetSoundFormat()
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
bool wxSoundStreamWin::SetSoundFormat(wxSoundFormatBase& base) bool wxSoundStreamWin::SetSoundFormat(const wxSoundFormatBase& base)
{ {
// TODO: detect best format // TODO: detect best format
return wxSoundStream::SetSoundFormat(base); return wxSoundStream::SetSoundFormat(base);

2
contrib/src/mmedia/vidwin.cpp
View File

@ -155,7 +155,7 @@ 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);
} }