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

src/gui/UBMediaPlayer.cpp

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

src/gui/UBTeacherBarWidget.cpp

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