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

Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox

Browse Source 
Conflicts:
	configure.ac
	data/icons/buttons/btn_record_active.png
	data/icons/buttons/gelb.png
	data/icons/buttons/gruen.png
	data/icons/buttons/rot.png
	data/icons/headers/icon_green.png
	data/icons/headers/icon_red.png
	data/icons/headers/icon_yellow.png
	data/icons/status/various/lock.png
	data/pictures/backgrounds/1280x720/shutdown.jpg
	data/pictures/backgrounds/1280x720/start.jpg
	src/driver/streamts.cpp
	src/gui/plugins.h
	src/gui/videosettings.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Commit: 74aab8ddd2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-28 (Tue, 28 Nov 2017)
This commit is contained in:
vanhofen
2017-11-28 10:31:10 +01:00
parent 532b55c841 01e3a494d8
commit 94b4f9a712
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libdvbsub/dvbsub.cpp
View File

@@ -50,7 +50,7 @@ static void clear_queue();
int dvbsub_init() {
int trc;
sub_debug.set_level(3);
sub_debug.set_level(2);
reader_running = true;
dvbsub_stopped = 1;
@@ -244,7 +244,11 @@ static void* reader_thread(void * /*arg*/)
set_threadname("dvbsub:reader");
dmx = new cDemux(0);
#if HAVE_TRIPLEDRAGON
dmx->Open(DMX_PES_CHANNEL, NULL, 16*1024);
#else
dmx->Open(DMX_PES_CHANNEL, NULL, 64*1024);
#endif
while (reader_running) {
if(dvbsub_stopped /*dvbsub_paused*/) {

2
lib/libdvbsub/dvbsubtitle.cpp
View File

@@ -32,7 +32,7 @@ extern "C" {
#endif
// Set these to 'true' for debug output:
static bool DebugConverter = true;
static bool DebugConverter = false;
#define dbgconverter(a...) if (DebugConverter) sub_debug.print(Debug::VERBOSE, a)

1
src/driver/streamts.cpp
View File

@@ -57,7 +57,6 @@
#include <driver/record.h>
#include <driver/genpsi.h>
#include <system/set_threadname.h>
#include <gui/movieplayer.h>
#include <cs_api.h>

1
src/gui/plugins.h
View File

@@ -34,7 +34,6 @@ class CFrameBuffer;
class CPlugins
{
public:
// neutrino-internal plugin-type conversion
typedef enum p_type
{
P_TYPE_DISABLED = 0x1,

4
src/gui/videosettings.cpp
View File

@@ -387,14 +387,14 @@ int CVideoSettings::showVideoSetup()
CMenuOptionChooser * vs_videomodes_ch = new CMenuOptionChooser(LOCALE_VIDEOMENU_VIDEOMODE, &g_settings.video_Mode, vmode_options, vmode_option_count, true, this, CRCInput::RC_nokey, "", true);
vs_videomodes_ch->setHint("", LOCALE_MENU_HINT_VIDEO_MODE);
CMenuOptionChooser * vs_dbdropt_ch = NULL;
CMenuForwarder * vs_videomodes_fw = NULL;
CMenuOptionChooser *vs_dbdropt_ch = NULL;
CMenuWidget videomodes(LOCALE_MAINSETTINGS_VIDEO, NEUTRINO_ICON_SETTINGS);
#ifdef BOXMODEL_CS_HD2
CMenuForwarder * vs_automodes_fw = NULL;
CMenuWidget automodes(LOCALE_MAINSETTINGS_VIDEO, NEUTRINO_ICON_SETTINGS);
#endif
CAutoModeNotifier anotify;
CMenuForwarder *vs_videomodes_fw = NULL;
//dbdr options
if (system_rev != 0x01) /* dbdr options only on COOLSTREAM */
{

2
src/neutrino_menue.cpp
View File

@@ -411,10 +411,8 @@ void CNeutrinoApp::InitMenuService()
//bouquet edit
// TODO: this needs a neutrino restart after changing parentallock_prompt to activate :-(
// TODO:2 check if this deviation from upstream is still needed
CLockedMenuForwarder *lf;
lf = new CLockedMenuForwarder(LOCALE_BOUQUETEDITOR_NAME, g_settings.parentallock_pincode, g_settings.parentallock_prompt == PARENTALLOCK_PROMPT_CHANGETOLOCKED, true, NULL, new CBEBouquetWidget(), NULL, CRCInput::RC_blue);
// TODO:2 end
/* does not work with CLockedMenuForwarder yet?
lf->setHint(NEUTRINO_ICON_HINT_BEDIT, LOCALE_MENU_HINT_BEDIT);
*/