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 remote-tracking branch 'tuxbox/master'

Browse Source 
needs buildfixes


Origin commit data
------------------
Branch: ni/coolstream
Commit: 514cb3ed1e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-23 (Sat, 23 Sep 2017)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2017-09-23 17:01:42 +02:00
parent e12d2c0fa7 c0dabfdccd
commit 97ba018af4
167 changed files with 51814 additions and 2779 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/gui/movieplayer.cpp
View File

@@ -57,10 +57,10 @@
#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>
#include <system/helpers-json.h>
#include <src/mymenu.h>
@@ -843,12 +843,12 @@ bool CMoviePlayerGui::luaGetUrl(const std::string &script, const std::string &fi
return false;
}
string errMsg = "";
Json::Value root;
Json::Reader reader;
bool parsedSuccess = reader.parse(result_string, root, false);
if (!parsedSuccess) {
bool ok = parseJsonFromString(result_string, &root, &errMsg);
if (!ok) {
printf("Failed to parse JSON\n");
printf("%s\n", reader.getFormattedErrorMessages().c_str());
printf("%s\n", errMsg.c_str());
if (box != NULL) {
box->hide();
delete box;
@@ -1980,13 +1980,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);