X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/55196c5464563deb1caddc4893cddc1ba1e1db3b..8b089c5e8c8a2140258d150ca1ce42afd3b79e1b:/utils/wxMMedia2/board/mmboard.cpp

diff --git a/utils/wxMMedia2/board/mmboard.cpp b/utils/wxMMedia2/board/mmboard.cpp
index c0144f26aa..f20d3ea6d9 100644
--- a/utils/wxMMedia2/board/mmboard.cpp
+++ b/utils/wxMMedia2/board/mmboard.cpp
@@ -71,35 +71,44 @@
 class MMBoardFrame : public wxFrame
 {
 public:
-  // ctor(s)
-  MMBoardFrame(const wxString& title, const wxPoint& pos, const wxSize& size);
-  // dtor
-  ~MMBoardFrame();
-
-  // event handlers
-  void OnQuit(wxCommandEvent& event);
-  void OnAbout(wxCommandEvent& event);
-  void OnOpen(wxCommandEvent& event);
-  void OnPlay(wxCommandEvent& event);
-  void OnStop(wxCommandEvent& event);
-  void OnPause(wxCommandEvent& event);
-  void OnRefreshInfo(wxEvent& event);
-
-private:
-  // any class wishing to process wxWindows events must use this macro
-  DECLARE_EVENT_TABLE()
-  
+    // ctor(s)
+    MMBoardFrame(const wxString& title, const wxPoint& pos, const wxSize& size);
+    // dtor
+    ~MMBoardFrame();
+    
+    // event handlers
+    void OnQuit(wxCommandEvent& event);
+    void OnAbout(wxCommandEvent& event);
+    void OnOpen(wxCommandEvent& event);
+    void OnPlay(wxCommandEvent& event);
+    void OnStop(wxCommandEvent& event);
+    void OnPause(wxCommandEvent& event);
+    void OnEject(wxCommandEvent& event);
+    void OnRefreshInfo(wxEvent& event);
+    void OnSetPosition(wxCommandEvent& event);
+    
+    void OpenVideoWindow();
+    void CloseVideoWindow();
+    
 private:
-  void UpdateMMedInfo(); 
-  void UpdateInfoText();
-
-  MMBoardFile *m_opened_file;
-
-  wxSlider *m_positionSlider;
-  wxBitmapButton *m_playButton, *m_pauseButton, *m_stopButton, *m_ejectButton;
-  wxStaticText *m_fileType, *m_infoText;
+    // any class wishing to process wxWindows events must use this macro
+    DECLARE_EVENT_TABLE()
 
-  wxTimer *m_refreshTimer;
+private:
+    void UpdateMMedInfo(); 
+    void UpdateInfoText();
+    
+    MMBoardFile *m_opened_file;
+    
+    wxSlider *m_positionSlider;
+    wxBitmapButton *m_playButton, *m_pauseButton, *m_stopButton, *m_ejectButton;
+    wxStaticText *m_fileType, *m_infoText;
+    wxWindow *m_video_window;
+    
+    wxPanel *m_panel;
+    wxSizer *m_sizer;
+    
+    wxTimer *m_refreshTimer;
 };
 
 // ----------------------------------------------------------------------------
@@ -133,6 +142,8 @@ BEGIN_EVENT_TABLE(MMBoardFrame, wxFrame)
   EVT_BUTTON(MMBoard_PlayButton, MMBoardFrame::OnPlay)
   EVT_BUTTON(MMBoard_StopButton, MMBoardFrame::OnStop)
   EVT_BUTTON(MMBoard_PauseButton, MMBoardFrame::OnPause)
+  EVT_BUTTON(MMBoard_EjectButton, MMBoardFrame::OnEject)  
+  EVT_SLIDER(MMBoard_PositionSlider, MMBoardFrame::OnSetPosition)
   EVT_CUSTOM(wxEVT_TIMER, MMBoard_RefreshInfo, MMBoardFrame::OnRefreshInfo)
 END_EVENT_TABLE()
 
