mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 16:31:05 +02:00
Code Issues Packages Projects Releases Wiki Activity
12,112 Commits 2 Branches 9 Tags
3b0222d2d5a68b16e0d841770f7b23a1c14cebe9
Commit Graph

181 Commits

Author SHA1 Message Date
vanhofen
3b0222d2d5 Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox 
Conflicts:
	configure.ac
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/videosettings.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Commit: 11d7263bcd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)
 2017-09-25 11:41:44 +02:00
Stefan Seyfried
6534abad88 change time_monotonic_ms() from time_t to int64_t 
time_monotonic_ms values did wrap every ~24 days, leading to problems
in code that did not cope with that. Instead of fixing all places where
relative comparisons with time_monotonic_ms() are made, just use a
bigger datatype. Convert all users to the new type.


Origin commit data
------------------
Commit: 99ff4857ff
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-23 (Sat, 23 Sep 2017)
 2017-09-23 21:35:01 +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
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
vanhofen
5628badb78 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: 470a8b62dd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-23 (Wed, 23 Aug 2017)
 2017-08-23 15:24:38 +02:00
Jacek Jendrzej
973b9ebe54 some inits warnings 
Origin commit data
------------------
Commit: c99486520e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-21 (Mon, 21 Aug 2017)
 2017-08-21 14:42:24 +02:00
vanhofen
9973792652 Revert "HD1 compat #2; pu/fb-setmode" 
This reverts commit e768096b64.


Origin commit data
------------------
Commit: 48480e94d2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)
 2017-05-08 23:47:39 +02:00
Michael Liebmann
e768096b64 HD1 compat #2; pu/fb-setmode 
Origin commit data
------------------
Commit: 894233a9db
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-05-04 (Thu, 04 May 2017)
 2017-05-08 16:44:14 +02:00
vanhofen
bb03a67aa7 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 053d97363c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-29 (Wed, 29 Mar 2017)
 2017-03-29 21:02:27 +02:00
vanhofen
dd6d985e19 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale


Origin commit data
------------------
Commit: 1107088c0b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-29 (Wed, 29 Mar 2017)
 2017-03-29 08:05:10 +02:00
Michael Liebmann
7d49a497b5 CStreamInfo2: Add new info items 
- Videosystem
 - OSD Resolution


Origin commit data
------------------
Commit: f7cea75f37
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-28 (Tue, 28 Mar 2017)
 2017-03-28 23:56:57 +02:00
vanhofen
85fab3c019 Merge branch 'pu/mp' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox 
Conflicts:
	data/locale/english.locale
	data/pictures/backgrounds/1280x720/shutdown.jpg
	src/Makefile.am
	src/zapit/src/frontend.cpp


Origin commit data
------------------
Commit: 40e46a0df3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)
 2017-03-15 23:45:02 +01:00
Jacek Jendrzej
36ea8d10e2 src/gui/streaminfo2.cpp add MP3 info 
Origin commit data
------------------
Commit: 90c68453a5
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-14 (Tue, 14 Mar 2017)
 2017-03-14 21:34:08 +01:00
Stefan Seyfried
a73e775906 Merge remote-tracking branch 'tuxbox/master' 
Origin commit data
------------------
Commit: 48ff7b36a2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-01-30 (Mon, 30 Jan 2017)
 2017-01-30 21:36:09 +01:00
vanhofen
32e7c1e423 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 4fc269c7d4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-29 (Sun, 29 Jan 2017)
 2017-01-29 22:37:59 +01:00
vanhofen
5f7c69b604 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/streaminfo2.cpp


Origin commit data
------------------
Commit: 0538176850
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-29 (Sun, 29 Jan 2017)
 2017-01-29 22:34:42 +01:00
vanhofen
9c4cba3a57 streaminfo2: add comment because of broken libcoolstream2 output 
Origin commit data
------------------
Commit: 891bc71f9d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-29 (Sun, 29 Jan 2017)

