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

Merge branch 'check/next-cc'

Browse Source 
Compiles on most platforms, starts. Not really tested.

Conflicts:
	acinclude.m4
	lib/libdvbsub/Makefile.am
	lib/libtriple/Makefile.am
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/create_rcsim_h.sh
	src/daemonc/Makefile.am
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/streaminfo2.h
	src/gui/update.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/rcsim.c
	src/system/Makefile.am
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: d244a5991a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-10-21 (Mon, 21 Oct 2013)
This commit is contained in:
Stefan Seyfried
2013-10-21 22:58:55 +02:00
parent d4168dd85b a6eefc134f
commit e6cbfe61bc
186 changed files with 12758 additions and 2268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/audio_setup.cpp
View File

@@ -215,7 +215,9 @@ int CAudioSetup::showAudioSetup()
audioSettings->addItem(GenericMenuSeparatorLine);
audioSettings->addItem(as_oj_srsonoff);
audioSettings->addItem(as_oj_algo);
#ifndef BOXMODEL_APOLLO
audioSettings->addItem(as_oj_noise);
#endif
audioSettings->addItem(as_oj_volrev);
#endif
#if 0
@@ -225,6 +227,9 @@ int CAudioSetup::showAudioSetup()
int res = audioSettings->exec(NULL, "");
selected = audioSettings->getSelected();
delete audioSettings;
#ifdef BOXMODEL_APOLLO
delete as_oj_noise;
#endif
return res;
}