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

Merge branch 'ni/mp' into ni/cst-next

Browse Source 
Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/Makefile.am
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libdvbsub/dvbsub.cpp
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/gui/dboxinfo.cpp
	src/gui/movieplayer.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/Makefile.am
	src/system/flashtool.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 161347db29
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-08-26 19:13:47 +02:00
parent 8f2cbeb841 73da438ec4
commit af8fe3ebc6
220 changed files with 7577 additions and 1615 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/gui/movieplayer.cpp
View File

@@ -3,6 +3,7 @@
Movieplayer (c) 2003, 2004 by gagga
Based on code by Dirch, obi and the Metzler Bros. Thanks.
(C) 2010-2014 Stefan Seyfried
Copyright (C) 2011 CoolStream International Ltd
@@ -76,6 +77,12 @@
#include <iconv.h>
#include <system/stacktrace.h>
#ifndef HAVE_COOL_HARDWARE
#define LCD_MODE CVFD::MODE_MOVIE
#else
#define LCD_MODE CVFD::MODE_MENU_UTF8
#endif
//NI InfoIcons
#include <gui/infoicons.h>
extern CInfoIcons *InfoIcons;
@@ -151,22 +158,31 @@ void CMoviePlayerGui::Init(void)
bookmarkmanager = new CBookmarkManager();
tsfilefilter.addFilter("ts");
#if HAVE_TRIPLEDRAGON
tsfilefilter.addFilter("vdr");
#else
tsfilefilter.addFilter("avi");
tsfilefilter.addFilter("mkv");
tsfilefilter.addFilter("wav");
tsfilefilter.addFilter("asf");
tsfilefilter.addFilter("aiff");
tsfilefilter.addFilter("mp4");
tsfilefilter.addFilter("mov");
#endif
tsfilefilter.addFilter("mpg");
tsfilefilter.addFilter("mpeg");
tsfilefilter.addFilter("m2p");
tsfilefilter.addFilter("mpv");
tsfilefilter.addFilter("vob");
tsfilefilter.addFilter("m2ts");
tsfilefilter.addFilter("mp4");
tsfilefilter.addFilter("mov");
tsfilefilter.addFilter("m3u");
tsfilefilter.addFilter("m3u8");
tsfilefilter.addFilter("pls");
tsfilefilter.addFilter("vdr");
#ifdef HAVE_SPARK_HARDWARE
tsfilefilter.addFilter("flv");
tsfilefilter.addFilter("wmv");
#endif
tsfilefilter.addFilter("iso");
if (g_settings.network_nfs_moviedir.empty())
@@ -228,6 +244,14 @@ void CMoviePlayerGui::cutNeutrino()
//NI if (!isWebTV)
//NI g_Sectionsd->setPauseScanning(true);
#ifdef HAVE_AZBOX_HARDWARE
/* we need sectionsd to get idle and zapit to release the demuxes
* and decoders so that the external player can do its work
* TODO: what about timeshift? */
g_Sectionsd->setServiceChanged(0, false);
g_Zapit->setStandby(true);
#endif
m_LastMode = (CNeutrinoApp::getInstance()->getMode() /*| NeutrinoMessages::norezap*/);
if (isWebTV)
m_LastMode |= NeutrinoMessages::norezap;
@@ -243,6 +267,10 @@ void CMoviePlayerGui::restoreNeutrino()
return;
playing = false;
#ifdef HAVE_AZBOX_HARDWARE
g_Zapit->setStandby(false);
CZapit::getInstance()->SetVolume(CZapit::getInstance()->GetVolume());
#endif
if (isUPNP)
return;
@@ -406,7 +434,7 @@ void CMoviePlayerGui::updateLcd()
break;
}
lcd += name;
CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8);
CVFD::getInstance()->setMode(LCD_MODE);
CVFD::getInstance()->showMenuText(0, lcd.c_str(), -1, true);
}
@@ -1300,6 +1328,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
bool first_start = true;
bool update_lcd = true;
int eof = 0;
int lastpos = 0;
bool at_eof = !(playstate >= CMoviePlayerGui::PLAY);;
keyPressed = CMoviePlayerGui::PLUGIN_PLAYSTATE_NORMAL;
while (playstate >= CMoviePlayerGui::PLAY)
@@ -1332,7 +1361,10 @@ void CMoviePlayerGui::PlayFileLoop(void)
update_lcd = true;
}
#ifdef DEBUG
printf("CMoviePlayerGui::%s: spd %d pos %d/%d (%d, %d%%)\n", __func__, speed, position, duration, duration-position, file_prozent);
if (msg < CRCInput::RC_Events || eof > 0 || position - lastpos >= 10000) {
lastpos = position;
printf("CMoviePlayerGui::%s: spd %d pos %d/%d (%d, %d%%)\n", __func__, speed, position, duration, duration-position, file_prozent);
}
#endif
/* in case ffmpeg report incorrect values */
int posdiff = duration - position;
@@ -1779,9 +1811,10 @@ void CMoviePlayerGui::addAudioFormat(int count, std::string &apidtitle, bool& en
apidtitle.append(" (AAC)");
break;
case 6: /*DTS*/
apidtitle.append(" (DTS)");
if (apidtitle.find("DTS") == std::string::npos)
apidtitle.append(" (DTS)");
#ifndef BOXMODEL_APOLLO
#if ! defined(HAVE_SPARK_HARDWARE) && ! defined (BOXMODEL_APOLLO)
enabled = false;
#endif
break;
@@ -1955,7 +1988,7 @@ void CMoviePlayerGui::handleMovieBrowser(neutrino_msg_t msg, int /*position*/)
}
else if ((msg == (neutrino_msg_t) g_settings.mpkey_stop) || msg == CRCInput::RC_home) { //NI
// if we have a movie information, try to save the stop position
printf("CMoviePlayerGui::handleMovieBrowser: stop, isMovieBrowser %d p_movie_info %x\n", isMovieBrowser, (int) p_movie_info);
printf("CMoviePlayerGui::handleMovieBrowser: stop, isMovieBrowser %d p_movie_info %p\n", isMovieBrowser, p_movie_info);
if (isMovieBrowser && p_movie_info) {
timeb current_time;
ftime(&current_time);
@@ -2695,12 +2728,16 @@ bool CMoviePlayerGui::mountIso(CFile *file)
}
return false;
}
void CMoviePlayerGui::makeScreenShot(bool autoshot, bool forcover)
void CMoviePlayerGui::makeScreenShot(bool autoshot, bool
#ifdef SCREENSHOT
forcover
#endif
)
{
if (autoshot && (autoshot_done || !g_settings.auto_cover))
return;
#ifdef SCREENSHOT
bool cover = autoshot || g_settings.screenshot_cover || forcover;
char ending[(sizeof(int)*2) + 6] = ".jpg";
if (!cover)
@@ -2751,6 +2788,7 @@ void CMoviePlayerGui::makeScreenShot(bool autoshot, bool forcover)
}
}
sc->Start();
#endif
if (autoshot)
autoshot_done = true;
}