Origin message was:
------------------
- streaminfo2: add comment because of broken libcoolstream2 output
 2017-01-29 22:31:21 +01:00
Stefan Seyfried
c95aca9252 Merge remote-tracking branch 'tuxbox/master' 
Origin commit data
------------------
Commit: a409047714
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-01-22 (Sun, 22 Jan 2017)
 2017-01-22 22:59:39 +01:00
vanhofen
b01bea3f85 streaminfo2: just code cosmetics; no binary changes 
Origin commit data
------------------
Commit: db06238cd5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-30 (Fri, 30 Dec 2016)

Origin message was:
------------------
- streaminfo2: just code cosmetics; no binary changes
 2016-12-30 08:22:24 +01:00
vanhofen
65e0a39980 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	data/locale/nederlands.locale
	data/locale/slovak.locale
	data/locale/unmaintained/czech.locale
	src/gui/components/cc_frm_footer.cpp
	src/gui/start_wizard.cpp
	src/gui/widget/msgbox.cpp


Origin commit data
------------------
Commit: fce378f8ff
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)
 2016-11-21 12:46:49 +01:00
vanhofen
cc7ad7ce1a Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/lua/lua_misc.cpp
	src/neutrino.cpp
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Commit: 3420991007
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-19 (Sat, 19 Nov 2016)
 2016-11-19 21:11:54 +01:00
vanhofen
ee5ff0408d Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox 
Conflicts:
	configure.ac
	data/locale/deutsch.locale
	data/locale/english.locale
	data/locale/slovak.locale
	lib/libcoolstream/hardware_caps.cpp
	lib/libcoolstream/hardware_caps.h
	lib/libdvbsub/dvbsubtitle.cpp
	lib/timerdclient/timerdclient.cpp
	src/daemonc/Makefile.am
	src/daemonc/remotecontrol.cpp
	src/driver/framebuffer_ng.h
	src/driver/pictureviewer/Makefile.am
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/dboxinfo.cpp
	src/gui/epgplus.cpp
	src/gui/epgview.cpp
	src/gui/plugins.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/gui/widget/listbox.cpp
	src/gui/widget/listhelpers.cpp
	src/neutrino.cpp
	src/system/helpers.cpp
	src/system/helpers.h
	src/system/settings.cpp
	src/system/settings.h
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Commit: 75cce3b113
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)
 2016-10-25 13:08:01 +02:00
Stefan Seyfried
54189f271a Merge remote-tracking branch 'tuxbox/master' 
* needs compile fixes
* needs additional tests, of course :-)


Origin commit data
------------------
Commit: 13ab1ebc8a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)
 2016-10-22 11:37:40 +02:00
vanhofen
7220c6b265 Merge branch 'ni/cst-next' into ni/mp/cst-next 
Conflicts:
	acinclude.m4
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/epgplus.cpp
	src/gui/plugins.cpp
	src/gui/widget/listbox.cpp
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Commit: 7135aac394
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)
 2016-10-10 17:27:55 +02:00
vanhofen
248b6c8684 Merge /home/svenhoefer/cst-public-gui-neutrino into ni/cst-next 
Conflicts:
	src/gui/audioplayer.cpp
	src/gui/channellist.cpp
	src/gui/components/cc_detailsline.cpp
	src/gui/components/cc_detailsline.h
	src/gui/components/cc_item_infobox.h
	src/gui/infoviewer.cpp
	src/gui/upnpbrowser.cpp
	src/gui/widget/keyboard_input.cpp
	src/gui/widget/menue.cpp


Origin commit data
------------------
Commit: 5a70a3f78e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)
 2016-10-10 16:45:30 +02:00
vanhofen
892603fe68 rename customcolor.h -> color_custom.h; reduce unneeded inludes 
Origin commit data
------------------
Commit: 104d21e784
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- rename customcolor.h -> color_custom.h; reduce unneeded inludes
 2016-10-10 14:19:55 +02:00
