Commit Graph

370 Commits

Author SHA1 Message Date
Jacek Jendrzej
c147b324d2 src/gui/movieplayer.cpp fix break record after play on cst (after hd51 merge)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 86e7ad4ec1
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-11-07 (Tue, 07 Nov 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-11-07 18:23:49 +01:00
Jacek Jendrzej
10d5efa502 src/gui/movieplayer.cpp fix audioselect in not filpeplayer mode (after merge)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 02aefef167
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-11-06 (Mon, 06 Nov 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-11-06 10:17:10 +01:00
Jacek Jendrzej
aaa0db622a disable file player mode for cst
Origin commit data
------------------
Branch: ni/coolstream
Commit: fd17bd9c57
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-11-05 (Sun, 05 Nov 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-11-05 21:31:53 +01:00
Jacek Jendrzej
632c42f78f src/gui/movieplayer.cpp reEnable YT
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9ac5258ac0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-11-03 (Fri, 03 Nov 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-11-03 10:02:18 +01:00
Jacek Jendrzej
1a913ff0fd src/gui/movieplayer.cpp fix page up/down jump and stop play after merge
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8746340a87
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-11-03 (Fri, 03 Nov 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-11-03 09:53:50 +01:00
TangoCash
d620bab0bd movieplayer: add progress to vfd
Origin commit data
------------------
Branch: ni/coolstream
Commit: ad757a9a60
Author: TangoCash <eric@loxat.de>
Date: 2017-10-31 (Tue, 31 Oct 2017)

Origin message was:
------------------
- movieplayer: add progress to vfd

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-11-01 15:40:28 +01:00
Thilo Graf
1ddcc24bc7 CScreenShot: fix build
Some lines were wrong picked


Origin commit data
------------------
Branch: ni/coolstream
Commit: b26fc7fb8d
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-27 (Fri, 27 Oct 2017)



------------------
This commit was generated by Migit
2017-10-29 18:48:28 +01:00
vanhofen
b77c5ed8d7 let playback handle devices
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: b9ed20ac53
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-15 (Sun, 15 Oct 2017)



------------------
This commit was generated by Migit
2017-10-29 18:33:05 +01:00
TangoCash
063b8e24bf fix gstreamer playback
Origin commit data
------------------
Branch: ni/coolstream
Commit: c93b2a9b0b
Author: TangoCash <eric@loxat.de>
Date: 2017-10-06 (Fri, 06 Oct 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-29 18:31:48 +01:00
vanhofen
6bca93d258 add hd51; mostly ported from TangoCash's neutrino-mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6fe5d269af
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-05 (Thu, 05 Oct 2017)

Origin message was:
------------------
- add hd51; mostly ported from TangoCash's neutrino-mp

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-29 18:31:30 +01:00
Jacek Jendrzej
a9631a3b10 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 306c52642d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-17 (Tue, 17 Oct 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-17 12:45:19 +02:00
Jacek Jendrzej
db35c38ba6 movieplayer.cpp remove free , attempting free on address which was not malloc()-ed
Origin commit data
------------------
Branch: ni/coolstream
Commit: 79a9186515
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-17 (Tue, 17 Oct 2017)

Origin message was:
------------------
movieplayer.cpp remove free , attempting free on address which was not malloc()-ed

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-17 12:42:32 +02:00
Jacek Jendrzej
8e0791afea Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3010cd24d7
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-08 (Sun, 08 Oct 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-08 16:50:46 +02:00
Jacek Jendrzej
4720ee5d7e fix video folderplay
Origin commit data
------------------
Branch: ni/coolstream
Commit: ea0cd48d18
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-08 (Sun, 08 Oct 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-08 16:49:23 +02:00
Jacek Jendrzej
a91765a685 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7ad4a0e6cc
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-02 (Mon, 02 Oct 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-02 13:56:25 +02:00
Stefan Seyfried
ef71d00d7f 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 ;-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0d9139054a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-10-01 (Sun, 01 Oct 2017)



------------------
This commit was generated by Migit
2017-10-02 13:43:57 +02:00
Stefan Seyfried
ef32e19175 moviplayer: suppress unused variable warning
Origin commit data
------------------
Branch: ni/coolstream
Commit: c7f429019d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-23 (Sat, 23 Sep 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-26 11:29:19 +02:00
Michael Liebmann
41747046e5 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 600d215aaf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-09-19 (Tue, 19 Sep 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-19 23:21:21 +02:00
Michael Liebmann
54b43f7745 Use parseJsonFromString() for parsing json data in
- CMoviePlayerGui::luaGetUrl()
 - CTimerList::RemoteBoxChanExists()
 - CTimerList::RemoteBoxTimerList()
 - CTimerList::paintItem()
 - cTmdb::GetMovieDetails()
 - cYTFeedParser::parseFeedJSON()
 - cYTFeedParser::parseFeedDetailsJSON()


Origin commit data
------------------
Branch: ni/coolstream
Commit: 25ae929523
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-09-19 (Tue, 19 Sep 2017)

Origin message was:
------------------
Use parseJsonFromString() for parsing json data in

  - CMoviePlayerGui::luaGetUrl()
  - CTimerList::RemoteBoxChanExists()
  - CTimerList::RemoteBoxTimerList()
  - CTimerList::paintItem()
  - cTmdb::GetMovieDetails()
  - cYTFeedParser::parseFeedJSON()
  - cYTFeedParser::parseFeedDetailsJSON()


------------------
This commit was generated by Migit
2017-09-19 23:20:39 +02:00
Jacek Jendrzej
bea20473aa Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2c5bf73006
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-13 (Wed, 13 Sep 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-13 13:40:40 +02:00
vanhofen
9b9e405f04 drop easymenu
Origin commit data
------------------
Branch: ni/coolstream
Commit: 816de89898
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- drop easymenu

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-13 13:35:23 +02:00
Jacek Jendrzej
a67cecd575 remove double includes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6576729fd1
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-08 (Fri, 08 Sep 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-08 21:21:32 +02:00
Jacek Jendrzej
e36f298e5d Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6be63f736c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-23 (Wed, 23 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-23 13:10:49 +02:00
Jacek Jendrzej
d7856dc0ce some inits and never read var
Origin commit data
------------------
Branch: ni/coolstream
Commit: ba600f0e5c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-23 (Wed, 23 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-23 12:58:26 +02:00
Jacek Jendrzej
c592fe60d6 some inits warnings
Origin commit data
------------------
Branch: ni/coolstream
Commit: c99486520e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-21 (Mon, 21 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-21 14:42:24 +02:00
Jacek Jendrzej
12870b976c Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: f791ee1455
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-07-02 (Sun, 02 Jul 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-07-02 17:22:23 +02:00
Jacek Jendrzej
5d38764dc8 src/gui/movieplayer.cpp fix play icon after pause->seek
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4318615a60
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-30 (Fri, 30 Jun 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-06-30 13:42:09 +02:00
Jacek Jendrzej
d5b0ebf8f1 src/gui/movieplayer.cpp show FileTimeOSD only if setSpeed work
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1f095b96c9
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-30 (Fri, 30 Jun 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-06-30 13:40:19 +02:00
Jacek Jendrzej
a1a386122d Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6179aa7d38
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-12 (Mon, 12 Jun 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-06-12 11:27:38 +02:00
Jacek Jendrzej
d9224e1050 src/gui/movieplayer.cpp fix possible segfault
Origin commit data
------------------
Branch: ni/coolstream
Commit: cca6526b2f
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-11 (Sun, 11 Jun 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-06-11 20:00:33 +02:00
Jacek Jendrzej
0b9ac652bf Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: ca83324763
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-07 (Wed, 07 Jun 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-06-07 16:20:47 +02:00
Michael Liebmann
e2b33894eb Merge branch 'pu/fb-setmode'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 624f2b3154
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-06-07 (Wed, 07 Jun 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-06-07 14:18:01 +02:00
Jacek Jendrzej
28bcf2997e change prozent ckeck to 90
Origin commit data
------------------
Branch: ni/coolstream
Commit: ab829a61b6
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-30 (Tue, 30 May 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-05-30 19:26:04 +02:00
Jacek Jendrzej
06aef234de Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 020f044c07
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-08 (Mon, 08 May 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-05-08 12:57:22 +02:00
Thilo Graf
c0babc0484 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 07c72026ed
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-08 (Mon, 08 May 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-05-08 12:25:42 +02:00
Thilo Graf
11b4748125 movieplayer.cpp: prevent build error
Avoid build error if build not configured with -D__STDC_LIMIT_MACROS


Origin commit data
------------------
Branch: ni/coolstream
Commit: f1779d0a97
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-08 (Mon, 08 May 2017)



------------------
This commit was generated by Migit
2017-05-08 12:18:52 +02:00
Thilo Graf
e9e7ea72b8 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: e35acf2e2f
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-08 (Mon, 08 May 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-05-08 08:28:20 +02:00
Thilo Graf
1148afc62b movieplayer.cpp: remove possible compile issue
"__STDC_LIMIT_MACROS" redefined


Origin commit data
------------------
Branch: ni/coolstream
Commit: 65b09044c5
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-08 (Mon, 08 May 2017)



------------------
This commit was generated by Migit
2017-05-08 08:26:14 +02:00
Michael Liebmann
3a34afe94e Fix videosystem auto mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: b612c1f620
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-28 (Tue, 28 Mar 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-03-28 23:56:57 +02:00
Michael Liebmann
79b679a9ca Fix videosystem auto mode / osd mode switch in movie player
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2a858c628a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-22 (Wed, 22 Mar 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-03-22 14:00:41 +01:00
Stefan Seyfried
587fa7d77a Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6f1cfd42bb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-07 (Tue, 07 Mar 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-03-07 19:43:06 +01:00
Jacek Jendrzej
4c19475bd1 make neutrino compatible with new ffmpeg
Origin commit data
------------------
Branch: ni/coolstream
Commit: bfa589eb08
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-07 (Tue, 07 Mar 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-03-07 15:00:17 +01:00
Jacek Jendrzej
a3a0da0277 src/gui/movieplayer.cpp some streams need more time pro frame
Origin commit data
------------------
Branch: ni/coolstream
Commit: 92abe90d58
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-06 (Mon, 06 Mar 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-03-06 14:41:25 +01:00
Stefan Seyfried
a5cbcf84af Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: abec1c311b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-04 (Sat, 04 Mar 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-03-04 19:32:30 +01:00
vanhofen
c1140e0c1c rename g_PluginList to g_Plugins; this isn't a list of plugins
Origin commit data
------------------
Branch: ni/coolstream
Commit: 856c676430
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)

Origin message was:
------------------
- rename g_PluginList to g_Plugins; this isn't a list of plugins

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-03-01 13:03:50 +01:00
Jacek Jendrzej
1e00a117ad src/gui/movieplayer.cpp try fix stop play file on file end
Origin commit data
------------------
Branch: ni/coolstream
Commit: df25b50944
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-02-26 (Sun, 26 Feb 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-02-26 15:05:21 +01:00
Stefan Seyfried
4635eb375c Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5c95139207
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-02-22 08:44:53 +01:00
Stefan Seyfried
90fa290ed5 libtuxtxt: remove unused fd parameter from tuxtx_main()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 418819e261
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-19 (Sun, 19 Feb 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-02-21 06:38:48 +01:00
Stefan Seyfried
690f065e3f libtuxtxt: remove unused fd parameter from tuxtx_main()
Origin commit data
------------------
Branch: ni/coolstream
Commit: eb3fa7f2af
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-19 (Sun, 19 Feb 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-02-19 11:52:37 +01:00
Jacek Jendrzej
b59d0fa8f9 try to fix segfault with --enable-cleanup
Origin commit data
------------------
Branch: ni/coolstream
Commit: e908858c19
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-02-17 (Fri, 17 Feb 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-02-17 12:11:03 +01:00