makefiles changes (@top_srcdir@ adjusted)

[wxWidgets.git] / utils / wxMMedia2 / sample / test_med2.cpp

diff --git a/utils/wxMMedia2/sample/test_med2.cpp b/utils/wxMMedia2/sample/test_med2.cpp
index 22d240a36fb939fe0e6b894c7b41a390ec934bf1..26b7dfaaf235c703a220ecd3657c0e6372c44ae5 100644 (file)
--- a/utils/wxMMedia2/sample/test_med2.cpp
+++ b/utils/wxMMedia2/sample/test_med2.cpp
@@ -9,14 +9,16 @@
 #include <wx/wfstream.h>
 #include <wx/frame.h>
 #include "../lib/sndoss.h"
+#include "../lib/sndesd.h"
 #include "../lib/sndwav.h"
 #include "../lib/sndaiff.h"
 
 class MyApp: public wxApp {
  bool OnInit() {
-   wxSoundStreamOSS *oss_dev = new wxSoundStreamOSS();
+//   wxSoundStreamOSS *oss_dev = new wxSoundStreamOSS();
+   wxSoundStreamESD *oss_dev = new wxSoundStreamESD();
    wxFileInputStream *f_input = new wxFileInputStream(argv[1]);
-   wxSoundWave *wav_file = new wxSoundWave(*f_input, *oss_dev);
+   wxSoundFileStream *wav_file;
    wxFrame *frame = new wxFrame(NULL, -1, "My Frame");
    wxSoundFormatPcm pcm;
 
@@ -25,6 +27,13 @@ class MyApp: public wxApp {
      return FALSE;
    }
 
+   wav_file = new wxSoundWave(*f_input, *oss_dev);
+   if (!wav_file->CanRead()) {
+     wav_file = new wxSoundAiff(*f_input, *oss_dev);
+     if (!wav_file->CanRead())
+       return FALSE;
+   }
+
    wav_file->Play();
    frame->Show(TRUE);
    return TRUE;