Commit Graph

401 Commits

Author SHA1 Message Date
svenhoefer
671949d8f3 - movieplayer: align some variables names to tango's names
Conflicts:
	src/gui/infoviewer.cpp
	src/gui/movieplayer.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
2018-01-09 22:55:05 +01:00
svenhoefer
bda74a585f - movieplayer: use bookmark icon for bookmark menu
Signed-off-by: Thilo Graf <dbt@novatux.de>
2018-01-05 00:52:58 +01:00
svenhoefer
3395ef1203 - movieplayer: remove playlist handling from RC_ok; mpkey_play already handles playlist
Conflicts:
	src/gui/movieplayer.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
2018-01-03 16:45:16 +01:00
svenhoefer
5019b3577e - remove obsolete streaminfo includes
Signed-off-by: Thilo Graf <dbt@novatux.de>
2018-01-03 16:44:36 +01:00
svenhoefer
430a0caaaf - movieplayer: revert most code from terrible commit 09ae4c3a5101f7cd7924b35a193b1c829c2cc107
to get back working subtitles for COOL_HARDWARE

Signed-off-by: Thilo Graf <dbt@novatux.de>

partial revert of: commit 6fe5d269af
2018-01-03 16:25:59 +01:00
svenhoefer
d0a84c3c84 - movieplayer: remove unused "netstream" handling
Signed-off-by: Thilo Graf <dbt@novatux.de>
2018-01-02 22:33:26 +01:00
svenhoefer
2a2872fcd6 - movieplayer: remove obsolete playback->SetTeletextPid() call
Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-12-28 00:07:23 +01:00
svenhoefer
30e4c575c3 - movieplayer: remove CRCInput::RC_text handling
Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-12-28 00:07:23 +01:00
svenhoefer
b4b9ea5842 - movieplayer: add missing std
Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-12-28 00:07:23 +01:00
svenhoefer
a470eb7167 - movieplayer: remove obsolete static bool running handling
Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-12-28 00:07:23 +01:00
svenhoefer
f528899cdb - movieplayer: remove unused 3d-code
Signed-off-by: Thilo Graf <dbt@novatux.de>

# Conflicts:
#	src/gui/movieplayer.cpp
2017-12-28 00:07:23 +01:00
svenhoefer
55b49bebd9 - movieplayer: remove unused ENABLE_GRAPHLCD code
Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-12-28 00:07:23 +01:00
Jacek Jendrzej
b67e21b5ce try to fix next file play on AX 2017-12-23 18:21:55 +01:00
Jacek Jendrzej
2eb1bb1cf5 fix play stop on cst after hd51 merge 2017-12-23 17:56:56 +01:00
Thilo Graf
91ee69f22e Fileplay: add separat fileplay for audio and video 2017-12-21 12:10:40 +01:00
svenhoefer
3d5aa5977a - neutrino: add more RC_playpause handling
Conflicts:
	src/gui/movieplayer.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-12-21 11:28:30 +01:00
Jacek Jendrzej
09858af7a8 enable yt for generic 2017-12-03 11:06:16 +01:00
svenhoefer
81b82668ac - screensaver: move more repeatedly used code to screensaver's code
Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-11-27 22:23:32 +01:00
svenhoefer
c963587a0f - movieplayer: use members from screensaver's code
Conflicts:
	src/gui/movieplayer.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-11-27 22:22:57 +01:00
Jacek Jendrzej
c88120cc03 fix webtv script path 2017-11-23 16:58:19 +01:00
svenhoefer
0fc3e793a4 - neutrino: unify modes handling; ...
remove double enum from CNeutrinoApp and move mostly used enum from NeutrinoMessages to new NeutrinoModes

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-11-22 15:42:09 +01:00
svenhoefer
3c6711d2d5 - movieplayer: try to fix display of servicename; ...
name can be changed while playing movies

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-11-16 20:39:34 +01:00
svenhoefer
cf190855c7 - movieplayer: fix screenshot function
Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-11-16 19:43:26 +01:00
svenhoefer
514bd932fc - cleanup from unsupported DUCKBOX_HARDWARE
Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-11-16 19:43:26 +01:00
svenhoefer
868f6184ae - movieplayer: cleanup from unsupported hardware ifdefs
Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-11-16 19:43:26 +01:00
svenhoefer
4e87634604 - movieplayer: don't stop playback with RC_home; it's confusing
Conflicts:
	src/gui/movieplayer.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-11-16 19:43:26 +01:00
