Enabled UBMediaMidget

4c4d569b · shibakaneki · 78562cd4 · 4c4d569b · 4c4d569b
Commit 4c4d569b authored Jan 13, 2012 by shibakaneki
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

UBMediaWidget.cpp src/customWidgets/UBMediaWidget.cpp +0 -1

UBTeacherBarWidget.cpp src/gui/UBTeacherBarWidget.cpp +2 -2

No files found.
--- a/src/customWidgets/UBMediaWidget.cpp
+++ b/src/customWidgets/UBMediaWidget.cpp
@@ -49,7 +49,6 @@ UBMediaWidget::~UBMediaWidget()
    DELETEPTR(mpPlayStopButton);
    DELETEPTR(mpAudioOutput);
    DELETEPTR(mpVideoWidget);
-    DELETEPTR(mpVideoContainer);
    DELETEPTR(mpMediaObject);
 }

--- a/src/gui/UBTeacherBarWidget.cpp
+++ b/src/gui/UBTeacherBarWidget.cpp
@@ -1235,8 +1235,8 @@ QWidget* UBTBMediaContainer::generateMediaWidget(const QString& url)
        pW = label;
    }
    else if(mimeType.contains("video") || mimeType.contains("audio")){
-        UBMediaPlayer* mediaPlayer = new UBMediaPlayer();
+        //UBMediaPlayer* mediaPlayer = new UBMediaPlayer();
-        //UBMediaWidget* mediaPlayer = new UBMediaWidget(mimeType.contains("audio")?eMediaType_Audio:eMediaType_Video);
+        UBMediaWidget* mediaPlayer = new UBMediaWidget(mimeType.contains("audio")?eMediaType_Audio:eMediaType_Video);
        mediaPlayer->setFile(url);
        pW = mediaPlayer;
    }