mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 10:21:04 +02:00
Code Issues Packages Projects Releases Wiki Activity
15,872 Commits 2 Branches 9 Tags
a49bf4d436b7f7e8816c2094e3a74d6a0665ff7a
Commit Graph

1608 Commits

Author SHA1 Message Date
Jacek Jendrzej
c44f82f12a Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 2c5bf73006
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-13 (Wed, 13 Sep 2017)
 2017-09-13 13:40:40 +02:00
vanhofen
9db42a7d2b drop easymenu 
Origin commit data
------------------
Commit: 816de89898
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- drop easymenu
 2017-09-13 13:35:23 +02:00
vanhofen
99455725dc remove unused nkplay stuff 
Origin commit data
------------------
Commit: 93c8768fbf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- remove unused nkplay stuff
 2017-09-13 13:09:34 +02:00
vanhofen
f71684c751 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/neutrino_menue.cpp


Origin commit data
------------------
Commit: bf366676b8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)
 2017-09-13 12:52:23 +02:00
vanhofen
2d6e2ab9c1 remove easymenu from config-file 
Origin commit data
------------------
Commit: f42b74a317
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- remove easymenu from config-file
 2017-09-13 10:45:23 +02:00
vanhofen
487fa232a3 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/videosettings.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Commit: 163a6004fa
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)
 2017-09-13 08:36:25 +02:00
vanhofen
ff21981795 drop easymenu 
Origin commit data
------------------
Commit: b502ed31b9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- drop easymenu
 2017-09-12 23:46:22 +02:00
vanhofen
c6c61f6b22 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/osd_setup.cpp


Origin commit data
------------------
Commit: 9e6dc9fbce
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)
 2017-09-12 22:32:07 +02:00
vanhofen
7f86f04782 move some actionkey-stuff from ni-menu directly to neutrino.cpp 
Origin commit data
------------------
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
 2017-09-12 22:30:35 +02:00
vanhofen
f37efba8f7 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 4bc4a80094
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-09 (Sat, 09 Sep 2017)
 2017-09-09 08:44:18 +02:00
vanhofen
2ee7a428d9 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: eb76978295
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-09 (Sat, 09 Sep 2017)
 2017-09-09 08:43:52 +02:00
Jacek Jendrzej
b03ab5cb9e remove double includes 
Origin commit data
------------------
Commit: 6576729fd1
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-08 (Fri, 08 Sep 2017)
 2017-09-08 21:21:32 +02:00
vanhofen
4250a45ea5 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/Makefile.am


Origin commit data
------------------
Commit: 6488fbf13a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-07 (Thu, 07 Sep 2017)
 2017-09-07 16:41:06 +02:00
vanhofen
abd30071dd add possibility to signalize available online-updates in infoicons 
Origin commit data
------------------
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
 2017-09-04 17:17:27 +02:00
vanhofen
284426853d Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: ff282cbad1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-27 (Sun, 27 Aug 2017)
 2017-08-27 23:56:52 +02:00
vanhofen
25a4911df4 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
------------------
Commit: a4fd09ecc2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-27 (Sun, 27 Aug 2017)
 2017-08-27 23:55:53 +02:00
Stefan Seyfried
5db1afe258 Merge remote-tracking branch 'tuxbox/master' 
Origin commit data
------------------
Commit: d1f5ea76a0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-26 (Sat, 26 Aug 2017)
 2017-08-26 12:58:44 +02:00
vanhofen
e87210b1d2 remove possibility to change iconsets for infoviewer 
Origin commit data
------------------
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
 2017-08-26 10:19:37 +02:00
vanhofen
7c75ab360f Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: 3c35e98212
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-25 (Fri, 25 Aug 2017)
 2017-08-25 14:15:22 +02:00
Jacek Jendrzej
a887d8b2e9 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 8c45b2eea6
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-21 (Mon, 21 Aug 2017)
 2017-08-21 13:13:03 +02:00
vanhofen
cce5365b59 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
------------------
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
 2017-08-21 12:56:00 +02:00
Jacek Jendrzej
d5966753c1 Revert "- neutrino: fix hw_caps init; it must be initialized after zapit start" 
This reverts commit 2d4130dab8.


Origin commit data
------------------
Commit: 8c8ae9595c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-21 (Mon, 21 Aug 2017)
 2017-08-21 12:53:05 +02:00
Jacek Jendrzej
f9a565da5d part from c2095e1759 
Origin commit data
------------------
Commit: 0238049daf
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-21 (Mon, 21 Aug 2017)
 2017-08-21 10:57:18 +02:00
Jacek Jendrzej
da5998afc1 Revert "- neutrino: fix hw_caps init; it must be initialized after zapit start" 
This reverts commit 2d4130dab8.


Origin commit data
------------------
Commit: 491e51beeb
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-21 (Mon, 21 Aug 2017)
 2017-08-21 10:03:52 +02:00
vanhofen
378dfeeda6 audioplayer. add streamripper control to record current stream 
Origin commit data
------------------
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
 2017-08-17 21:13:19 +02:00
vanhofen
c2095e1759 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
------------------
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
 2017-08-14 10:56:45 +02:00