@@ -182,37 +193,38 @@ bool MMBoardApp::OnInit()
 
 wxUint8 MMBoardApp::TestMultimediaCaps()
 {
-  wxSoundStream *dev;
-  wxUint8 caps;
-
-  caps = 0;
-
+    wxSoundStream *dev;
+    wxUint8 caps;
+    
+    caps = 0;
+    
 #ifdef __UNIX__
-  // We test the OSS (Open Sound System) support.
-
-  dev = new wxSoundStreamOSS();
-  if (dev->GetError() == wxSOUND_NOERR) 
-    caps |= MM_SOUND_OSS;
-  delete dev;
-
-  // We now test the ESD support
-
-  dev = new wxSoundStreamESD();
-  if (dev->GetError() == wxSOUND_NOERR)
-    caps |= MM_SOUND_ESD;
-  delete dev;
+    // We now test the ESD support
+    
+    dev = new wxSoundStreamESD();
+    if (dev->GetError() == wxSOUND_NOERROR) 
+        caps |= MM_SOUND_ESD;
+    delete dev;
+    
+    // We test the OSS (Open Sound System) support.
+    // WARNING: There is a conflict between ESD and ALSA
+    
+    dev = new wxSoundStreamOSS();
+    if (dev->GetError() == wxSOUND_NOERROR)
+        caps |= MM_SOUND_OSS;
+    delete dev;
 #endif
-
+    
 #ifdef __WIN32__
-  // We test the Windows sound support.
+    // We test the Windows sound support.
 
-  dev = new wxSoundStreamWin();
-  if (dev->GetError() == wxSOUND_NOERR)
-    caps |= MM_SOUND_WIN;
-  delete dev;
+    dev = new wxSoundStreamWin();
+    if (dev->GetError() == wxSOUND_NOERR)
+        caps |= MM_SOUND_WIN;
+    delete dev;
 #endif
-
-  return caps;
+    
+    return caps;
 }
 
 // ----------------------------------------------------------------------------
