mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-14 00:43:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

- remove BOXTYPE_SPARK

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2021-11-03 11:23:58 +01:00
committed by Thilo Graf
parent 9190e44683
commit b4daeaa945
25 changed files with 24 additions and 502 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/audio_setup.cpp
View File

@@ -117,17 +117,11 @@ const CMenuOptionChooser::keyval AUDIOMENU_AVSYNC_OPTIONS[AUDIOMENU_AVSYNC_OPTIO
{ 2, LOCALE_AUDIOMENU_AVSYNC_AM }
};
#ifdef HAVE_SPARK_HARDWARE
#define AUDIOMENU_HDMI_DD_OPTION_COUNT 2
#else
#define AUDIOMENU_HDMI_DD_OPTION_COUNT 3
#endif
const CMenuOptionChooser::keyval AUDIOMENU_HDMI_DD_OPTIONS[AUDIOMENU_HDMI_DD_OPTION_COUNT] =
{
{ HDMI_ENCODED_OFF, LOCALE_OPTIONS_OFF },
#ifndef HAVE_SPARK_HARDWARE
{ HDMI_ENCODED_AUTO, LOCALE_AUDIOMENU_HDMI_DD_AUTO },
#endif
{ HDMI_ENCODED_FORCED, LOCALE_AUDIOMENU_HDMI_DD_FORCE }
};

7
src/gui/keybind_setup.cpp
View File

