Add a "Stopped" notification that's different from "Playlist finished".

src/mainwindow.cpp

@@ -208,6 +208,7 @@ MainWindow::MainWindow(QNetworkAccessManager* network, Engine::Type engine, QWid
 
   connect(player_, SIGNAL(Paused()), osd_, SLOT(Paused()));
   connect(player_, SIGNAL(Stopped()), osd_, SLOT(Stopped()));
+  connect(player_, SIGNAL(PlaylistFinished()), osd_, SLOT(PlaylistFinished()));
   connect(player_, SIGNAL(VolumeChanged(int)), osd_, SLOT(VolumeChanged(int)));
   connect(player_, SIGNAL(VolumeChanged(int)), ui_.volume, SLOT(setValue(int)));
   connect(player_, SIGNAL(ForceShowOSD(Song)), SLOT(ForceShowOSD(Song)));

src/osd.cpp

@@ -31,6 +31,7 @@ OSD::OSD(QSystemTrayIcon* tray_icon, QObject* parent)
     show_on_volume_change_(false),
     show_art_(true),
     force_show_next_(false),
+    ignore_next_stopped_(false),
     pretty_popup_(new OSDPretty)
 {
   ReloadSettings();
@@ -80,6 +81,18 @@ void OSD::Paused() {
 }
 
 void OSD::Stopped() {
+  if (ignore_next_stopped_) {
+    ignore_next_stopped_ = false;
+    return;
+  }
+
+  ShowMessage(QCoreApplication::applicationName(), tr("Stopped"));
+}
+
+void OSD::PlaylistFinished() {
+  // We get a PlaylistFinished followed by a Stopped from the player
+  ignore_next_stopped_ = true;
+
   ShowMessage(QCoreApplication::applicationName(), tr("Playlist finished"));
 }
 

src/osd.h

@@ -64,6 +64,7 @@ class OSD : public QObject {
   void SongChanged(const Song& song);
   void Paused();
   void Stopped();
+  void PlaylistFinished();
   void VolumeChanged(int value);
 
  private:
@@ -90,6 +91,7 @@ class OSD : public QObject {
   bool show_art_;
 
   bool force_show_next_;
+  bool ignore_next_stopped_;
 
   OSDPretty* pretty_popup_;
 

src/player.cpp

@@ -159,6 +159,7 @@ void Player::NextItem(Engine::TrackChangeType change) {
   int i = playlist_->next_index();
   playlist_->set_current_index(i);
   if (i == -1) {
+    emit PlaylistFinished();
     Stop();
     return;
   }

src/player.h

@@ -127,6 +127,7 @@ class Player : public QObject {
   void Playing();
   void Paused();
   void Stopped();
+  void PlaylistFinished();
   void VolumeChanged(int volume);
   void Error(const QString& message);
 

src/translations/cs.po

@@ -294,6 +294,10 @@ msgstr ""
 msgid "Paused"
 msgstr "Pozastaveno"
 
+#, fuzzy
+msgid "Stopped"
+msgstr "Zastavit"
+
 msgid "Playlist finished"
 msgstr "Dokončen seznam skladeb"
 

src/translations/de.po

@@ -292,6 +292,10 @@ msgstr "Stück %1"
 msgid "Paused"
 msgstr "Pausiert"
 
+#, fuzzy
+msgid "Stopped"
+msgstr "Anhalten"
+
 msgid "Playlist finished"
 msgstr "Wiedergabeliste beendet"
 

src/translations/el.po

@@ -295,6 +295,10 @@ msgstr "κομμάτι %1"
 msgid "Paused"
 msgstr "Σταματημένο"
 
+#, fuzzy
+msgid "Stopped"
+msgstr "Σταμάτημα"
+
 msgid "Playlist finished"
 msgstr "Η λίστα τελείωσε"
 

src/translations/en_GB.po

@@ -280,6 +280,10 @@ msgstr "track %1"
 msgid "Paused"
 msgstr "Paused"
 
+#, fuzzy
+msgid "Stopped"
+msgstr "Stop"
+
 msgid "Playlist finished"
 msgstr "Playlist finished"
 

src/translations/es.po

@@ -294,6 +294,10 @@ msgstr "Pista %1"
 msgid "Paused"
 msgstr "Pausado"
 
+#, fuzzy
+msgid "Stopped"
+msgstr "Detener"
+
 msgid "Playlist finished"
 msgstr "Lista de reproducción finalizada"
 

src/translations/fr.po

@@ -296,6 +296,10 @@ msgstr "piste %1"
 msgid "Paused"
 msgstr "En pause"
 
+#, fuzzy
+msgid "Stopped"
+msgstr "Stop"
+
 msgid "Playlist finished"
 msgstr "Liste de lecture terminée"
 

src/translations/nb.po

@@ -293,6 +293,10 @@ msgstr "spor %1"
 msgid "Paused"
 msgstr "Pauset"
 
+#, fuzzy
+msgid "Stopped"
+msgstr "Stopp"
+
 msgid "Playlist finished"
 msgstr "Spillelisten er ferdigspilt"
 

src/translations/pl.po

@@ -294,6 +294,10 @@ msgstr "utwór %1"
 msgid "Paused"
 msgstr "Zatrzymane"
 
+#, fuzzy
+msgid "Stopped"
+msgstr "Zatrzymaj"
+
 msgid "Playlist finished"
 msgstr "Zakończono playlistę"
 

src/translations/pt.po

@@ -295,6 +295,10 @@ msgstr "faixa %1"
 msgid "Paused"
 msgstr "Em Pausa"
 
+#, fuzzy
+msgid "Stopped"
+msgstr "Parar"
+
 msgid "Playlist finished"
 msgstr "Lista de músicas terminada"
 

src/translations/pt_BR.po

@@ -290,6 +290,9 @@ msgstr ""
 msgid "Paused"
 msgstr ""
 
+msgid "Stopped"
+msgstr ""
+
 msgid "Playlist finished"
 msgstr ""
 

src/translations/ru.po

@@ -292,6 +292,10 @@ msgstr "композиция %1"
 msgid "Paused"
 msgstr "Приостановлен"
 
+#, fuzzy
+msgid "Stopped"
+msgstr "Остановить"
+
 msgid "Playlist finished"
 msgstr "Плейлист закончен"
 

src/translations/sk.po

@@ -294,6 +294,10 @@ msgstr "skladba %1"
 msgid "Paused"
 msgstr "Pozastavené"
 
+#, fuzzy
+msgid "Stopped"
+msgstr "Zastaviť"
+
 msgid "Playlist finished"
 msgstr "Playlist skončený"
 

src/translations/sv.po

@@ -291,6 +291,10 @@ msgstr "spår %1"
 msgid "Paused"
 msgstr "Pausad"
 
+#, fuzzy
+msgid "Stopped"
+msgstr "Stoppa"
+
 msgid "Playlist finished"
 msgstr "Spellistan klar"
 

src/translations/tr.po

@@ -290,6 +290,9 @@ msgstr ""
 msgid "Paused"
 msgstr ""
 
+msgid "Stopped"
+msgstr ""
+
 msgid "Playlist finished"
 msgstr ""
 

src/translations/translations.pot

@@ -281,6 +281,9 @@ msgstr ""
 msgid "Paused"
 msgstr ""
 
+msgid "Stopped"
+msgstr ""
+
 msgid "Playlist finished"
 msgstr ""