svenhoefer
6f1b9d6fa5 - movieplayer: add some console spam to check modes
Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-11-16 19:43:26 +01:00
svenhoefer
1a86d7d301 - movieplayer: fix for '- movieplayer: fix new mode'
Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-11-16 19:43:26 +01:00
svenhoefer
a6e00fb606 - movieplayer: rename isWebTV => isWebChannel
Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-11-16 19:43:26 +01:00
svenhoefer
740fd3ac0d - rename IS_WEBTV => IS_WEBCHAN
Conflicts:
	src/zapit/src/capmt.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-11-16 19:43:26 +01:00
svenhoefer
098f021a3c - movieplayer: fix new mode
Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-11-16 19:43:26 +01:00
Jacek Jendrzej
86e7ad4ec1 src/gui/movieplayer.cpp fix break record after play on cst (after hd51 merge) 2017-11-07 18:23:49 +01:00
Jacek Jendrzej
02aefef167 src/gui/movieplayer.cpp fix audioselect in not filpeplayer mode (after merge) 2017-11-06 10:17:10 +01:00
Jacek Jendrzej
fd17bd9c57 disable file player mode for cst 2017-11-05 21:31:53 +01:00
Jacek Jendrzej
9ac5258ac0 src/gui/movieplayer.cpp reEnable YT 2017-11-03 10:02:18 +01:00
Jacek Jendrzej
8746340a87 src/gui/movieplayer.cpp fix page up/down jump and stop play after merge 2017-11-03 09:53:50 +01:00
TangoCash
ad757a9a60 - movieplayer: add progress to vfd 2017-11-01 15:40:28 +01:00
Thilo Graf
b26fc7fb8d CScreenShot: fix build
Some lines were wrong picked
2017-10-29 18:48:28 +01:00
svenhoefer
b9ed20ac53 let playback handle devices
Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-10-29 18:33:05 +01:00
TangoCash
c93b2a9b0b fix gstreamer playback 2017-10-29 18:31:48 +01:00
vanhofen
6fe5d269af - add hd51; mostly ported from TangoCash's neutrino-mp 2017-10-29 18:31:30 +01:00
Jacek Jendrzej
306c52642d Merge branch 'master' into pu/mp 2017-10-17 12:45:19 +02:00
Jacek Jendrzej
79a9186515 movieplayer.cpp remove free , attempting free on address which was not malloc()-ed 2017-10-17 12:42:32 +02:00
Jacek Jendrzej
3010cd24d7 Merge branch 'master' into pu/mp 2017-10-08 16:50:46 +02:00
Jacek Jendrzej
ea0cd48d18 fix video folderplay 2017-10-08 16:49:23 +02:00
Jacek Jendrzej
7ad4a0e6cc Merge branch 'master' into pu/mp 2017-10-02 13:56:25 +02:00
Stefan Seyfried
0d9139054a remove "using namespace std" from header files
"using namespace std" in headers is considered bad practice, so move it
either into the respective cpp files or (for files which have lots of
other std::xxx usage anyway) just write it out explicitly.
Looking at the headers and the affected cpp files, one can actually see
why it is bad practice, as it's spreading very far ;-)
2017-10-02 13:43:57 +02:00
Stefan Seyfried
c7f429019d moviplayer: suppress unused variable warning 2017-09-26 11:29:19 +02:00
M. Liebmann
600d215aaf Merge branch 'master' into pu/mp 2017-09-19 23:21:21 +02:00
M. Liebmann
25ae929523 Use parseJsonFromString() for parsing json data in
- CMoviePlayerGui::luaGetUrl()
    - CTimerList::RemoteBoxChanExists()
    - CTimerList::RemoteBoxTimerList()
    - CTimerList::paintItem()
    - cTmdb::GetMovieDetails()
    - cYTFeedParser::parseFeedJSON()
    - cYTFeedParser::parseFeedDetailsJSON()
2017-09-19 23:20:39 +02:00