Merge branch 'Bett-2012' of github.com:Sankore/Sankore-3.1 into Bett-2012

preferencesAboutTextFull
shibakaneki 13 years ago
commit f2948758c6
  1. 1
      src/gui/UBMediaPlayer.cpp
  2. 1
      src/gui/UBTeacherBarWidget.cpp

@ -242,7 +242,6 @@ void UBMediaPlayer::setFile(const QString &fileName)
{ {
setWindowTitle(fileName.right(fileName.length() - fileName.lastIndexOf('/') - 1)); setWindowTitle(fileName.right(fileName.length() - fileName.lastIndexOf('/') - 1));
m_MediaObject.setCurrentSource(Phonon::MediaSource(fileName)); m_MediaObject.setCurrentSource(Phonon::MediaSource(fileName));
m_MediaObject.play();
} }
void UBMediaPlayer::setLocation(const QString& location) void UBMediaPlayer::setLocation(const QString& location)

@ -567,7 +567,6 @@ void UBTeacherBarDropMediaZone::addMedia(QString pMediaPath)
else if(mimeType.contains("video") || mimeType.contains("audio")){ else if(mimeType.contains("video") || mimeType.contains("audio")){
UBMediaPlayer* mediaPlayer = new UBMediaPlayer(); UBMediaPlayer* mediaPlayer = new UBMediaPlayer();
mediaPlayer->setFile(pMediaPath); mediaPlayer->setFile(pMediaPath);
mediaPlayer->playPause();
mWidget->addWidget(mediaPlayer); mWidget->addWidget(mediaPlayer);
mWidgetList << mediaPlayer; mWidgetList << mediaPlayer;
} }

Loading…
Cancel
Save