@@ -233,20 +245,20 @@ MMBoardFrame::MMBoardFrame(const wxString& title, const wxPoint& pos, const wxSi
     SetIcon(wxICON(mondrian));
 
     // create a menu bar
-    wxMenu *menuFile = new wxMenu(_T(""), wxMENU_TEAROFF);
+    wxMenu *menuFile = new wxMenu(wxT(""), wxMENU_TEAROFF);
 
     // the "About" item should be in the help menu
     wxMenu *helpMenu = new wxMenu;
-    helpMenu->Append(MMBoard_About, _T("&About...\tCtrl-A"), _T("Show about dialog"));
+    helpMenu->Append(MMBoard_About, wxT("&About...\tCtrl-A"), wxT("Show about dialog"));
 
-    menuFile->Append(MMBoard_Open, _T("&Open\tAlt-O"), _T("Open file"));
+    menuFile->Append(MMBoard_Open, wxT("&Open\tAlt-O"), wxT("Open file"));
     menuFile->AppendSeparator();
-    menuFile->Append(MMBoard_Quit, _T("E&xit\tAlt-X"), _T("Quit this program"));
+    menuFile->Append(MMBoard_Quit, wxT("E&xit\tAlt-X"), wxT("Quit this program"));
 
     // now append the freshly created menu to the menu bar...
     wxMenuBar *menuBar = new wxMenuBar();
-    menuBar->Append(menuFile, _T("&File"));
-    menuBar->Append(helpMenu, _T("&Help"));
+    menuBar->Append(menuFile, wxT("&File"));
+    menuBar->Append(helpMenu, wxT("&Help"));
 
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);
@@ -254,28 +266,29 @@ MMBoardFrame::MMBoardFrame(const wxString& title, const wxPoint& pos, const wxSi
 #if wxUSE_STATUSBAR
     // create a status bar just for fun (by default with 1 pane only)
     CreateStatusBar(3);
-    SetStatusText(_T("Welcome to wxWindows!"));
+    SetStatusText(wxT("Welcome to wxWindows!"));
 #endif // wxUSE_STATUSBAR
 
     // Misc variables
     m_opened_file = NULL;
 
-    wxPanel *panel = new wxPanel(this, -1);
+    m_panel = new wxPanel(this, -1);
 
     // Initialize main slider
-    m_positionSlider = new wxSlider( panel, MMBoard_PositionSlider, 0, 0, 60,
+    m_positionSlider = new wxSlider( m_panel, MMBoard_PositionSlider, 0, 0, 60,
 				     wxDefaultPosition, wxSize(300, -1),
 				     wxSL_HORIZONTAL | wxSL_AUTOTICKS);
     m_positionSlider->SetPageSize(60);  // 60 secs
-
+    m_positionSlider->Enable(FALSE);
+    
     // Initialize info panel
-    wxPanel *infoPanel = new wxPanel( panel, -1);
+    wxPanel *infoPanel = new wxPanel( m_panel, -1);
     infoPanel->SetBackgroundColour(*wxBLACK);
     infoPanel->SetForegroundColour(*wxWHITE);
 
     wxBoxSizer *infoSizer = new wxBoxSizer(wxVERTICAL);
 
-    m_fileType = new wxStaticText(infoPanel, -1, _T(""));
+    m_fileType = new wxStaticText(infoPanel, -1, wxT(""));
     wxStaticLine *line = new wxStaticLine(infoPanel, -1);
     m_infoText = new wxStaticText(infoPanel, -1, "");
 
@@ -296,13 +309,13 @@ MMBoardFrame::MMBoardFrame(const wxString& title, const wxPoint& pos, const wxSi
     wxBitmap *eject_bmp = new wxBitmap(eject_xpm);
     wxBitmap *pause_bmp = new wxBitmap(pause_xpm);
 
-    m_playButton = new wxBitmapButton(panel, MMBoard_PlayButton, *play_bmp);
+    m_playButton = new wxBitmapButton(m_panel, MMBoard_PlayButton, *play_bmp);
     m_playButton->Enable(FALSE);
-    m_pauseButton = new wxBitmapButton(panel, MMBoard_PauseButton, *pause_bmp);
+    m_pauseButton = new wxBitmapButton(m_panel, MMBoard_PauseButton, *pause_bmp);
     m_pauseButton->Enable(FALSE);
-    m_stopButton = new wxBitmapButton(panel, MMBoard_StopButton, *stop_bmp);
+    m_stopButton = new wxBitmapButton(m_panel, MMBoard_StopButton, *stop_bmp);
     m_stopButton->Enable(FALSE);
-    m_ejectButton = new wxBitmapButton(panel, MMBoard_EjectButton, *eject_bmp);
+    m_ejectButton = new wxBitmapButton(m_panel, MMBoard_EjectButton, *eject_bmp);
     m_ejectButton->Enable(FALSE);
     
     buttonSizer->Add(m_playButton, 0, wxALL, 2);
@@ -311,29 +324,59 @@ MMBoardFrame::MMBoardFrame(const wxString& title, const wxPoint& pos, const wxSi
     buttonSizer->Add(m_ejectButton, 0, wxALL, 2);
 
     // Top sizer
-    wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
-    sizer->Add(new wxStaticLine(panel, -1), 0, wxGROW | wxCENTRE, 0);
-    sizer->Add(m_positionSlider, 0, wxCENTRE | wxGROW | wxALL, 2);
-    sizer->Add(new wxStaticLine(panel, -1), 0, wxGROW | wxCENTRE, 0);
-    sizer->Add(buttonSizer, 0, wxALL, 0);
-    sizer->Add(new wxStaticLine(panel, -1), 0, wxGROW | wxCENTRE, 0);
-    sizer->Add(infoPanel, 1, wxCENTRE | wxGROW, 0);
-    
-    panel->SetSizer(sizer);
-    panel->SetAutoLayout(TRUE);
-    sizer->Fit(this);
-    sizer->SetSizeHints(this);
+    m_sizer = new wxBoxSizer(wxVERTICAL);
+    m_sizer->Add(new wxStaticLine(m_panel, -1), 0, wxGROW | wxCENTRE, 0);
+    m_sizer->Add(m_positionSlider, 0, wxCENTRE | wxGROW | wxALL, 2);
+    m_sizer->Add(new wxStaticLine(m_panel, -1), 0, wxGROW | wxCENTRE, 0);
+    m_sizer->Add(buttonSizer, 0, wxALL, 0);
+    m_sizer->Add(new wxStaticLine(m_panel, -1), 0, wxGROW | wxCENTRE, 0);
+    m_sizer->Add(infoPanel, 1, wxCENTRE | wxGROW, 0);
+    
+    m_panel->SetSizer(m_sizer);
+    m_panel->SetAutoLayout(TRUE);
+    m_sizer->Fit(this);
+    m_sizer->SetSizeHints(this);
 
     // Timer
     m_refreshTimer = new wxTimer(this, MMBoard_RefreshInfo);
+
+    // Video window
+    m_video_window = NULL;
+
+    // Multimedia file
+    m_opened_file = NULL;
 }
 
 MMBoardFrame::~MMBoardFrame()
 {
-  if (m_opened_file)
-    delete m_opened_file;
+    if (m_opened_file)
+        delete m_opened_file;
+    
+    delete m_refreshTimer;
+}
 
-  delete m_refreshTimer;
+void MMBoardFrame::OpenVideoWindow()
+{
+  if (m_video_window)
+    return;
+
+  m_video_window = new wxWindow(m_panel, -1, wxDefaultPosition, wxSize(200, 200));
+  m_video_window->SetBackgroundColour(*wxBLACK);
+  m_sizer->Prepend(m_video_window, 2, wxGROW | wxSHRINK | wxCENTRE, 1);
+
+  m_sizer->Fit(this);
+}
+
+void MMBoardFrame::CloseVideoWindow()
+{
+    if (!m_video_window)
+        return;
+    
+    m_sizer->Remove(m_video_window);
+    delete m_video_window;
+    m_video_window = NULL;
+    
+    m_sizer->Fit(this);
 }
 
 // event handlers
@@ -347,79 +390,97 @@ void MMBoardFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 void MMBoardFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
     wxString msg;
-    msg.Printf( _T("wxWindows Multimedia board v1.0a, wxMMedia v2.0a:\n")
-                _T("an example of the capabilities of the wxWindows multimedia classes.\n")
-		_T("Copyright 1999, 2000, Guilhem Lavaux.\n"));
+    msg.Printf( wxT("wxWindows Multimedia board v1.0a, wxMMedia v2.0a:\n")
+                wxT("an example of the capabilities of the wxWindows multimedia classes.\n")
+		wxT("Copyright 1999, 2000, Guilhem Lavaux.\n"));
  
     wxMessageBox(msg, "About MMBoard", wxOK | wxICON_INFORMATION, this);
 }
 
 void MMBoardFrame::OnOpen(wxCommandEvent& WXUNUSED(event))
 {
-  wxString selected_file;
-
-  // select a file to be opened
-  selected_file = wxLoadFileSelector("multimedia", "*", NULL, this);
-  if (selected_file.IsNull())
-    return;
-
-  m_opened_file = MMBoardManager::Open(selected_file);
-
-  // Change the range values of the slider.
-  MMBoardTime length;
-
-  length = m_opened_file->GetLength();
-  m_positionSlider->SetRange(0, length.hours * 3600 + length.minutes * 60 + length.seconds);
-
-  // Update misc info
-  UpdateMMedInfo();
- 
-  SetStatusText(selected_file, 2);
-
-  // Update info text
-  UpdateInfoText();
-
-  // Enable a few buttons
-  m_playButton->Enable(TRUE);
-  m_ejectButton->Enable(TRUE);
+    wxString selected_file;
+    
+    if (m_opened_file) {
+        if (!m_opened_file->IsStopped()) {
+            wxCommandEvent event2;
+            OnStop(event2);
+        }
+        delete m_opened_file;
+    }
+    
+    // select a file to be opened
+    selected_file = wxLoadFileSelector("multimedia", "*", NULL, this);
+    if (selected_file.IsNull())
+        return;
+    
+    m_opened_file = MMBoardManager::Open(selected_file);
+    
+    // Change the range values of the slider.
+    MMBoardTime length;
+    
+    length = m_opened_file->GetLength();
+    m_positionSlider->SetRange(0, length.hours * 3600 + length.minutes * 60 + length.seconds);
+    
+    // Update misc info
+    UpdateMMedInfo();
+    
+    SetStatusText(selected_file, 2);
+  
+    // Update info text
+    UpdateInfoText();
+    
+    // Enable a few buttons
+    m_playButton->Enable(TRUE);
+    m_ejectButton->Enable(TRUE);
+    m_positionSlider->Enable(TRUE);
+    
+    if (m_opened_file->NeedWindow()) {
+        OpenVideoWindow();
+        m_opened_file->SetWindow(m_video_window);
+    } else
+        CloseVideoWindow();
 }
 
 void MMBoardFrame::UpdateInfoText()
 {
-  wxString infotext1, infotext2;
-
-  if (m_opened_file) {
-    infotext1 = _T("File type:\n\t");
-    infotext1 += m_opened_file->GetStringType() + _T("\n");
-
-    infotext2 = _T("File informations:\n\n");
-    infotext2 += m_opened_file->GetStringInformation();
-  } else {
-    infotext1 = _T("File type: \n\tNo file opened");
-    infotext2 = _T("File informations:\nNo information\n\n\n\n\n");
-  }
-
-  m_fileType->SetLabel(infotext1);
-  m_infoText->SetLabel(infotext2);
+    wxString infotext1, infotext2;
+    
+    if (m_opened_file) {
+        infotext1 = wxT("File type:\n\t");
+        infotext1 += m_opened_file->GetStringType() + wxT("\n");
+        
+        infotext2 = wxT("File informations:\n\n");
+        infotext2 += m_opened_file->GetStringInformation();
+    } else {
+        infotext1 = wxT("File type: \n\tNo file opened");
+        infotext2 = wxT("File informations:\nNo information\n\n\n\n\n");
+    }
+    
+    m_fileType->SetLabel(infotext1);
+    m_infoText->SetLabel(infotext2);
 }
 
 void MMBoardFrame::UpdateMMedInfo()
 {
-  wxString temp_string;
-  MMBoardTime current, length;
-
-  if (m_opened_file) {
-    current = m_opened_file->GetPosition();
-    length  = m_opened_file->GetLength();
-  }
-
-  // We refresh the status bar
-  temp_string.Printf("%02d:%02d / %02d:%02d", current.hours * 60 + current.minutes,
-		     current.seconds, length.hours * 60 + length.minutes, length.seconds);
-  SetStatusText(temp_string, 1);
+    wxString temp_string;
+    MMBoardTime current, length;
+    
+    if (m_opened_file) {
+        current = m_opened_file->GetPosition();
+        length  = m_opened_file->GetLength();
+    } else {
+        current.hours = current.minutes = current.seconds = 0;
+        length = current;
+    }
 
-  // We set the slider position
-  m_positionSlider->SetValue(current.hours * 3600 + current.minutes * 60 + current.seconds);
+    // We refresh the status bar
+    temp_string.Printf(wxT("%02d:%02d / %02d:%02d"), current.hours * 60 + current.minutes,
+                       current.seconds, length.hours * 60 + length.minutes, length.seconds);
+    SetStatusText(temp_string, 1);
+    
+    // We set the slider position
+    m_positionSlider->SetValue(current.hours * 3600 + current.minutes * 60 + current.seconds);
 }
 
 // ----------------------------------------------------------------------------
@@ -427,42 +488,83 @@ void MMBoardFrame::UpdateMMedInfo()
 
 void MMBoardFrame::OnRefreshInfo(wxEvent& WXUNUSED(event))
 {
-  UpdateMMedInfo();
-
-  if (m_opened_file->IsStopped()) {
-    m_refreshTimer->Stop();
-    m_playButton->Enable(TRUE);
-    m_stopButton->Enable(FALSE);
-    m_pauseButton->Enable(FALSE);
-  }
+    UpdateMMedInfo();
+    
+    if (m_opened_file->IsStopped()) {
+        m_refreshTimer->Stop();
+        m_playButton->Enable(TRUE);
+        m_stopButton->Enable(FALSE);
+        m_pauseButton->Enable(FALSE);
+    }
 }
 
 void MMBoardFrame::OnPlay(wxCommandEvent& WXUNUSED(event))
 {
-  m_refreshTimer->Start(1000, FALSE);
+    m_stopButton->Enable(TRUE);
+    m_pauseButton->Enable(TRUE);
+    m_playButton->Enable(FALSE);
+    
+    if (m_opened_file->IsPaused()) {
+        m_opened_file->Resume();
+        return;
+    }
+    
+    m_refreshTimer->Start(1000, FALSE);
+    
+    m_opened_file->Play();
+    
+    m_stopButton->Enable(TRUE);
+    m_pauseButton->Enable(TRUE);
+    m_playButton->Enable(FALSE);
+}
 
-  m_opened_file->Play();
+void MMBoardFrame::OnStop(wxCommandEvent& WXUNUSED(event))
+{
+    m_opened_file->Stop();
+    m_refreshTimer->Stop();
 
-  m_stopButton->Enable(TRUE);
-  m_pauseButton->Enable(TRUE);
-  m_playButton->Enable(FALSE);
+    m_stopButton->Enable(FALSE);
+    m_playButton->Enable(TRUE);
+    
+    UpdateMMedInfo();
 }
 
-void MMBoardFrame::OnStop(wxCommandEvent& WXUNUSED(event))
+void MMBoardFrame::OnPause(wxCommandEvent& WXUNUSED(event))
 {
-  m_opened_file->Stop();
-  m_refreshTimer->Stop();
+    m_opened_file->Pause();
+    
+    m_playButton->Enable(TRUE);
+    m_pauseButton->Enable(FALSE);
+}
+
+void MMBoardFrame::OnEject(wxCommandEvent& WXUNUSED(event))
+{
+    m_opened_file->Stop();
 
-  m_stopButton->Enable(FALSE);
-  m_playButton->Enable(TRUE);
+    delete m_opened_file;
+    m_opened_file = NULL;
+    
+    m_playButton->Enable(FALSE);
+    m_pauseButton->Enable(FALSE);
+    m_stopButton->Enable(FALSE);
+    m_ejectButton->Enable(FALSE);
+    m_positionSlider->Enable(FALSE);
 
-  UpdateMMedInfo();
+    UpdateInfoText();
+    UpdateMMedInfo();
 }
 
-void MMBoardFrame::OnPause(wxCommandEvent& WXUNUSED(event))
+void MMBoardFrame::OnSetPosition(wxCommandEvent& WXUNUSED(event))
 {
-  m_opened_file->Pause();
+    wxUint32 itime;
+    MMBoardTime btime;
+    
+    itime = m_positionSlider->GetValue();
+    btime.seconds = itime % 60;
+    btime.minutes = (itime / 60) % 60;
+    btime.hours = itime / 3600;
+    m_opened_file->SetPosition(btime);
 
-  m_playButton->Enable(TRUE);
-  m_pauseButton->Enable(FALSE);
+    UpdateMMedInfo();
 }
+