@@ -31,7 +31,7 @@ Venturous - version 1.1
Venturous is a random playback manager, which uses media player's
command line interface. Currently only Audacious media player is
supported, but adding support for other players should be quite simple.
- Venturous is built around one feature, which is missing in most
+
Venturous is built around one feature, which is missing from most
(maybe even all) media players: user-defined items for random playback. This
feature is especially useful for grouping separate tracks that are
actually parts of one composition. For example, parts of classical music
diff --git a/src/Application.cpp b/src/Application.cpp
index a71ac7d..cb7ecbc 100644
--- a/src/Application.cpp
+++ b/src/Application.cpp
@@ -26,7 +26,7 @@
Application::Application(int & argc, char ** argv) : QApplication(argc, argv)
{
- setApplicationVersion("1.1");
+ setApplicationVersion("1.1.1");
setAttribute(Qt::AA_DontShowIconsInMenus, false);
setQuitOnLastWindowClosed(false);
}
diff --git a/src/GUI/MainWindow/PlaybackComponent/PlaybackComponent.cpp b/src/GUI/MainWindow/PlaybackComponent/PlaybackComponent.cpp
index f5b6ed7..23c0ddc 100644
--- a/src/GUI/MainWindow/PlaybackComponent/PlaybackComponent.cpp
+++ b/src/GUI/MainWindow/PlaybackComponent/PlaybackComponent.cpp
@@ -194,7 +194,9 @@ void PlaybackComponent::onPlayerFinished(
const bool crashExit, const int exitCode,
std::vector missingFilesAndDirs)
{
+ bool normalExit = true;
if (crashExit || exitCode != 0) {
+ normalExit = false;
QString message =
tr("%1 %2 with exit code %3.")
.arg(QtUtilities::toQString(MediaPlayer::playerName()),
@@ -207,6 +209,7 @@ void PlaybackComponent::onPlayerFinished(
}
if (! missingFilesAndDirs.empty()) {
+ normalExit = false;
QString message = tr("No such files or directories (%1):")
.arg(missingFilesAndDirs.size());
for (const std::string & s : missingFilesAndDirs)
@@ -219,6 +222,13 @@ void PlaybackComponent::onPlayerFinished(
}
}
+ if (normalExit && ! isPlayerRunning_) {
+ if (! criticalContinuePlaybackQuestion(
+ tr("Error has occured"), QString())) {
+ return;
+ }
+ }
+
actions_.next->trigger();
}
@@ -231,13 +241,16 @@ void PlaybackComponent::onPlayerError(std::string errorMessage)
}
bool PlaybackComponent::criticalContinuePlaybackQuestion(
- const QString & title, const QString & errorMessage)
+ const QString & title, QString errorMessage)
{
+ if (! errorMessage.isEmpty())
+ errorMessage += "\n\t";
+ errorMessage += tr("Continue playback?");
setPlayerState(false);
const auto selectedButton =
- inputController_.showMessage(
- title, errorMessage + tr("\n\tContinue playback?"),
- QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
+ inputController_.showMessage(title, errorMessage,
+ QMessageBox::Yes | QMessageBox::No,
+ QMessageBox::No);
return selectedButton == QMessageBox::Yes;
}
diff --git a/src/GUI/MainWindow/PlaybackComponent/PlaybackComponent.hpp b/src/GUI/MainWindow/PlaybackComponent/PlaybackComponent.hpp
index 04eda7f..33c9ef3 100644
--- a/src/GUI/MainWindow/PlaybackComponent/PlaybackComponent.hpp
+++ b/src/GUI/MainWindow/PlaybackComponent/PlaybackComponent.hpp
@@ -93,8 +93,8 @@ class PlaybackComponent : public QObject
/// @param title Title of the message box.
/// @param errorMessage Message to be displayed before question.
/// @return true if playback should be continued.
- bool criticalContinuePlaybackQuestion(
- const QString & title, const QString & errorMessage);
+ bool criticalContinuePlaybackQuestion(const QString & title,
+ QString errorMessage);
/// @brief Starts playing entry. Does not call historyWidget_.push().
/// NOTE: does not block execution.