mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-01 01:41:12 +02:00
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
configure.ac
data/icons/buttons/0.png
data/icons/buttons/1.png
data/icons/buttons/2.png
data/icons/buttons/3.png
data/icons/buttons/4.png
data/icons/buttons/5.png
data/icons/buttons/6.png
data/icons/buttons/7.png
data/icons/buttons/8.png
data/icons/buttons/9.png
data/icons/buttons/blau.png
data/icons/buttons/btn_backward.png
data/icons/buttons/btn_forward.png
data/icons/buttons/btn_pause.png
data/icons/buttons/btn_play.png
data/icons/buttons/btn_record_active.png
data/icons/buttons/btn_record_inactive.png
data/icons/buttons/btn_stop.png
data/icons/buttons/down.png
data/icons/buttons/gelb.png
data/icons/buttons/gruen.png
data/icons/buttons/help.png
data/icons/buttons/help_small.png
data/icons/buttons/home.png
data/icons/buttons/info.png
data/icons/buttons/info_small.png
data/icons/buttons/left.png
data/icons/buttons/menu.png
data/icons/buttons/menu_small.png
data/icons/buttons/mute_small.png
data/icons/buttons/mute_zap_gray.png
data/icons/buttons/mute_zap_green.png
data/icons/buttons/ok.png
data/icons/buttons/power.png
data/icons/buttons/right.png
data/icons/buttons/rot.png
data/icons/buttons/up.png
data/icons/filetypes/movie.png
data/icons/filetypes/mp3.png
data/icons/headers/audio.png
data/icons/headers/bookmarkmanager.png
data/icons/headers/colors.png
data/icons/headers/error.png
data/icons/headers/features.png
data/icons/headers/games.png
data/icons/headers/icon_blue.png
data/icons/headers/icon_green.png
data/icons/headers/icon_red.png
data/icons/headers/icon_yellow.png
data/icons/headers/information.png
data/icons/headers/keybinding.png
data/icons/headers/language.png
data/icons/headers/lcd.png
data/icons/headers/mainmenue.png
data/icons/headers/multimedia.png
data/icons/headers/network.png
data/icons/headers/personalize.png
data/icons/headers/shell.png
data/icons/headers/softupdate.png
data/icons/headers/streaming.png
data/icons/headers/timer.png
data/icons/headers/upnp.png
data/icons/headers/video.png
data/icons/movieplayer/mp_b-skip.png
data/icons/movieplayer/mp_f-skip.png
data/icons/movieplayer/mp_pause.png
data/icons/movieplayer/mp_play.png
data/icons/movieplayer/mp_play_repeat_all.png
data/icons/movieplayer/mp_play_repeat_track.png
data/icons/status/ca/biss_green.png
data/icons/status/ca/biss_white.png
data/icons/status/ca/biss_yellow.png
data/icons/status/ca/conax_green.png
data/icons/status/ca/conax_white.png
data/icons/status/ca/conax_yellow.png
data/icons/status/ca/cw_green.png
data/icons/status/ca/cw_white.png
data/icons/status/ca/cw_yellow.png
data/icons/status/ca/d_green.png
data/icons/status/ca/d_white.png
data/icons/status/ca/d_yellow.png
data/icons/status/ca/ird_green.png
data/icons/status/ca/ird_white.png
data/icons/status/ca/ird_yellow.png
data/icons/status/ca/nagra_green.png
data/icons/status/ca/nagra_white.png
data/icons/status/ca/nagra_yellow.png
data/icons/status/ca/nds_green.png
data/icons/status/ca/nds_white.png
data/icons/status/ca/nds_yellow.png
data/icons/status/ca/powervu_green.png
data/icons/status/ca/powervu_white.png
data/icons/status/ca/powervu_yellow.png
data/icons/status/ca/seca_green.png
data/icons/status/ca/seca_white.png
data/icons/status/ca/seca_yellow.png
data/icons/status/ca/via_green.png
data/icons/status/ca/via_white.png
data/icons/status/ca/via_yellow.png
data/icons/status/ca/x_green.png
data/icons/status/ca/x_white.png
data/icons/status/ca/x_yellow.png
data/icons/status/channel/16_9.png
data/icons/status/channel/16_9_gray.png
data/icons/status/channel/ca2.png
data/icons/status/channel/ca2_gray.png
data/icons/status/channel/dd.png
data/icons/status/channel/dd_avail.png
data/icons/status/channel/dd_gray.png
data/icons/status/channel/radiotextget.png
data/icons/status/channel/radiotextoff.png
data/icons/status/channel/radiotextwait.png
data/icons/status/channel/res_000.png
data/icons/status/channel/res_1080.png
data/icons/status/channel/res_1280.png
data/icons/status/channel/res_1440.png
data/icons/status/channel/res_1920.png
data/icons/status/channel/res_288.png
data/icons/status/channel/res_352.png
data/icons/status/channel/res_382.png
data/icons/status/channel/res_480.png
data/icons/status/channel/res_528.png
data/icons/status/channel/res_544.png
data/icons/status/channel/res_576.png
data/icons/status/channel/res_704.png
data/icons/status/channel/res_720.png
data/icons/status/channel/res_hd.png
data/icons/status/channel/res_sd.png
data/icons/status/channel/subt.png
data/icons/status/channel/subt_gray.png
data/icons/status/channel/tuner_1.png
data/icons/status/channel/tuner_2.png
data/icons/status/channel/tuner_3.png
data/icons/status/channel/tuner_4.png
data/icons/status/channel/vtxt.png
data/icons/status/channel/vtxt_gray.png
data/icons/status/various/ats.png
data/icons/status/various/ats_gray.png
data/icons/status/various/ca.png
data/icons/status/various/lock.png
data/icons/status/various/mounted.png
data/icons/status/various/mute.png
data/icons/status/various/not_mounted.png
data/icons/status/various/pip.png
data/icons/status/various/rec_event_marker.png
data/icons/status/various/rec_gray.png
data/icons/status/various/zap.png
data/locale/Makefile.am
data/locale/english.locale
data/pictures/backgrounds/1280x720/start.jpg
src/driver/fb_accel_sti.cpp
src/gui/Makefile.am
src/gui/dboxinfo.cpp
src/gui/infoviewer_bb.cpp
src/gui/movieplayer.cpp
src/gui/osd_setup.cpp
src/gui/streaminfo2.cpp
src/gui/themes.cpp
src/neutrino.cpp
src/system/flashtool.cpp
src/system/settings.cpp
src/system/settings.h
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4121099dcf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-18 (Wed, 18 Oct 2017)
------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
@@ -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
|
||||
|
||||
@@ -81,6 +82,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>
|
||||
|
||||
@@ -167,22 +174,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())
|
||||
@@ -251,6 +267,14 @@ void CMoviePlayerGui::cutNeutrino()
|
||||
|
||||
g_Zapit->lockPlayBack();
|
||||
|
||||
#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;
|
||||
@@ -279,6 +303,10 @@ void CMoviePlayerGui::restoreNeutrino()
|
||||
#endif
|
||||
|
||||
playing = false;
|
||||
#ifdef HAVE_AZBOX_HARDWARE
|
||||
g_Zapit->setStandby(false);
|
||||
CZapit::getInstance()->SetVolume(CZapit::getInstance()->GetVolume());
|
||||
#endif
|
||||
|
||||
if (isUPNP)
|
||||
return;
|
||||
@@ -446,7 +474,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);
|
||||
}
|
||||
|
||||
@@ -1351,6 +1379,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
|
||||
bool first_start = true;
|
||||
bool update_lcd = true;
|
||||
int eof = 0;
|
||||
int lastpos = 0;
|
||||
int eof2 = 0;
|
||||
int position_tmp = 0;
|
||||
bool at_eof = !(playstate >= CMoviePlayerGui::PLAY);;
|
||||
@@ -1398,7 +1427,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 */
|
||||
if(file_prozent > 89 && (playstate == CMoviePlayerGui::PLAY) && (speed == 1)){
|
||||
@@ -1913,9 +1945,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_CS_HD2
|
||||
#if ! defined(HAVE_SPARK_HARDWARE) && ! defined (BOXMODEL_CS_HD2)
|
||||
enabled = false;
|
||||
#endif
|
||||
break;
|
||||
@@ -2089,7 +2122,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(¤t_time);
|
||||
@@ -2591,7 +2624,6 @@ void CMoviePlayerGui::showSubtitle(neutrino_msg_data_t data)
|
||||
#endif
|
||||
|
||||
frameBuffer->blit2FB(newdata, nw, nh, xoff, yoff);
|
||||
free(newdata);
|
||||
|
||||
min_x = std::min(min_x, xoff);
|
||||
max_x = std::max(max_x, xoff + nw);
|
||||
@@ -2831,6 +2863,7 @@ void CMoviePlayerGui::makeScreenShot(bool autoshot, bool forcover)
|
||||
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)
|
||||
@@ -2881,6 +2914,9 @@ void CMoviePlayerGui::makeScreenShot(bool autoshot, bool forcover)
|
||||
}
|
||||
}
|
||||
sc->Start();
|
||||
#else
|
||||
(void)forcover;
|
||||
#endif
|
||||
if (autoshot)
|
||||
autoshot_done = true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user