Mercurial Mercurial > mp3 / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
mp3.c
branchtrunk
changeset 30 f8a59739816b
parent 29 640ce9201139
child 34 afc13760179b
equal deleted inserted replaced
29:640ce9201139 30:f8a59739816b 
    95   bgr[2]=tr("Images");
 
    95   bgr[2]=tr("Images");
 
    96   Add(new cMenuEditStraItem(tr("Setup.MP3$Background mode"),       &data.BackgrMode, 3, bgr));
 
    96   Add(new cMenuEditStraItem(tr("Setup.MP3$Background mode"),       &data.BackgrMode, 3, bgr));
 
    97   Add(new cMenuEditBoolItem(tr("Setup.MP3$Initial loop mode"),     &data.InitLoopMode));
 
    97   Add(new cMenuEditBoolItem(tr("Setup.MP3$Initial loop mode"),     &data.InitLoopMode));
 
    98   Add(new cMenuEditBoolItem(tr("Setup.MP3$Initial shuffle mode"),  &data.InitShuffleMode));
 
    98   Add(new cMenuEditBoolItem(tr("Setup.MP3$Initial shuffle mode"),  &data.InitShuffleMode));
 
    99   Add(new cMenuEditBoolItem(tr("Setup.MP3$Abort player at end of list"),&data.AbortAtEOL));
 
    99   Add(new cMenuEditBoolItem(tr("Setup.MP3$Abort player at end of list"),&data.AbortAtEOL));
 
       
   100   Add(new cMenuEditBoolItem(tr("Setup.MP3$Enqueue to running playlist"),&data.EnqueueSongs));
 
   100   scan[0]=tr("disabled");
 
   101   scan[0]=tr("disabled");
 
   101   scan[1]=tr("ID3 only");
 
   102   scan[1]=tr("ID3 only");
 
   102   scan[2]=tr("ID3 & Level");
 
   103   scan[2]=tr("ID3 & Level");
 
   103   Add(new cMenuEditStraItem(tr("Setup.MP3$Background scan"),       &data.BgrScan, 3, scan));
 
   104   Add(new cMenuEditStraItem(tr("Setup.MP3$Background scan"),       &data.BgrScan, 3, scan));
 
   104   Add(new cMenuEditBoolItem(tr("Setup.MP3$Editor display mode"),   &data.EditorMode, tr("Filenames"), tr("ID3 names")));
 
   105   Add(new cMenuEditBoolItem(tr("Setup.MP3$Editor display mode"),   &data.EditorMode, tr("Filenames"), tr("ID3 names")));
 
   145   SetupStore("AbortAtEOL",       MP3Setup.AbortAtEOL     );
 
   146   SetupStore("AbortAtEOL",       MP3Setup.AbortAtEOL     );
 
   146   SetupStore("ReplayDisplay",    MP3Setup.ReplayDisplay  );
 
   147   SetupStore("ReplayDisplay",    MP3Setup.ReplayDisplay  );
 
   147   SetupStore("HideMainMenu",     MP3Setup.HideMainMenu   );
 
   148   SetupStore("HideMainMenu",     MP3Setup.HideMainMenu   );
 
   148   SetupStore("KeepSelect",       MP3Setup.KeepSelect     );
 
   149   SetupStore("KeepSelect",       MP3Setup.KeepSelect     );
 
   149   SetupStore("TitleArtistOrder", MP3Setup.TitleArtistOrder);
 
   150   SetupStore("TitleArtistOrder", MP3Setup.TitleArtistOrder);
 
       
   151   SetupStore("EnqueueSongs",     MP3Setup.EnqueueSongs   );
 
   150 }
 
   152 }
 
   151 
   153 
   152 // --- cAsyncStatus ------------------------------------------------------------
 
   154 // --- cAsyncStatus ------------------------------------------------------------
 
   153 
   155 
   154 cAsyncStatus asyncStatus;
 
   156 cAsyncStatus asyncStatus;
 
   281   bool res;
 
   283   bool res;
 
   282   cControl *control=cControl::Control();
 
   284   cControl *control=cControl::Control();
 
   283   // is there a running MP3 player?
 
   285   // is there a running MP3 player?
 
   284   if(control && typeid(*control)==typeid(cMP3Control)) {
 
   286   if(control && typeid(*control)==typeid(cMP3Control)) {
 
   285     // add songs to running playlist
 
   287     // add songs to running playlist
 
       
   288     if(!MP3Setup.EnqueueSongs) mgr->Flush();
 
   286     mgr->Add(plist);
 
   289     mgr->Add(plist);
 
   287     res=true;
 
   290     res=true;
 
   288     }
 
   291     }
 
   289   else {
 
   292   else {
 
   290     mgr->Flush();
 
   293     mgr->Flush();
mp3