mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 18:31:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pu/mp

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2c5bf73006
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-13 (Wed, 13 Sep 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2017-09-13 13:40:40 +02:00
parent 44a8e0b0b4 73b2025641
commit bea20473aa
44 changed files with 349 additions and 687 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/gui/movieplayer.cpp
View File

@@ -57,7 +57,6 @@
#include <driver/display.h>
#include <driver/abstime.h>
#include <driver/record.h>
#include <driver/volume.h>
#include <driver/fontrenderer.h>
#include <eitd/edvbstring.h>
#include <system/helpers.h>
@@ -1980,13 +1979,13 @@ void CMoviePlayerGui::selectAudioPid()
0, 999, CVolume::getInstance()));
}
}
if (!g_settings.easymenu) {
APIDSelector.addItem(new CMenuSeparator(CMenuSeparator::LINE));
extern CAudioSetupNotifier * audioSetupNotifier;
APIDSelector.addItem( new CMenuOptionChooser(LOCALE_AUDIOMENU_ANALOG_OUT, &g_settings.analog_out,
OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT,
true, audioSetupNotifier, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN) );
}
APIDSelector.addItem(new CMenuSeparator(CMenuSeparator::LINE));
extern CAudioSetupNotifier * audioSetupNotifier;
APIDSelector.addItem( new CMenuOptionChooser(LOCALE_AUDIOMENU_ANALOG_OUT, &g_settings.analog_out,
OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT,
true, audioSetupNotifier, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN) );
APIDSelector.exec(NULL, "");
delete selector;
printf("CMoviePlayerGui::selectAudioPid: selected %d (%x) current %x\n", select, (select >= 0) ? apids[select] : -1, currentapid);