@@ -247,7 +247,6 @@ bool checkLongPress(uint32_t key)
int CKeybindSetup::showKeySetup()
{
#if !HAVE_SPARK_HARDWARE
//save original rc hardware selection and initialize text strings
int org_remote_control_hardware = g_settings.remote_control_hardware;
char RC_HW_str[4][32];
@@ -257,7 +256,6 @@ int CKeybindSetup::showKeySetup()
snprintf(RC_HW_str[CRCInput::RC_HW_TRIPLEDRAGON], sizeof(RC_HW_str[CRCInput::RC_HW_TRIPLEDRAGON])-1, "%s", g_Locale->getText(LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE_TRIPLEDRAGON));
char RC_HW_msg[256];
snprintf(RC_HW_msg, sizeof(RC_HW_msg)-1, "%s", g_Locale->getText(LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE_MSG_PART1));
#endif
//keysetup menu
CMenuWidget* keySettings = new CMenuWidget(LOCALE_MAINSETTINGS_HEAD, NEUTRINO_ICON_KEYBINDING, width, MN_WIDGET_ID_KEYSETUP);
@@ -310,7 +308,7 @@ int CKeybindSetup::showKeySetup()
mc->setHint("", LOCALE_MENU_HINT_ACCEPT_OTHER_REMOTES);
keySettings->addItem(mc);
#endif
#if !HAVE_SPARK_HARDWARE
if (RC_HW_SELECT) {
CMenuOptionChooser * mc = new CMenuOptionChooser(LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE,
&g_settings.remote_control_hardware, KEYBINDINGMENU_REMOTECONTROL_HARDWARE_OPTIONS, KEYBINDINGMENU_REMOTECONTROL_HARDWARE_OPTION_COUNT, true, NULL,
@@ -318,7 +316,6 @@ int CKeybindSetup::showKeySetup()
mc->setHint("", LOCALE_MENU_HINT_KEY_HARDWARE);
keySettings->addItem(mc);
}
#endif
cc = new CMenuOptionNumberChooser(LOCALE_KEYBINDINGMENU_REPEATBLOCK,
&g_settings.repeat_blocker, true, 0, 999, this,
@@ -338,7 +335,6 @@ int CKeybindSetup::showKeySetup()
int res = keySettings->exec(NULL, "");
#if !HAVE_SPARK_HARDWARE
//check if rc hardware selection has changed before leaving the menu
if (org_remote_control_hardware != g_settings.remote_control_hardware) {
g_RCInput->CRCInput::set_rc_hw();
@@ -351,7 +347,6 @@ int CKeybindSetup::showKeySetup()
g_RCInput->CRCInput::set_rc_hw();
}
}
#endif
delete keySettings;
for (int i = 0; i < KEYBINDS_COUNT; i++)

45
src/gui/movieplayer.cpp
View File

@@ -1512,11 +1512,6 @@ bool CMoviePlayerGui::PlayFileStart(void)
repeat_mode = (repeat_mode_enum) g_settings.movieplayer_repeat_on;
playstate = CMoviePlayerGui::PLAY;
CVFD::getInstance()->ShowIcon(FP_ICON_PLAY, true);
#if HAVE_SPARK_HARDWARE
CVFD::getInstance()->ShowIcon(FP_ICON_FR, false);
CVFD::getInstance()->ShowIcon(FP_ICON_FF, false);
CVFD::getInstance()->ShowIcon(FP_ICON_PAUSE, false);
#endif
if (timeshift != TSHIFT_MODE_OFF) {
startposition = -1;
int i;
@@ -1545,12 +1540,6 @@ bool CMoviePlayerGui::PlayFileStart(void)
{
speed = 0;
playstate = CMoviePlayerGui::PAUSE;
#if HAVE_SPARK_HARDWARE
CVFD::getInstance()->ShowIcon(FP_ICON_PLAY, false);
CVFD::getInstance()->ShowIcon(FP_ICON_FR, false);
CVFD::getInstance()->ShowIcon(FP_ICON_FF, false);
CVFD::getInstance()->ShowIcon(FP_ICON_PAUSE, true);
#endif
}
if (timeshift == TSHIFT_MODE_ON)
startposition = 0;
@@ -1906,12 +1895,6 @@ void CMoviePlayerGui::PlayFileLoop(void)
FileTimeOSD->setMpTimeForced(false);
if (playstate > CMoviePlayerGui::PLAY) {
playstate = CMoviePlayerGui::PLAY;
#if HAVE_SPARK_HARDWARE
CVFD::getInstance()->ShowIcon(FP_ICON_PLAY, true);
CVFD::getInstance()->ShowIcon(FP_ICON_PAUSE, false);
CVFD::getInstance()->ShowIcon(FP_ICON_FR, false);
CVFD::getInstance()->ShowIcon(FP_ICON_FF, false);
#endif
speed = 1;
playback->SetSpeed(speed);
updateLcd();
@@ -1951,23 +1934,11 @@ void CMoviePlayerGui::PlayFileLoop(void)
if (playstate == CMoviePlayerGui::PAUSE) {
playstate = CMoviePlayerGui::PLAY;
//CVFD::getInstance()->ShowIcon(VFD_ICON_PAUSE, false);
#if HAVE_SPARK_HARDWARE
CVFD::getInstance()->ShowIcon(FP_ICON_PLAY, true);
CVFD::getInstance()->ShowIcon(FP_ICON_PAUSE, false);
CVFD::getInstance()->ShowIcon(FP_ICON_FR, false);
CVFD::getInstance()->ShowIcon(FP_ICON_FF, false);
#endif
speed = 1;
playback->SetSpeed(speed);
} else {
playstate = CMoviePlayerGui::PAUSE;
//CVFD::getInstance()->ShowIcon(VFD_ICON_PAUSE, true);
#if HAVE_SPARK_HARDWARE
CVFD::getInstance()->ShowIcon(FP_ICON_PLAY, false);
CVFD::getInstance()->ShowIcon(FP_ICON_PAUSE, true);
CVFD::getInstance()->ShowIcon(FP_ICON_FR, false);
CVFD::getInstance()->ShowIcon(FP_ICON_FF, false);
#endif
speed = 0;
playback->SetSpeed(speed);
}
@@ -2004,20 +1975,8 @@ void CMoviePlayerGui::PlayFileLoop(void)
bool setSpeed = false;
if (msg == (neutrino_msg_t) g_settings.mpkey_rewind) {
newspeed = (speed >= 0) ? -1 : (speed - 1);
#if HAVE_SPARK_HARDWARE
CVFD::getInstance()->ShowIcon(FP_ICON_PLAY, true);
CVFD::getInstance()->ShowIcon(FP_ICON_PAUSE, false);
CVFD::getInstance()->ShowIcon(FP_ICON_FR, true);
CVFD::getInstance()->ShowIcon(FP_ICON_FF, false);
#endif
} else {
newspeed = (speed <= 0) ? 2 : (speed + 1);
#if HAVE_SPARK_HARDWARE
CVFD::getInstance()->ShowIcon(FP_ICON_PLAY, true);
CVFD::getInstance()->ShowIcon(FP_ICON_PAUSE, false);
CVFD::getInstance()->ShowIcon(FP_ICON_FR, false);
CVFD::getInstance()->ShowIcon(FP_ICON_FF, true);
#endif
}
/* if paused, playback->SetSpeed() start slow motion */
if (playback->SetSpeed(newspeed)) {
@@ -2234,10 +2193,6 @@ void CMoviePlayerGui::PlayFileEnd(bool restore)
CVFD::getInstance()->ShowIcon(FP_ICON_PLAY, false);
CVFD::getInstance()->ShowIcon(FP_ICON_PAUSE, false);
#if HAVE_SPARK_HARDWARE
CVFD::getInstance()->ShowIcon(FP_ICON_FR, false);
CVFD::getInstance()->ShowIcon(FP_ICON_FF, false);
#endif
if (restore)
restoreNeutrino();

6
src/gui/user_menue.cpp
View File

@@ -62,9 +62,7 @@
#include "plugins.h"
#include "imageinfo.h"
#include "dboxinfo.h"
#if !HAVE_SPARK_HARDWARE
#include "cam_menu.h"
#endif
#include "pluginlist.h"
#include "infoclock.h"
#include "rc_lock.h"
@@ -97,9 +95,7 @@
extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */
extern CPlugins * g_Plugins; /* neutrino.cpp */
extern cVideo * videoDecoder;
#if !HAVE_SPARK_HARDWARE
extern CCAMMenuHandler * g_CamHandler;
#endif
std::string CUserMenu::tmp;
//
#include <system/debug.h>
@@ -402,7 +398,6 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
menu_item->setHint(NEUTRINO_ICON_HINT_DBOXINFO, LOCALE_MENU_HINT_DBOXINFO);
break;
}
#if !HAVE_SPARK_HARDWARE
case SNeutrinoSettings::ITEM_CAM:
{
keyhelper.get(&key,&icon);
@@ -410,7 +405,6 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
// FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
break;
}
#endif
case SNeutrinoSettings::ITEM_CLOCK:
{
keyhelper.get(&key,&icon);

4
src/gui/user_menue_setup.cpp
View File

@@ -54,11 +54,7 @@
#include <system/debug.h>
static bool usermenu_show = true;
#if HAVE_SPARK_HARDWARE
static bool usermenu_show_cam = false; // FIXME -- use hwcaps?
#else
static bool usermenu_show_cam = true; // FIXME -- use hwcaps?
#endif
struct keyvals
{
const int key;

26
src/gui/videosettings.cpp
View File

@@ -264,30 +264,6 @@ CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_O
{ -1, NONEXISTANT_LOCALE, "2160p 50Hz" },
{ VIDEO_STD_AUTO, NONEXISTANT_LOCALE, "Auto" }
};
#elif HAVE_SPARK_HARDWARE
CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_OPTION_COUNT] =
{
{ -1, NONEXISTANT_LOCALE, "NTSC" },
{ VIDEO_STD_PAL, NONEXISTANT_LOCALE, "PAL" },
{ -1, NONEXISTANT_LOCALE, "SECAM" },
{ -1, NONEXISTANT_LOCALE, "480p" },
{ VIDEO_STD_576P, NONEXISTANT_LOCALE, "576p" },
{ VIDEO_STD_720P50, NONEXISTANT_LOCALE, "720p 50Hz" },
{ VIDEO_STD_720P60, NONEXISTANT_LOCALE, "720p 60Hz" },
{ VIDEO_STD_1080I50, NONEXISTANT_LOCALE, "1080i 50Hz" },
{ VIDEO_STD_1080I60, NONEXISTANT_LOCALE, "1080i 60Hz" },
{ -1, NONEXISTANT_LOCALE, "1080p 23.97Hz"},
{ VIDEO_STD_1080P24, NONEXISTANT_LOCALE, "1080p 24Hz" },
{ VIDEO_STD_1080P25, NONEXISTANT_LOCALE, "1080p 25Hz" },
{ -1, NONEXISTANT_LOCALE, "1080p 29.97Hz"},
{ VIDEO_STD_1080P50, NONEXISTANT_LOCALE, "1080p 50Hz" },
{ -1, NONEXISTANT_LOCALE, "1080p 60Hz" },
{ -1, NONEXISTANT_LOCALE, "2160p 24Hz" },
{ -1, NONEXISTANT_LOCALE, "2160p 25Hz" },
{ -1, NONEXISTANT_LOCALE, "2160p 30Hz" },
{ -1, NONEXISTANT_LOCALE, "2160p 50Hz" },
{ -1, NONEXISTANT_LOCALE, "Auto" }
};
#elif BOXMODEL_HD51 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_MULTIBOXSE || BOXMODEL_VUPLUS_ALL
CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_OPTION_COUNT] =
{
@@ -428,7 +404,7 @@ int CVideoSettings::showVideoSetup()
#endif
}
#ifndef BOXMODEL_CST_HD2
else if (g_info.hw_caps->has_SCART) /* TRIPLEDRAGON hack... :-) TODO: SPARK? */
else if (g_info.hw_caps->has_SCART)
{
vs_scart_ch = new CMenuOptionChooser(LOCALE_VIDEOMENU_SCART, &g_settings.analog_mode1, VIDEOMENU_VIDEOSIGNAL_TD_OPTIONS, VIDEOMENU_VIDEOSIGNAL_TD_OPTION_COUNT, true, this);
}