vanhofen
8f5588a9d1 streaminfo2: fix redeclaration of neutrino_msg_data_t data 
Origin commit data
------------------
Commit: 4dc16c8ff3
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-30 (Fri, 30 Sep 2016)

Origin message was:
------------------
- streaminfo2: fix redeclaration of neutrino_msg_data_t data
 2016-09-30 00:18:26 +02:00
vanhofen
dc49f53122 Merge branch 'ni/cst-next' into ni/mp/cst-next 
Conflicts:
	src/gui/streaminfo2.cpp


Origin commit data
------------------
Commit: e2dfa1c952
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-30 (Fri, 30 Sep 2016)
 2016-09-30 00:12:45 +02:00
vanhofen
75b1831a3e Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Origin commit data
------------------
Commit: 0e5aceecbe
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-30 (Fri, 30 Sep 2016)
 2016-09-30 00:02:47 +02:00
vanhofen
51e872dab9 streaminfo2: allow fade in/out 
Origin commit data
------------------
Commit: 6cff0d23ce
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-30 (Fri, 30 Sep 2016)

Origin message was:
------------------
- streaminfo2: allow fade in/out
 2016-09-30 00:02:01 +02:00
vanhofen
73463ef279 add listModeKey() function to simplify these calls 
Origin commit data
------------------
Commit: 59b7e3ae36
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- add listModeKey() function to simplify these calls
 2016-09-20 08:03:50 +02:00
vanhofen
91fc1e2528 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Origin commit data
------------------
Commit: e419a5c3b6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)
 2016-09-09 10:45:45 +02:00
vanhofen
fa2686a90e add listModeKey() function to simplify these calls 
Origin commit data
------------------
Commit: 2911e638c7
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- add listModeKey() function to simplify these calls
 2016-09-09 10:42:46 +02:00
vanhofen
b61315b6a9 streaminfo2: fix merge error 
Origin commit data
------------------
Commit: 675ef26065
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)

Origin message was:
------------------
- streaminfo2: fix merge error
 2016-08-26 20:02:43 +02:00
vanhofen
bc33663742 Merge branch 'ni/mp' into ni/cst-next 
Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/Makefile.am
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libdvbsub/dvbsub.cpp
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/gui/dboxinfo.cpp
	src/gui/movieplayer.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/Makefile.am
	src/system/flashtool.cpp


Origin commit data
------------------
Commit: 161347db29
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)
 2016-08-26 19:13:47 +02:00
Michael Liebmann
4246a31ba6 Merge branch 'cst-next' into nmp-cst-next 
- Fix merge conflicts


Origin commit data
------------------
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)
 2016-08-19 17:40:48 +02:00
vanhofen
4cf2b60722 NI \o/ 
Origin commit data
------------------
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)
 2016-05-19 22:59:54 +02:00
[CST] Focus
38ede6dfb0 neutrino: add webtv channel list mode 
Origin commit data
------------------
Commit: 302642cee7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-23 (Wed, 23 Mar 2016)
 2016-03-23 16:36:00 +03:00
Stefan Seyfried
8822421c6b Merge remote-tracking branch 'uncool/cst-next' 
Origin commit data
------------------
Commit: b837d8697b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-28 (Mon, 28 Dec 2015)
 2015-12-28 16:15:14 +01:00
Thilo Graf
edf48f0011 CStreamInfo2: try to fix wrong text colors 
Text color was not matching for background color. In some constellations
with theme settings, text is not really good readable.
COL_MENUCONTENT_... requires COL_MENUCONTENT_TEXT, not COL_INFOBAR_TEXT


Origin commit data
------------------
Commit: b86586bf68
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-12-26 (Sat, 26 Dec 2015)
 2015-12-27 14:42:32 +01:00
Thilo Graf
72a289a90c components: rework classes 
- outsourced some classes cc_item.cpp/h, cc_draw.cpp/h
- added extra methodes for simple use of some basic components extra.cpp/h
- rework clock handling: use timer class, reworked members for
 enable/disable clock with external timer events,
 tryed to fix some display issues related with infoclock and
 time osd clock in moviebrowser, channellist, menuus