vanhofen
c8aeed6eeb Revert "- neutrino: fix hw_caps init; it must be initialized after zapit start" 
This reverts commit 2d4130dab8 in
preparation for following changes.

Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: affcf191a9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-14 (Mon, 14 Aug 2017)
 2017-08-14 09:56:23 +02:00
Jacek Jendrzej
b01bf9414d Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 1763bb9e64
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-08 (Tue, 08 Aug 2017)
 2017-08-08 20:06:40 +02:00
vanhofen
c3dc7849b9 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
------------------
Commit: 368c043a54
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-07 (Mon, 07 Aug 2017)
 2017-08-07 17:34:29 +02:00
vanhofen
8f336e9552 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: c654c35d70
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-07 (Mon, 07 Aug 2017)
 2017-08-07 15:59:38 +02:00
vanhofen
e21f270c04 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 6d49aee959
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-07 (Mon, 07 Aug 2017)
 2017-08-07 08:20:56 +02:00
GetAway
d7b6312321 neutrino.cpp: repaint of background in radio mode, when close UPNP-Browser 
Origin commit data
------------------
Commit: 95b535016f
Author: GetAway <get-away@t-online.de>
Date: 2017-08-06 (Sun, 06 Aug 2017)
 2017-08-07 07:52:32 +02:00
vanhofen
64c47582f4 fix merge-error 
Origin commit data
------------------
Commit: 1da05b3cee
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-01 (Tue, 01 Aug 2017)

Origin message was:
------------------
- fix merge-error
 2017-08-01 12:37:12 +02:00
vanhofen
e540017d8b Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: e0364d9b3c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-01 (Tue, 01 Aug 2017)
 2017-08-01 12:36:04 +02:00
vanhofen
9d6d2daeb7 fix hw_caps init for non-coolstream hardware 
Origin commit data
------------------
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
 2017-08-01 12:35:25 +02:00
vanhofen
ff24e343ce Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: edf3dfdc18
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-01 (Tue, 01 Aug 2017)
 2017-08-01 11:15:08 +02:00
Jacek Jendrzej
01fd3b4e90 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 72a9fa40db
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-07-05 (Wed, 05 Jul 2017)
 2017-07-05 21:43:36 +02:00
vanhofen
1e05ae41b4 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: e7f499e8ff
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-07-05 (Wed, 05 Jul 2017)
 2017-07-05 13:39:15 +02:00
TangoCash
e17852237a 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
------------------
Commit: 57f46e1f2b
Author: TangoCash <eric@loxat.de>
Date: 2017-07-05 (Wed, 05 Jul 2017)
 2017-07-05 10:41:27 +02:00
vanhofen
94e386d4ac Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 111ac82c9a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-07-04 (Tue, 04 Jul 2017)
 2017-07-04 14:07:10 +02:00
vanhofen
a828c8a32a 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
------------------
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>
 2017-07-04 12:22:53 +02:00
vanhofen
fe6f8eb2b2 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.


Origin commit data
------------------
Commit: 36a1a146fc
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.
 2017-07-04 11:07:30 +02:00
Jacek Jendrzej
9159d45c90 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 4c3002cb26
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-15 (Thu, 15 Jun 2017)
 2017-06-15 12:32:31 +02:00
vanhofen
b162e3d2aa Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/components/cc_frm_footer.cpp


Origin commit data
------------------
Commit: c68ae57571
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)
 2017-06-15 11:07:32 +02:00
vanhofen
a4aa97f4c5 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	data/icons/headers/pictureviewer.png
	data/locale/english.locale
	src/global.h
	src/gui/components/cc_frm_footer.h
	src/gui/eventlist.cpp
	src/gui/pictureviewer.cpp
	src/gui/widget/icons.h
	src/gui/widget/menue.cpp


Origin commit data
------------------
Commit: a8ef409ff6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)
 2017-06-15 10:37:41 +02:00
Thilo Graf
b705d884ad CNeutrinoApp: add hook for neutrino start 
Script will be executed on start of neutrino before. Handling is similar
like all other possible hooks, see global.h.


Origin commit data
------------------
Commit: 78f1b294a9
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)
 2017-06-15 09:07:02 +02:00
vanhofen
c35224ff08 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: 17546e7ba1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-10 (Sat, 10 Jun 2017)
 2017-06-10 11:43:50 +02:00
Jacek Jendrzej
4643ac3f51 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: ca83324763
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-07 (Wed, 07 Jun 2017)
 2017-06-07 16:20:47 +02:00
vanhofen
5a9e9904a7 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	configure.ac
	data/icons/filetypes/mp3.png
	data/icons/filetypes/picture.png
	src/gui/audioplayer.cpp
	src/gui/bouquetlist.cpp
	src/gui/filebrowser.cpp
	src/gui/followscreenings.cpp
	src/gui/followscreenings.h
	src/gui/osd_setup.cpp
	src/gui/record_setup.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: 75db11c2e2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-07 (Wed, 07 Jun 2017)
 2017-06-07 15:14:51 +02:00
Michael Liebmann
9767657185 Merge branch 'pu/fb-setmode' 
Origin commit data
------------------
Commit: 624f2b3154
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-06-07 (Wed, 07 Jun 2017)
 2017-06-07 14:18:01 +02:00