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

- TRIPLEDRAGON: deleted

Browse Source 
Conflicts:
	lib/libdvbsub/dvbsub.cpp
	src/system/flashtool.cpp
This commit is contained in:
max_10
2020-10-03 22:47:34 +02:00
committed by Thilo Graf
parent fa91372706
commit 1fa824cab3
26 changed files with 22 additions and 637 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/gui/hdd_menu.cpp
View File

@@ -1217,39 +1217,6 @@ _remount:
snprintf(cmd, sizeof(cmd), "%s/plugins", dst.c_str());
safe_mkdir(cmd);
// sync();
#if HAVE_TRIPLEDRAGON
/* on the tripledragon, we mount via fstab, so we need to add an
fstab entry for dst */
FILE *g;
char *line = NULL;
unlink("/etc/fstab.new");
g = fopen("/etc/fstab.new", "w");
f = fopen("/etc/fstab", "r");
if (!g)
perror("open /etc/fstab.new");
else {
if (f) {
int ret;
while (true) {
size_t dummy;
ret = getline(&line, &dummy, f);
if (ret < 0)
break;
/* remove lines that start with the same disk we formatted
devname is /dev/xda" */
if (strncmp(line, devname.c_str(), devname.length()) != 0)
fprintf(g, "%s", line);
}
free(line);
fclose(f);
}
/* now add our new entry */
fprintf(g, "%s %s auto defaults 0 0\n", partname.c_str(), dst.c_str());
fclose(g);
rename("/etc/fstab", "/etc/fstab.old");
rename("/etc/fstab.new", "/etc/fstab");
}
#endif
}
}
_return:

44
src/gui/infoviewer.cpp
View File

@@ -2203,49 +2203,6 @@ int CInfoViewer::showChannelLogo(const t_channel_id logo_channel_id, const int c
return res;
}
#if HAVE_TRIPLEDRAGON
/* the cheap COOLSTREAM display cannot do this, so keep the routines separate */
void CInfoViewer::showLcdPercentOver()
{
if (g_settings.lcd_setting[SNeutrinoSettings::LCD_SHOW_VOLUME] != 1)
{
if (fileplay || NeutrinoModes::mode_ts == CNeutrinoApp::getInstance()->getMode()) {
CVFD::getInstance()->showPercentOver(CMoviePlayerGui::getInstance().file_prozent);
return;
}
static long long old_interval = 0;
int runningPercent = -1;
time_t jetzt = time(NULL);
long long interval = 60000000; /* 60 seconds default update time */
if (info_CurrentNext.flags & CSectionsdClient::epgflags::has_current) {
if (jetzt < info_CurrentNext.current_zeit.startzeit)
runningPercent = 0;
else if (jetzt > (int)(info_CurrentNext.current_zeit.startzeit +
info_CurrentNext.current_zeit.dauer))
runningPercent = -2; /* overtime */
else {
runningPercent = MIN((jetzt-info_CurrentNext.current_zeit.startzeit) * 100 /
info_CurrentNext.current_zeit.dauer, 100);
interval = info_CurrentNext.current_zeit.dauer * 1000LL * (1000/100); // update every percent
if (is_visible && interval > 60000000) // if infobar visible, update at
interval = 60000000; // least once per minute (radio mode)
if (interval < 5000000)
interval = 5000000; // but update only every 5 seconds
}
}
if (interval != old_interval) {
g_RCInput->killTimer(lcdUpdateTimer);
lcdUpdateTimer = g_RCInput->addTimer(interval, false);
//printf("lcdUpdateTimer: interval %lld old %lld\n",interval/1000000,old_interval/1000000);
old_interval = interval;
}
CLCD::getInstance()->showPercentOver(runningPercent);
int mode = CNeutrinoApp::getInstance()->getMode();
if ((mode == NeutrinoModes::mode_radio || mode == NeutrinoModes::mode_tv))
CVFD::getInstance()->setEPGTitle(info_CurrentNext.current_name);
}
}
#else
void CInfoViewer::showLcdPercentOver ()
{
if (g_settings.lcd_setting[SNeutrinoSettings::LCD_SHOW_VOLUME] != 1) {
@@ -2264,7 +2221,6 @@ void CInfoViewer::showLcdPercentOver ()
CVFD::getInstance ()->showPercentOver (runningPercent);
}
}
#endif
void CInfoViewer::showEpgInfo() //message on event change
{

5
src/gui/movieplayer.cpp
View File

@@ -180,11 +180,6 @@ void CMoviePlayerGui::Init(void)
// video files
filefilter_video.addFilter("ts");
#if !HAVE_TRIPLEDRAGON
filefilter_video.addFilter("asf");
filefilter_video.addFilter("avi");
filefilter_video.addFilter("mkv");
#endif
filefilter_video.addFilter("flv");
filefilter_video.addFilter("iso");
filefilter_video.addFilter("m2p");

26
src/gui/videosettings.cpp
View File

@@ -211,31 +211,7 @@ const CMenuOptionChooser::keyval VIDEOMENU_VIDEOSIGNAL_HD1PLUS_CINCH_OPTIONS[VID
* key value of -1 means the mode is not available
* TODO: instead of #ifdef select at run time
*/
#if HAVE_TRIPLEDRAGON
CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_OPTION_COUNT] =
{
{ VIDEO_STD_NTSC, NONEXISTANT_LOCALE, "NTSC" },
{ VIDEO_STD_PAL, NONEXISTANT_LOCALE, "PAL" },
{ VIDEO_STD_SECAM, NONEXISTANT_LOCALE, "SECAM" },
{ -1, NONEXISTANT_LOCALE, "480p" },
{ -1, NONEXISTANT_LOCALE, "576p" },
{ -1, NONEXISTANT_LOCALE, "720p 50Hz" },
{ -1, NONEXISTANT_LOCALE, "720p 60Hz" },
{ -1, NONEXISTANT_LOCALE, "1080i 50Hz" },
{ -1, NONEXISTANT_LOCALE, "1080i 60Hz" },
{ -1, NONEXISTANT_LOCALE, "1080p 23.97Hz"},
{ -1, NONEXISTANT_LOCALE, "1080p 24Hz" },
{ -1, NONEXISTANT_LOCALE, "1080p 25Hz" },
{ -1, NONEXISTANT_LOCALE, "1080p 29.97Hz"},
{ -1, 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_CST_HD1
#if BOXMODEL_CST_HD1
/* numbers corresponding to video.cpp from zapit */
CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_OPTION_COUNT] =
{