- reworked hide/kill handling, removed parameter for hide(), try to use
 cached backgrounds for other constallations, paint cache, image cache (all beta)
- reworked shadow/frame handling, add shadow modes for left/right
 arrangement, TODO: repaint for existant instances required
- reworked color gradient assignment (beta)

... Note: I had a data crash in my local git tree
and i tryed to restore my historie, but most was lost. Therefore here
the commit is large


Origin commit data
------------------
Commit: 0146511f38
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-11-18 (Wed, 18 Nov 2015)

Origin message was:
------------------
components: rework classes

- outsourced some classes cc_item.cpp/h, cc_draw.cpp/h
- added extra methodes for simple use of some basic components extra.cpp/h
- rework clock handling: use timer class, reworked members for
 enable/disable clock with external timer events,
 tryed to fix some display issues related with infoclock and
 time osd clock in moviebrowser, channellist, menuus
- reworked hide/kill handling, removed parameter for hide(), try to use
 cached backgrounds for other constallations, paint cache, image cache (all beta)
- reworked shadow/frame handling, add shadow modes for left/right
 arrangement, TODO: repaint for existant instances required
- reworked color gradient assignment (beta)

... Note: I had a data crash in my local git tree
and i tryed to restore my historie, but most was lost. Therefore here
the commit is large
 2015-12-27 14:42:27 +01:00
Jacek Jendrzej
768560f749 src/gui/streaminfo2.cpp fix box width 
Origin commit data
------------------
Commit: c565223bc7
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-12-26 (Sat, 26 Dec 2015)
 2015-12-26 19:13:17 +01:00
Jacek Jendrzej
7852c58eb9 src/gui/streaminfo2.cpp change sprintf to snprintf (fix possible segfault) 
Origin commit data
------------------
Commit: fba05d0e80
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-12-26 (Sat, 26 Dec 2015)
 2015-12-26 18:37:26 +01:00
Stefan Seyfried
fa4df47cc5 Merge remote-tracking branch 'uncool/cst-next' 
Origin commit data
------------------
Commit: 33676d28bf
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-21 (Mon, 21 Dec 2015)
 2015-12-21 14:38:26 +01:00
Jacek Jendrzej
436764b05d src/gui/streaminfo2.cpp add show channel realname, thx Janus 
Origin commit data
------------------
Commit: c08a339484
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-12-16 (Wed, 16 Dec 2015)
 2015-12-16 12:00:35 +01:00
Jacek Jendrzej
f7cd956b50 src/gui/streaminfo2.cpp show max 16 apids 
Origin commit data
------------------
Commit: 3a64f6c230
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-12-15 (Tue, 15 Dec 2015)
 2015-12-15 20:03:07 +01:00
Stefan Seyfried
03e3eb95f1 Merge remote-tracking branch 'uncool/cst-next' 
Origin commit data
------------------
Commit: 2d949bce16
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-15 (Tue, 15 Dec 2015)
 2015-12-15 17:29:18 +01:00
vanhofen
60ba7ef468 streaminfo: align background color; thx to max_10 
Origin commit data
------------------
Commit: 9b2aec781c
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-12-15 (Tue, 15 Dec 2015)

Origin message was:
------------------
- streaminfo: align background color; thx to max_10
 2015-12-15 12:05:53 +01:00
vanhofen
3c3c33c5d2 streaminfo: show movieplayer as source, when no webtv is running 
Origin commit data
------------------
Commit: ad3a2f701b
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-12-14 (Mon, 14 Dec 2015)

Origin message was:
------------------
- streaminfo: show movieplayer as source, when no webtv is running
 2015-12-15 08:15:17 +01:00
Stefan Seyfried
17880c4125 Merge remote-tracking branch 'uncool/cst-next' 
This need buildfixes and some functional updates...


Origin commit data
------------------
Commit: eeee5bacab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)
 2015-12-13 17:41:55 +01:00