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

Revert "- audio_select: copy full code from TangoCash"

Browse Source 
This reverts commit a98e5fd8f7.

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/audio_select.cpp
	src/system/setting_helpers.cpp
	src/system/setting_helpers.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2cd2a8599c
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-03 (Wed, 03 Jan 2018)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2018-01-03 11:55:54 +01:00
parent 4c2148ee01
commit 68288c0213
7 changed files with 63 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/system/setting_helpers.h
View File

@@ -35,11 +35,6 @@
#include <global.h>
#include <gui/widget/menue.h>
#include <zapit/client/zapittypes.h>
#include <playback.h>
#if HAVE_SPARK_HARDWARE
#include <audio.h>
#endif
#include <string>
@@ -116,10 +111,7 @@ class CFontSizeNotifier : public CChangeObserver
class CSubtitleChangeExec : public CMenuTarget
{
private:
cPlayback *playback;
public:
CSubtitleChangeExec(cPlayback *p = NULL) { playback = p; }
int exec(CMenuTarget* parent, const std::string & actionKey);
};