Prepare release

MBach · Feb 21, 2016 · 4544582 · 4544582
1 parent 58e301b
commit 4544582
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 7 deletions.
diff --git a/src/Player/mainwindow.cpp b/src/Player/mainwindow.cpp
@@ -511,7 +511,6 @@ void MainWindow::activateView(QAction *menuAction)
 	_shortcutPlayPause->disconnect();
 	_shortcutStop->disconnect();
 	_shortcutSkipForward->disconnect();
-	qDebug() << Q_FUNC_INFO << _currentView->mediaPlayerControl();
 	connect(_shortcutSkipBackward, &QxtGlobalShortcut::activated, _currentView->mediaPlayerControl(), &MediaPlayerControl::skipBackward);
 	connect(_shortcutPlayPause, &QxtGlobalShortcut::activated, _currentView->mediaPlayerControl(), &MediaPlayerControl::togglePlayback);
 	connect(_shortcutStop, &QxtGlobalShortcut::activated, _currentView->mediaPlayerControl(), &MediaPlayerControl::stop);

diff --git a/src/Player/pluginmanager.cpp b/src/Player/pluginmanager.cpp
@@ -138,7 +138,6 @@ bool PluginManager::loadPlugin(const QString &pluginAbsPath)
 void PluginManager::registerExtensionPoint(QPair<QString, QObjectList> ext)
 {
 	for (QObject *instance : ext.second) {
-		qDebug() << Q_FUNC_INFO << ext.first << instance;
 		_extensionPoints.insert(ext.first, instance);
 	}
 

diff --git a/src/Player/views/viewloader.cpp b/src/Player/views/viewloader.cpp
@@ -45,7 +45,6 @@ AbstractView* ViewLoader::load(AbstractView *currentView, const QString &menuAct
 void ViewLoader::attachPluginToBuiltInView(AbstractView *view)
 {
 	QPair<QString, QObjectList> extensionPoints = view->extensionPoints();
-	qDebug() << Q_FUNC_INFO << extensionPoints.first << extensionPoints.second;
 	if (!extensionPoints.first.isEmpty()) {
 		_pluginManager->registerExtensionPoint(extensionPoints);
 	}
@@ -83,7 +82,6 @@ AbstractView* ViewLoader::loadFromPlugin(AbstractView *currentView, const QStrin
 		// Check if we need to pass some objects from old view to new view, because new one can be brought by plugins
 		// For example, a plugin may need the MediaPlayerControl from the current view
 		if (MediaPlayerPlugin *mediaPlayerPlugin = qobject_cast<MediaPlayerPlugin*>(plugin)) {
-			qDebug() << Q_FUNC_INFO << mediaPlayerPlugin;
 			mediaPlayerPlugin->setMediaPlayerControl(currentView->mediaPlayerControl());
 			if (mediaPlayerPlugin->hasView()) {
 				view = mediaPlayerPlugin->instanciateView();

diff --git a/src/TabPlaylists/playlist.cpp b/src/TabPlaylists/playlist.cpp
@@ -224,7 +224,6 @@ void Playlist::dragLeaveEvent(QDragLeaveEvent *event)
 
 void Playlist::startDrag(Qt::DropActions)
 {
-	qDebug() << Q_FUNC_INFO;
 	_isDragging = true;
 	QByteArray itemData;
 	//QDataStream dataStream(&itemData, QIODevice::WriteOnly);

diff --git a/src/TabPlaylists/playlistmodel.cpp b/src/TabPlaylists/playlistmodel.cpp
@@ -48,7 +48,6 @@ bool PlaylistModel::insertMedias(int rowIndex, const QList<TrackDAO> &tracks)
 	int c = this->rowCount();
 	for (int i = 0; i < tracks.size(); i++) {
 		TrackDAO track = tracks.at(i);
-		qDebug() << track.host();
 		this->createLine(rowIndex + i, track);
 	}
 	return c < this->rowCount();

diff --git a/src/UniqueLibrary/uniquelibrary.cpp b/src/UniqueLibrary/uniquelibrary.cpp
@@ -194,6 +194,10 @@ bool UniqueLibrary::playSingleTrack(const QModelIndex &index)
 
 void UniqueLibrary::setMusicSearchEngine(MusicSearchEngine *musicSearchEngine)
 {
+	if (_currentTrack) {
+		delete _currentTrack;
+		_currentTrack = nullptr;
+	}
 	connect(musicSearchEngine, &MusicSearchEngine::aboutToSearch, this, [=]() {
 
 		QVBoxLayout *vbox = new QVBoxLayout;

diff --git a/src/UniqueLibrary/uniquelibrarymediaplayercontrol.cpp b/src/UniqueLibrary/uniquelibrarymediaplayercontrol.cpp
@@ -46,7 +46,6 @@ void UniqueLibraryMediaPlayerControl::skipBackward()
 
 void UniqueLibraryMediaPlayerControl::skipForward()
 {
-	qDebug() << Q_FUNC_INFO;
 	mediaPlayer()->blockSignals(true);
 
 	if (_uniqueLibrary->currentTrack()) {