svenhoefer

Untitled

Apr 22nd, 2021
589
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp
  2. index cd2be42f3..0dfc89142 100644
  3. --- a/src/gui/movieplayer.cpp
  4. +++ b/src/gui/movieplayer.cpp
  5. @@ -2550,8 +2550,7 @@ void CMoviePlayerGui::selectAudioPid()
  6.  #if HAVE_CST_HARDWARE
  7.     char cnt[5];
  8.     sprintf(cnt, "%d", count);
  9. -   std::string apidtitle = (currentac3 == 0) ? g_Locale->getText(LOCALE_AUDIOMENU_AC3_atype1) : g_Locale->getText(LOCALE_AUDIOMENU_AC3_atype0);
  10. -   CMenuForwarder * item = new CMenuForwarder(apidtitle.c_str(), true, NULL, selector, cnt, CRCInput::convertDigitToKey(count + 1));
  11. +   CMenuForwarder * item = new CMenuForwarder(currentac3 == CZapitAudioChannel::AC3 ? LOCALE_AUDIOMENU_AC3_ATYPE1 : LOCALE_AUDIOMENU_AC3_ATYPE0, true, NULL, selector, cnt, CRCInput::convertDigitToKey(count + 1));
  12.     APIDSelector.addItem(item, false);
  13.  #endif
  14.     int percent[numpida+1];
  15. @@ -2583,13 +2582,7 @@ void CMoviePlayerGui::selectAudioPid()
  16.         playback->SetAPid(currentapid, currentac3);
  17.         printf("[movieplayer] currentac3 changed to %d\n", currentac3);
  18.     }
  19. -   else if ((select >= 0) && (currentapid != apids[select])) {
  20. -       currentapid = apids[select];
  21. -       currentac3 = ac3flags[select];
  22. -       playback->SetAPid(currentapid, currentac3);
  23. -       getCurrentAudioName(is_file_player, currentaudioname);
  24. -       printf("[movieplayer] apid changed to %d type %d\n", currentapid, currentac3);
  25. -   }
  26. +   else
  27.  #else
  28.     if ((select >= 0) && (currentapid != apids[select])) {
  29.         currentapid = apids[select];
  30. diff --git a/src/system/locals.h b/src/system/locals.h
  31. index f83455f90..ba28d90f2 100644
  32. --- a/src/system/locals.h
  33. +++ b/src/system/locals.h
  34. @@ -158,8 +158,8 @@ typedef enum
  35.     LOCALE_AUDIO_SRS_VOLUME,
  36.     LOCALE_AUDIOMENU_PCMOFFSET,
  37.     LOCALE_AUDIOMENU_AC3,
  38. -   LOCALE_AUDIOMENU_AC3_atype0,
  39. -   LOCALE_AUDIOMENU_AC3_atype1,
  40. +   LOCALE_AUDIOMENU_AC3_ATYPE0,
  41. +   LOCALE_AUDIOMENU_AC3_ATYPE1,
  42.     LOCALE_AUDIOMENU_ANALOG_MODE,
  43.     LOCALE_AUDIOMENU_ANALOG_OUT,
  44.     LOCALE_AUDIOMENU_AUTO_LANG,
  45.  
RAW Paste Data

Adblocker detected! Please consider disabling it...

We've detected AdBlock Plus or some other adblocking software preventing Pastebin.com from fully loading.

We don't have any obnoxious sound, or popup ads, we actively block these annoying types of ads!

Please add Pastebin.com to your ad blocker whitelist or disable your adblocking software.

×