From 4c4d569b35d0a8c0671c4858bd0d3fe1eb5e4d14 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Fri, 13 Jan 2012 11:09:14 +0100 Subject: [PATCH] Enabled UBMediaMidget --- src/customWidgets/UBMediaWidget.cpp | 1 - src/gui/UBTeacherBarWidget.cpp | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/customWidgets/UBMediaWidget.cpp b/src/customWidgets/UBMediaWidget.cpp index 24be6760..9dc0a8d0 100644 --- 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); } diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index a718a40a..0f439cf7 100644 --- 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(); - //UBMediaWidget* mediaPlayer = new UBMediaWidget(mimeType.contains("audio")?eMediaType_Audio:eMediaType_Video); + //UBMediaPlayer* mediaPlayer = new UBMediaPlayer(); + UBMediaWidget* mediaPlayer = new UBMediaWidget(mimeType.contains("audio")?eMediaType_Audio:eMediaType_Video); mediaPlayer->setFile(url); pW = mediaPlayer; }