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' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	configure.ac
	data/icons/filetypes/mp3.png
	data/icons/filetypes/picture.png
	src/gui/audioplayer.cpp
	src/gui/bouquetlist.cpp
	src/gui/filebrowser.cpp
	src/gui/followscreenings.cpp
	src/gui/followscreenings.h
	src/gui/osd_setup.cpp
	src/gui/record_setup.cpp
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 75db11c2e2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-07 (Wed, 07 Jun 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-06-07 15:14:51 +02:00
parent 83cdc44dca 8d55020df7
commit 48db0bd94c
10 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/record_setup.cpp
View File

@@ -41,7 +41,7 @@
#include "record_setup.h"
#include <gui/filebrowser.h>
#include <gui/followscreenings.h> //NI
#include <gui/followscreenings.h>
#include <gui/widget/icons.h>
#include <gui/widget/msgbox.h>
@@ -174,12 +174,11 @@ const CMenuOptionChooser::keyval END_OF_RECORDING[END_OF_RECORDING_COUNT] =
{1, LOCALE_RECORDINGMENU_END_OF_RECORDING_EPG}
};
//NI
const CMenuOptionChooser::keyval timer_followscreenings_options[] =
{
{CFollowScreenings::FOLLOWSCREENINGS_OFF , LOCALE_OPTIONS_OFF },
{CFollowScreenings::FOLLOWSCREENINGS_ON , LOCALE_OPTIONS_ON },
{CFollowScreenings::FOLLOWSCREENINGS_ALWAYS , LOCALE_OPTIONS_ALWAYS}
{CFollowScreenings::FOLLOWSCREENINGS_OFF ,LOCALE_OPTIONS_OFF },
{CFollowScreenings::FOLLOWSCREENINGS_ON ,LOCALE_OPTIONS_ON },
{CFollowScreenings::FOLLOWSCREENINGS_ALWAYS ,LOCALE_OPTIONS_ALWAYS } //NI
};
size_t timer_followscreenings_options_count = sizeof(timer_followscreenings_options)/sizeof(CMenuOptionChooser::keyval);