Commit Graph

1367 Commits

Author SHA1 Message Date
Jacek Jendrzej
c79807fc3a fix memleak
Origin commit data
------------------
Branch: ni/coolstream
Commit: 511d953a18
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-18 (Mon, 18 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-18 14:11:34 +02:00
Jacek Jendrzej
8333edc0fb Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 98a31ea821
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 15:53:42 +02:00
vanhofen
fec79fd522 rework multimedia-menu code; cleanup from many unused code
Origin commit data
------------------
Branch: ni/coolstream
Commit: d23323758c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- rework multimedia-menu code; cleanup from many unused code

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

------------------
This commit was generated by Migit
2017-09-13 15:52:19 +02:00
vanhofen
5de0c243cc Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a0f93d9281
Author: vanhofen <vanhofen@gmx.de>
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 15:07:03 +02:00
vanhofen
46e5e5e202 rework multimedia-menu code; cleanup from many unused code
Origin commit data
------------------
Branch: ni/coolstream
Commit: 56cdb2dd6c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- rework multimedia-menu code; cleanup from many unused code

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

------------------
This commit was generated by Migit
2017-09-13 14:46:38 +02:00
Jacek Jendrzej
113f930317 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: a5bc9f1050
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 14:09:21 +02:00
Jacek Jendrzej
f55d2b44a6 fix pick diff error
Origin commit data
------------------
Branch: ni/coolstream
Commit: a7813a885d
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 14:08:29 +02:00
Jacek Jendrzej
35227f219c Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4e232439c3
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:52:49 +02:00
vanhofen
30105a0b3f remove unused nkplay stuff
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1fae4130b8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- remove unused nkplay stuff

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

------------------
This commit was generated by Migit
2017-09-13 13:48:16 +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
vanhofen
fadeac1d43 remove unused nkplay stuff
Origin commit data
------------------
Branch: ni/coolstream
Commit: 93c8768fbf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- remove unused nkplay stuff

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

------------------
This commit was generated by Migit
2017-09-13 13:09:34 +02:00
vanhofen
b6b296939a Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/neutrino_menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: bf366676b8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)



------------------
This commit was generated by Migit
2017-09-13 12:52:23 +02:00
vanhofen
2a4d7155b5 remove easymenu from config-file
Origin commit data
------------------
Branch: ni/coolstream
Commit: f42b74a317
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- remove easymenu from config-file

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

------------------
This commit was generated by Migit
2017-09-13 10:45:23 +02:00
vanhofen
2097d7e876 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/videosettings.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 163a6004fa
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)



------------------
This commit was generated by Migit
2017-09-13 08:36:25 +02:00
vanhofen
274dbc2d1e drop easymenu
Origin commit data
------------------
Branch: ni/coolstream
Commit: b502ed31b9
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-12 23:46:22 +02:00
vanhofen
e6d2ba00b3 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/osd_setup.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9e6dc9fbce
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)



------------------
This commit was generated by Migit
2017-09-12 22:32:07 +02:00
vanhofen
390b4406d0 move some actionkey-stuff from ni-menu directly to neutrino.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 16b57e40a8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- move some actionkey-stuff from ni-menu directly to neutrino.cpp

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

