add setup option to enable/disable enqueue of songs trunk
authornathan
Tue, 01 Sep 2009 20:55:41 +0800
branchtrunk
changeset 30f8a59739816b
parent 29 640ce9201139
child 31 566c0f412764
add setup option to enable/disable enqueue of songs
mp3.c
po/ca_ES.po
po/de_DE.po
po/el_GR.po
po/es_ES.po
po/fi_FI.po
po/fr_FR.po
po/it_IT.po
po/ru_RU.po
po/sl_SI.po
po/sv_SE.po
setup-mp3.c
setup-mp3.h
     1.1 --- a/mp3.c	Mon Aug 17 20:56:48 2009 +0800
     1.2 +++ b/mp3.c	Tue Sep 01 20:55:41 2009 +0800
     1.3 @@ -97,6 +97,7 @@
     1.4    Add(new cMenuEditBoolItem(tr("Setup.MP3$Initial loop mode"),     &data.InitLoopMode));
     1.5    Add(new cMenuEditBoolItem(tr("Setup.MP3$Initial shuffle mode"),  &data.InitShuffleMode));
     1.6    Add(new cMenuEditBoolItem(tr("Setup.MP3$Abort player at end of list"),&data.AbortAtEOL));
     1.7 +  Add(new cMenuEditBoolItem(tr("Setup.MP3$Enqueue to running playlist"),&data.EnqueueSongs));
     1.8    scan[0]=tr("disabled");
     1.9    scan[1]=tr("ID3 only");
    1.10    scan[2]=tr("ID3 & Level");
    1.11 @@ -147,6 +148,7 @@
    1.12    SetupStore("HideMainMenu",     MP3Setup.HideMainMenu   );
    1.13    SetupStore("KeepSelect",       MP3Setup.KeepSelect     );
    1.14    SetupStore("TitleArtistOrder", MP3Setup.TitleArtistOrder);
    1.15 +  SetupStore("EnqueueSongs",     MP3Setup.EnqueueSongs   );
    1.16  }
    1.17  
    1.18  // --- cAsyncStatus ------------------------------------------------------------
    1.19 @@ -283,6 +285,7 @@
    1.20    // is there a running MP3 player?
    1.21    if(control && typeid(*control)==typeid(cMP3Control)) {
    1.22      // add songs to running playlist
    1.23 +    if(!MP3Setup.EnqueueSongs) mgr->Flush();
    1.24      mgr->Add(plist);
    1.25      res=true;
    1.26      }
     2.1 --- a/po/ca_ES.po	Mon Aug 17 20:56:48 2009 +0800
     2.2 +++ b/po/ca_ES.po	Tue Sep 01 20:55:41 2009 +0800
     2.3 @@ -7,7 +7,7 @@
     2.4  msgstr ""
     2.5  "Project-Id-Version: VDR 1.5.9\n"
     2.6  "Report-Msgid-Bugs-To: <s.huelswitt@gmx.de>\n"
     2.7 -"POT-Creation-Date: 2009-08-17 08:31-0400\n"
     2.8 +"POT-Creation-Date: 2009-08-17 09:00-0400\n"
     2.9  "PO-Revision-Date: 2007-08-27 16:33+0200\n"
    2.10  "Last-Translator: Stefan Huelswitt <s.huelswitt@gmx.de>\n"
    2.11  "Language-Team: <vdr@linuxtv.org>\n"
    2.12 @@ -117,6 +117,9 @@
    2.13  msgid "Setup.MP3$Abort player at end of list"
    2.14  msgstr ""
    2.15  
    2.16 +msgid "Setup.MP3$Enqueue to running playlist"
    2.17 +msgstr ""
    2.18 +
    2.19  msgid "disabled"
    2.20  msgstr "desactivat"
    2.21  
     3.1 --- a/po/de_DE.po	Mon Aug 17 20:56:48 2009 +0800
     3.2 +++ b/po/de_DE.po	Tue Sep 01 20:55:41 2009 +0800
     3.3 @@ -7,7 +7,7 @@
     3.4  msgstr ""
     3.5  "Project-Id-Version: VDR 1.5.9\n"
     3.6  "Report-Msgid-Bugs-To: <s.huelswitt@gmx.de>\n"
     3.7 -"POT-Creation-Date: 2009-08-17 08:31-0400\n"
     3.8 +"POT-Creation-Date: 2009-08-17 09:00-0400\n"
     3.9  "PO-Revision-Date: 2007-08-27 16:33+0200\n"
    3.10  "Last-Translator: Stefan Huelswitt <s.huelswitt@gmx.de>\n"
    3.11  "Language-Team: <vdr@linuxtv.org>\n"
    3.12 @@ -117,6 +117,9 @@
    3.13  msgid "Setup.MP3$Abort player at end of list"
    3.14  msgstr "Abspieler am Listenende beenden"
    3.15  
    3.16 +msgid "Setup.MP3$Enqueue to running playlist"
    3.17 +msgstr "Zur laufenden Wiedergabe hinzufügen"
    3.18 +
    3.19  msgid "disabled"
    3.20  msgstr "aus"
    3.21  
     4.1 --- a/po/el_GR.po	Mon Aug 17 20:56:48 2009 +0800
     4.2 +++ b/po/el_GR.po	Tue Sep 01 20:55:41 2009 +0800
     4.3 @@ -7,7 +7,7 @@
     4.4  msgstr ""
     4.5  "Project-Id-Version: VDR 1.5.9\n"
     4.6  "Report-Msgid-Bugs-To: <s.huelswitt@gmx.de>\n"
     4.7 -"POT-Creation-Date: 2009-08-17 08:31-0400\n"
     4.8 +"POT-Creation-Date: 2009-08-17 09:00-0400\n"
     4.9  "PO-Revision-Date: 2007-08-27 16:33+0200\n"
    4.10  "Last-Translator: Stefan Huelswitt <s.huelswitt@gmx.de>\n"
    4.11  "Language-Team: <vdr@linuxtv.org>\n"
    4.12 @@ -117,6 +117,9 @@
    4.13  msgid "Setup.MP3$Abort player at end of list"
    4.14  msgstr ""
    4.15  
    4.16 +msgid "Setup.MP3$Enqueue to running playlist"
    4.17 +msgstr ""
    4.18 +
    4.19  msgid "disabled"
    4.20  msgstr ""
    4.21  
     5.1 --- a/po/es_ES.po	Mon Aug 17 20:56:48 2009 +0800
     5.2 +++ b/po/es_ES.po	Tue Sep 01 20:55:41 2009 +0800
     5.3 @@ -7,7 +7,7 @@
     5.4  msgstr ""
     5.5  "Project-Id-Version: VDR 1.5.9\n"
     5.6  "Report-Msgid-Bugs-To: <s.huelswitt@gmx.de>\n"
     5.7 -"POT-Creation-Date: 2009-08-17 08:31-0400\n"
     5.8 +"POT-Creation-Date: 2009-08-17 09:00-0400\n"
     5.9  "PO-Revision-Date: 2007-08-27 16:33+0200\n"
    5.10  "Last-Translator: Stefan Huelswitt <s.huelswitt@gmx.de>\n"
    5.11  "Language-Team: <vdr@linuxtv.org>\n"
    5.12 @@ -117,6 +117,9 @@
    5.13  msgid "Setup.MP3$Abort player at end of list"
    5.14  msgstr ""
    5.15  
    5.16 +msgid "Setup.MP3$Enqueue to running playlist"
    5.17 +msgstr ""
    5.18 +
    5.19  msgid "disabled"
    5.20  msgstr "desactivado"
    5.21  
     6.1 --- a/po/fi_FI.po	Mon Aug 17 20:56:48 2009 +0800
     6.2 +++ b/po/fi_FI.po	Tue Sep 01 20:55:41 2009 +0800
     6.3 @@ -8,7 +8,7 @@
     6.4  msgstr ""
     6.5  "Project-Id-Version: VDR 1.5.9\n"
     6.6  "Report-Msgid-Bugs-To: <s.huelswitt@gmx.de>\n"
     6.7 -"POT-Creation-Date: 2009-08-17 08:31-0400\n"
     6.8 +"POT-Creation-Date: 2009-08-17 09:00-0400\n"
     6.9  "PO-Revision-Date: 2007-08-27 16:33+0200\n"
    6.10  "Last-Translator: Stefan Huelswitt <s.huelswitt@gmx.de>\n"
    6.11  "Language-Team: <vdr@linuxtv.org>\n"
    6.12 @@ -118,6 +118,9 @@
    6.13  msgid "Setup.MP3$Abort player at end of list"
    6.14  msgstr "Keskeytä soittolistan loputtua"
    6.15  
    6.16 +msgid "Setup.MP3$Enqueue to running playlist"
    6.17 +msgstr ""
    6.18 +
    6.19  msgid "disabled"
    6.20  msgstr "pois"
    6.21  
     7.1 --- a/po/fr_FR.po	Mon Aug 17 20:56:48 2009 +0800
     7.2 +++ b/po/fr_FR.po	Tue Sep 01 20:55:41 2009 +0800
     7.3 @@ -9,7 +9,7 @@
     7.4  msgstr ""
     7.5  "Project-Id-Version: VDR 1.5.9\n"
     7.6  "Report-Msgid-Bugs-To: <s.huelswitt@gmx.de>\n"
     7.7 -"POT-Creation-Date: 2009-08-17 08:31-0400\n"
     7.8 +"POT-Creation-Date: 2009-08-17 09:00-0400\n"
     7.9  "PO-Revision-Date: 2007-08-27 16:33+0200\n"
    7.10  "Last-Translator: Stefan Huelswitt <s.huelswitt@gmx.de>\n"
    7.11  "Language-Team: <vdr@linuxtv.org>\n"
    7.12 @@ -119,6 +119,9 @@
    7.13  msgid "Setup.MP3$Abort player at end of list"
    7.14  msgstr "Stopper le lecteur à la fin de la liste"
    7.15  
    7.16 +msgid "Setup.MP3$Enqueue to running playlist"
    7.17 +msgstr ""
    7.18 +
    7.19  msgid "disabled"
    7.20  msgstr "désactiver"
    7.21  
     8.1 --- a/po/it_IT.po	Mon Aug 17 20:56:48 2009 +0800
     8.2 +++ b/po/it_IT.po	Tue Sep 01 20:55:41 2009 +0800
     8.3 @@ -7,7 +7,7 @@
     8.4  msgstr ""
     8.5  "Project-Id-Version: VDR 1.5.9\n"
     8.6  "Report-Msgid-Bugs-To: <s.huelswitt@gmx.de>\n"
     8.7 -"POT-Creation-Date: 2009-08-17 08:31-0400\n"
     8.8 +"POT-Creation-Date: 2009-08-17 09:00-0400\n"
     8.9  "PO-Revision-Date: 2008-06-25 23:37+0100\n"
    8.10  "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
    8.11  "Language-Team:  <vdr@linuxtv.org>\n"
    8.12 @@ -117,6 +117,9 @@
    8.13  msgid "Setup.MP3$Abort player at end of list"
    8.14  msgstr "Ferma lettore alla fine della lista"
    8.15  
    8.16 +msgid "Setup.MP3$Enqueue to running playlist"
    8.17 +msgstr ""
    8.18 +
    8.19  msgid "disabled"
    8.20  msgstr "disabilitato"
    8.21  
     9.1 --- a/po/ru_RU.po	Mon Aug 17 20:56:48 2009 +0800
     9.2 +++ b/po/ru_RU.po	Tue Sep 01 20:55:41 2009 +0800
     9.3 @@ -8,7 +8,7 @@
     9.4  msgstr ""
     9.5  "Project-Id-Version: VDR 1.5.9\n"
     9.6  "Report-Msgid-Bugs-To: <s.huelswitt@gmx.de>\n"
     9.7 -"POT-Creation-Date: 2009-08-17 08:31-0400\n"
     9.8 +"POT-Creation-Date: 2009-08-17 09:00-0400\n"
     9.9  "PO-Revision-Date: 2008-03-12 19:50+0100\n"
    9.10  "Last-Translator: Alexander <Bikalexander@gmail.com>\n"
    9.11  "Language-Team: <vdr@linuxtv.org>\n"
    9.12 @@ -119,6 +119,9 @@
    9.13  msgid "Setup.MP3$Abort player at end of list"
    9.14  msgstr "²ëåÞÔ Ò ÚÞÝæÕ áßØáÚÐ ßÕáÕÝ"
    9.15  
    9.16 +msgid "Setup.MP3$Enqueue to running playlist"
    9.17 +msgstr ""
    9.18 +
    9.19  msgid "disabled"
    9.20  msgstr "ÒëÚÛ"
    9.21  
    10.1 --- a/po/sl_SI.po	Mon Aug 17 20:56:48 2009 +0800
    10.2 +++ b/po/sl_SI.po	Tue Sep 01 20:55:41 2009 +0800
    10.3 @@ -7,7 +7,7 @@
    10.4  msgstr ""
    10.5  "Project-Id-Version: VDR 1.5.9\n"
    10.6  "Report-Msgid-Bugs-To: <s.huelswitt@gmx.de>\n"
    10.7 -"POT-Creation-Date: 2009-08-17 08:31-0400\n"
    10.8 +"POT-Creation-Date: 2009-08-17 09:00-0400\n"
    10.9  "PO-Revision-Date: 2007-08-27 16:33+0200\n"
   10.10  "Last-Translator: Stefan Huelswitt <s.huelswitt@gmx.de>\n"
   10.11  "Language-Team: <vdr@linuxtv.org>\n"
   10.12 @@ -117,6 +117,9 @@
   10.13  msgid "Setup.MP3$Abort player at end of list"
   10.14  msgstr ""
   10.15  
   10.16 +msgid "Setup.MP3$Enqueue to running playlist"
   10.17 +msgstr ""
   10.18 +
   10.19  msgid "disabled"
   10.20  msgstr ""
   10.21  
    11.1 --- a/po/sv_SE.po	Mon Aug 17 20:56:48 2009 +0800
    11.2 +++ b/po/sv_SE.po	Tue Sep 01 20:55:41 2009 +0800
    11.3 @@ -7,7 +7,7 @@
    11.4  msgstr ""
    11.5  "Project-Id-Version: VDR 1.5.9\n"
    11.6  "Report-Msgid-Bugs-To: <s.huelswitt@gmx.de>\n"
    11.7 -"POT-Creation-Date: 2009-08-17 08:31-0400\n"
    11.8 +"POT-Creation-Date: 2009-08-17 09:00-0400\n"
    11.9  "PO-Revision-Date: 2007-08-27 16:33+0200\n"
   11.10  "Last-Translator: Stefan Huelswitt <s.huelswitt@gmx.de>\n"
   11.11  "Language-Team: <vdr@linuxtv.org>\n"
   11.12 @@ -117,6 +117,9 @@
   11.13  msgid "Setup.MP3$Abort player at end of list"
   11.14  msgstr ""
   11.15  
   11.16 +msgid "Setup.MP3$Enqueue to running playlist"
   11.17 +msgstr ""
   11.18 +
   11.19  msgid "disabled"
   11.20  msgstr "avstängd"
   11.21  
    12.1 --- a/setup-mp3.c	Mon Aug 17 20:56:48 2009 +0800
    12.2 +++ b/setup-mp3.c	Tue Sep 01 20:55:41 2009 +0800
    12.3 @@ -53,4 +53,5 @@
    12.4    HideMainMenu = 0;
    12.5    KeepSelect = 0;
    12.6    TitleArtistOrder = 0;
    12.7 +  EnqueueSongs = 1;
    12.8  }
    13.1 --- a/setup-mp3.h	Mon Aug 17 20:56:48 2009 +0800
    13.2 +++ b/setup-mp3.h	Tue Sep 01 20:55:41 2009 +0800
    13.3 @@ -66,6 +66,7 @@
    13.4    int HideMainMenu;
    13.5    int KeepSelect;
    13.6    int TitleArtistOrder;
    13.7 +  int EnqueueSongs;
    13.8  public:
    13.9    cMP3Setup(void);
   13.10    };