------------------
This commit was generated by Migit
2017-09-12 22:30:35 +02:00
vanhofen
88d02d6b60 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4bc4a80094
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-09 (Sat, 09 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-09 08:44:18 +02:00
vanhofen
ab5d217f63 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: eb76978295
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-09 (Sat, 09 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-09 08:43:52 +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
vanhofen
c5d81a62c4 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6488fbf13a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-07 (Thu, 07 Sep 2017)



------------------
This commit was generated by Migit
2017-09-07 16:41:06 +02:00
vanhofen
660c17ad44 add possibility to signalize available online-updates in infoicons
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3294d9f74d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-04 (Mon, 04 Sep 2017)

Origin message was:
------------------
- add possibility to signalize available online-updates in infoicons

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

------------------
This commit was generated by Migit
2017-09-04 17:17:27 +02:00
vanhofen
4b44169b39 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: ff282cbad1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-27 (Sun, 27 Aug 2017)


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

------------------
This commit was generated by Migit
2017-08-27 23:56:52 +02:00
vanhofen
31716245ba Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox
Conflicts:
	configure.ac
	src/driver/screenshot.cpp
	src/driver/streamts.cpp
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: a4fd09ecc2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-27 (Sun, 27 Aug 2017)



------------------
This commit was generated by Migit
2017-08-27 23:55:53 +02:00
Stefan Seyfried
f889b88c73 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: d1f5ea76a0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-26 (Sat, 26 Aug 2017)


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

------------------
This commit was generated by Migit
2017-08-26 12:58:44 +02:00
vanhofen
7ec5908e8e remove possibility to change iconsets for infoviewer
Origin commit data
------------------
Branch: ni/coolstream
Commit: ae9435f75d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-26 (Sat, 26 Aug 2017)

Origin message was:
------------------
- remove possibility to change iconsets for infoviewer

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

------------------
This commit was generated by Migit
2017-08-26 10:19:37 +02:00
vanhofen
4198cb9a35 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3c35e98212
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-25 (Fri, 25 Aug 2017)



------------------
This commit was generated by Migit
2017-08-25 14:15:22 +02:00
Jacek Jendrzej
640171523a Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8c45b2eea6
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 13:13:03 +02:00
vanhofen
cb19741014 hw_caps: remove CFEManager-code; ...
the relevant boxmodels are handled now in a "dirty part of hw_caps"
in neutrino.cpp after zapit-start


Origin commit data
------------------
Branch: ni/coolstream
Commit: c307ed5b36
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-14 (Mon, 14 Aug 2017)

Origin message was:
------------------
- hw_caps: remove CFEManager-code; ...

the relevant boxmodels are handled now in a "dirty part of hw_caps"
in neutrino.cpp after zapit-start


------------------
This commit was generated by Migit
2017-08-21 12:56:00 +02:00
Jacek Jendrzej
254893c889 Revert "- neutrino: fix hw_caps init; it must be initialized after zapit start"
This reverts commit 4ded8abb12.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8c8ae9595c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-21 (Mon, 21 Aug 2017)



------------------
This commit was generated by Migit
2017-08-21 12:53:05 +02:00
Jacek Jendrzej
1f09810ff1 part from ceab6aafbb
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0238049daf
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 10:57:18 +02:00
Jacek Jendrzej
3e3a327ac7 Revert "- neutrino: fix hw_caps init; it must be initialized after zapit start"
This reverts commit 4ded8abb12.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 491e51beeb
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-21 (Mon, 21 Aug 2017)



------------------
This commit was generated by Migit
2017-08-21 10:03:52 +02:00
vanhofen
025b8adad6 audioplayer. add streamripper control to record current stream
Origin commit data
------------------
Branch: ni/coolstream
Commit: 24affa8a8b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-17 (Thu, 17 Aug 2017)

Origin message was:
------------------
- audioplayer. add streamripper control to record current stream

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

------------------
This commit was generated by Migit
2017-08-17 21:13:19 +02:00
vanhofen
ceab6aafbb hw_caps: remove CFEManager-code; ...
the relevant boxmodels are handled now in a "dirty part of hw_caps"
in neutrino.cpp after zapit-start


Origin commit data
------------------
Branch: ni/coolstream
Commit: 382181e289
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-14 (Mon, 14 Aug 2017)

Origin message was:
------------------
- hw_caps: remove CFEManager-code; ...

the relevant boxmodels are handled now in a "dirty part of hw_caps"
in neutrino.cpp after zapit-start


------------------
This commit was generated by Migit
2017-08-14 10:56:45 +02:00
vanhofen
9b23f854ed Revert "- neutrino: fix hw_caps init; it must be initialized after zapit start"
This reverts commit 4ded8abb12 in
preparation for following changes.

Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: affcf191a9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-14 (Mon, 14 Aug 2017)



------------------
This commit was generated by Migit
2017-08-14 09:56:23 +02:00
Jacek Jendrzej
4052e6868c Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1763bb9e64
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-08 (Tue, 08 Aug 2017)


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

------------------
This commit was generated by Migit
2017-08-08 20:06:40 +02:00
vanhofen
489ec90298 Merge branch 'pu/mp' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox
Conflicts:
	configure.ac
	src/driver/screenshot.cpp
	src/gui/components/cc_frm_footer.cpp
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 368c043a54
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-07 (Mon, 07 Aug 2017)



------------------
This commit was generated by Migit
2017-08-07 17:34:29 +02:00
vanhofen
b7c3fd7646 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: c654c35d70
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-07 (Mon, 07 Aug 2017)


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

------------------
This commit was generated by Migit
2017-08-07 15:59:38 +02:00
vanhofen
2d6ad62b30 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6d49aee959
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-07 (Mon, 07 Aug 2017)


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

------------------
This commit was generated by Migit
2017-08-07 08:20:56 +02:00
GetAway
c9e8652129 neutrino.cpp: repaint of background in radio mode, when close UPNP-Browser
Origin commit data
------------------
Branch: ni/coolstream
Commit: 95b535016f
Author: GetAway <get-away@t-online.de>
Date: 2017-08-06 (Sun, 06 Aug 2017)


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

------------------
This commit was generated by Migit
2017-08-07 07:52:32 +02:00
vanhofen
22ee4f9999 fix merge-error
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1da05b3cee
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-01 (Tue, 01 Aug 2017)

Origin message was:
------------------
- fix merge-error

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

------------------
This commit was generated by Migit
2017-08-01 12:37:12 +02:00
vanhofen
0c4b28ddfe Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: e0364d9b3c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-01 (Tue, 01 Aug 2017)


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

------------------
This commit was generated by Migit
2017-08-01 12:36:04 +02:00
vanhofen
eb215c9ee0 fix hw_caps init for non-coolstream hardware
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0732790aea
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-01 (Tue, 01 Aug 2017)

Origin message was:
------------------
- fix hw_caps init for non-coolstream hardware

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

------------------
This commit was generated by Migit
2017-08-01 12:35:25 +02:00
vanhofen
838077f002 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: edf3dfdc18
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-01 (Tue, 01 Aug 2017)


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

------------------
This commit was generated by Migit
2017-08-01 11:15:08 +02:00
Jacek Jendrzej
80887f7906 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 72a9fa40db
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-07-05 (Wed, 05 Jul 2017)


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

------------------
This commit was generated by Migit
2017-07-05 21:43:36 +02:00
vanhofen
066b234f8f Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: e7f499e8ff
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-07-05 (Wed, 05 Jul 2017)


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

------------------
This commit was generated by Migit
2017-07-05 13:39:15 +02:00
TangoCash
19059348be no shutdown if streaming (thx dbo)
prevent shutdown from timer if stb is started from deep standby > does a
timer-record > and meanwhile streaming (eg. localTV or via web-if to PC)
is active

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 57f46e1f2b
Author: TangoCash <eric@loxat.de>
Date: 2017-07-05 (Wed, 05 Jul 2017)



------------------
This commit was generated by Migit
2017-07-05 10:41:27 +02:00
vanhofen
995c47e0b2 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 111ac82c9a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-07-04 (Tue, 04 Jul 2017)


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

------------------
This commit was generated by Migit
2017-07-04 14:07:10 +02:00
vanhofen
5820d8a8a0 epgscan: allow to set rescan period to catch a bug in epgscan
Scan isn't executed while a movie is played. When movie is stopped
the scan-timer is ignored too.

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 761a2b2e73
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-07-04 (Tue, 04 Jul 2017)

Origin message was:
------------------
- epgscan: allow to set rescan period to catch a bug in epgscan

Scan isn't executed while a movie is played. When movie is stopped
the scan-timer is ignored too.

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


------------------
This commit was generated by Migit
2017-07-04 12:22:53 +02:00