Commit Graph

166 Commits

Author SHA1 Message Date
vanhofen
b5a155f1f9 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4fc269c7d4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-29 (Sun, 29 Jan 2017)


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

------------------
This commit was generated by Migit
2017-01-29 22:37:59 +01:00
vanhofen
7fb403cd58 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/streaminfo2.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0538176850
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-29 (Sun, 29 Jan 2017)



------------------
This commit was generated by Migit
2017-01-29 22:34:42 +01:00
vanhofen
be515e5152 streaminfo2: add comment because of broken libcoolstream2 output
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2017-01-29 22:31:21 +01:00
vanhofen
3306c94002 streaminfo2: just code cosmetics; no binary changes
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2016-12-30 08:22:24 +01:00
vanhofen
6b0e887585 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
------------------
Branch: ni/coolstream
Commit: fce378f8ff
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)



------------------
This commit was generated by Migit
2016-11-21 12:46:49 +01:00
vanhofen
a413bfb40d 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
------------------
Branch: ni/coolstream
Commit: 3420991007
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-19 (Sat, 19 Nov 2016)



------------------
This commit was generated by Migit
2016-11-19 21:11:54 +01:00
vanhofen
8474ef8c98 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
------------------
Branch: ni/coolstream
Commit: 75cce3b113
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)



------------------
This commit was generated by Migit
2016-10-25 13:08:01 +02:00
Stefan Seyfried
3f75ef5f47 Merge remote-tracking branch 'tuxbox/master'
* needs compile fixes
* needs additional tests, of course :-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 13ab1ebc8a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)



------------------
This commit was generated by Migit
2016-10-22 11:37:40 +02:00
vanhofen
ca5c4b00d7 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
------------------
Branch: ni/coolstream
Commit: 7135aac394
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)



------------------
This commit was generated by Migit
2016-10-10 17:27:55 +02:00
vanhofen
3739b4de04 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
------------------
Branch: ni/coolstream
Commit: 5a70a3f78e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)



------------------
This commit was generated by Migit
2016-10-10 16:45:30 +02:00
vanhofen
bb756163b1 rename customcolor.h -> color_custom.h; reduce unneeded inludes
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2016-10-10 14:19:55 +02:00
vanhofen
941e37a5f1 streaminfo2: fix redeclaration of neutrino_msg_data_t data
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2016-09-30 00:18:26 +02:00
vanhofen
776e5802d4 Merge branch 'ni/cst-next' into ni/mp/cst-next
Conflicts:
	src/gui/streaminfo2.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: e2dfa1c952
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-30 (Fri, 30 Sep 2016)



------------------
This commit was generated by Migit
2016-09-30 00:12:45 +02:00
vanhofen
2f7743c901 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0e5aceecbe
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-30 (Fri, 30 Sep 2016)


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

------------------
This commit was generated by Migit
2016-09-30 00:02:47 +02:00
vanhofen
16b4ae67e6 streaminfo2: allow fade in/out
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6cff0d23ce
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-30 (Fri, 30 Sep 2016)

Origin message was:
------------------
- streaminfo2: allow fade in/out

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

------------------
This commit was generated by Migit
2016-09-30 00:02:01 +02:00
vanhofen
8c213521f8 add listModeKey() function to simplify these calls
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2016-09-20 08:03:50 +02:00
vanhofen
af4767a199 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: e419a5c3b6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)


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

------------------
This commit was generated by Migit
2016-09-09 10:45:45 +02:00
vanhofen
58b62b0445 add listModeKey() function to simplify these calls
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2016-09-09 10:42:46 +02:00
vanhofen
1ebd4df379 streaminfo2: fix merge error
Origin commit data
------------------
Branch: ni/coolstream
Commit: 675ef26065
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)

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

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

------------------
This commit was generated by Migit
2016-08-26 20:02:43 +02:00
vanhofen
af8fe3ebc6 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
------------------
Branch: ni/coolstream
Commit: 161347db29
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)



------------------
This commit was generated by Migit
2016-08-26 19:13:47 +02:00
Michael Liebmann
2c4ccf9555 Merge branch 'cst-next' into nmp-cst-next
- Fix merge conflicts


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)



------------------
This commit was generated by Migit
2016-08-19 17:40:48 +02:00
vanhofen
a86bc779b4 NI \o/
Origin commit data
------------------
Branch: ni/coolstream
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)


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

------------------
This commit was generated by Migit
2016-05-19 22:59:54 +02:00
[CST] Focus
f02dae27c7 neutrino: add webtv channel list mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 302642cee7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-23 (Wed, 23 Mar 2016)


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

------------------
This commit was generated by Migit
2016-03-23 16:36:00 +03:00
Stefan Seyfried
0a95a07654 Merge remote-tracking branch 'uncool/cst-next'
Origin commit data
------------------
Branch: ni/coolstream
Commit: b837d8697b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-28 (Mon, 28 Dec 2015)


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

------------------
This commit was generated by Migit
2015-12-28 16:15:14 +01:00
Thilo Graf
a4324f7e26 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
------------------
Branch: ni/coolstream
Commit: b86586bf68
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-12-26 (Sat, 26 Dec 2015)



------------------
This commit was generated by Migit
2015-12-27 14:42:32 +01:00
Thilo Graf
9e3882b7bc 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
------------------
Branch: ni/coolstream
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


------------------
This commit was generated by Migit
2015-12-27 14:42:27 +01:00
Jacek Jendrzej
bdd5d46c64 src/gui/streaminfo2.cpp fix box width
Origin commit data
------------------
Branch: ni/coolstream
Commit: c565223bc7
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-12-26 (Sat, 26 Dec 2015)


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

------------------
This commit was generated by Migit
2015-12-26 19:13:17 +01:00
Jacek Jendrzej
93bea78bd4 src/gui/streaminfo2.cpp change sprintf to snprintf (fix possible segfault)
Origin commit data
------------------
Branch: ni/coolstream
Commit: fba05d0e80
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-12-26 (Sat, 26 Dec 2015)


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

------------------
This commit was generated by Migit
2015-12-26 18:37:26 +01:00
Stefan Seyfried
6cd0730eb2 Merge remote-tracking branch 'uncool/cst-next'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 33676d28bf
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-21 (Mon, 21 Dec 2015)


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

------------------
This commit was generated by Migit
2015-12-21 14:38:26 +01:00
Jacek Jendrzej
8a86e9617d src/gui/streaminfo2.cpp add show channel realname, thx Janus
Origin commit data
------------------
Branch: ni/coolstream
Commit: c08a339484
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-12-16 (Wed, 16 Dec 2015)


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

------------------
This commit was generated by Migit
2015-12-16 12:00:35 +01:00
Jacek Jendrzej
e84a6e30eb src/gui/streaminfo2.cpp show max 16 apids
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3a64f6c230
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-12-15 (Tue, 15 Dec 2015)


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

------------------
This commit was generated by Migit
2015-12-15 20:03:07 +01:00
Stefan Seyfried
5b0debf29a Merge remote-tracking branch 'uncool/cst-next'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2d949bce16
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-15 (Tue, 15 Dec 2015)


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

------------------
This commit was generated by Migit
2015-12-15 17:29:18 +01:00
vanhofen
4554411e30 streaminfo: align background color; thx to max_10
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2015-12-15 12:05:53 +01:00
vanhofen
03659ff79b streaminfo: show movieplayer as source, when no webtv is running
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2015-12-15 08:15:17 +01:00
Stefan Seyfried
5f89c9a312 Merge remote-tracking branch 'uncool/cst-next'
This need buildfixes and some functional updates...


Origin commit data
------------------
Branch: ni/coolstream
Commit: eeee5bacab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)



------------------
This commit was generated by Migit
2015-12-13 17:41:55 +01:00
defans
965f37c49e streaminfo2.cpp: reduce signalbox flickering
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5cb0ca21cd
Author: defans <defans@bluepeercrew.us>
Date: 2015-11-20 (Fri, 20 Nov 2015)

Origin message was:
------------------
- streaminfo2.cpp: reduce signalbox flickering

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

------------------
This commit was generated by Migit
2015-11-20 09:06:27 +01:00
defans
8fb0608a8f streaminfo2.cpp: force repaint of signalbox after ...
... switching back from signal diagram


Origin commit data
------------------
Branch: ni/coolstream
Commit: c689e5d224
Author: defans <defans@bluepeercrew.us>
Date: 2015-11-19 (Thu, 19 Nov 2015)

Origin message was:
------------------
- streaminfo2.cpp: force repaint of signalbox after ...

... switching back from signal diagram


------------------
This commit was generated by Migit
2015-11-19 12:11:50 +01:00
[CST] Focus
5fa63a028a gui/streaminfo2.cpp: add bitrate info for TS/webtv/file playback, based on code (C) martii
Origin commit data
------------------
Branch: ni/coolstream
Commit: 891c0fe8d0
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-10-29 (Thu, 29 Oct 2015)


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

------------------
This commit was generated by Migit
2015-11-06 17:23:29 +03:00
Stefan Seyfried
189e55ec30 global.h: Use forward-declarations to reduce number of dependencies
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ab6b53054
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-04-16 (Thu, 16 Apr 2015)


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

------------------
This commit was generated by Migit
2015-04-16 13:39:35 +02:00
[CST] Focus
2f645f90ae gui/streaminfo2.cpp: fix empty paint on fta channels
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9176132ed4
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-03-09 (Mon, 09 Mar 2015)


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

------------------
This commit was generated by Migit
2015-03-09 13:53:06 +03:00
[CST] Focus
3487af57f0 gui/streaminfo2.cpp: disable screen save for PiG
Origin commit data
------------------
Branch: ni/coolstream
Commit: dd887dfd9b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-03-09 (Mon, 09 Mar 2015)


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

------------------
This commit was generated by Migit
2015-03-09 13:22:26 +03:00
Stefan Seyfried
bef490df8d streaminfo: don't paint outside of the framebuffer
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 51fddab5a6
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-21 (Sat, 21 Feb 2015)



------------------
This commit was generated by Migit
2015-02-22 15:53:18 +01:00
Stefan Seyfried
cdfb1c0408 streaminfo: fix alignment of average bitrate display
Also remove the decimal points which are not useful.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3933023386
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-21 (Sat, 21 Feb 2015)



------------------
This commit was generated by Migit
2015-02-21 20:58:10 +01:00
Stefan Seyfried
820bbb2510 streaminfo: move signal bars below the signal graph
this leaves more room for the CA system display if font sizes are not
set to "tiny" default


Origin commit data
------------------
Branch: ni/coolstream
Commit: 61fa3e4f58
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-21 (Sat, 21 Feb 2015)



------------------
This commit was generated by Migit
2015-02-21 20:50:10 +01:00
Stefan Seyfried
f3304726c9 streaminfo: don't paint outside of the framebuffer
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0bc265c496
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-21 (Sat, 21 Feb 2015)


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

------------------
This commit was generated by Migit
2015-02-21 18:21:13 +01:00
Stefan Seyfried
efb8833825 streaminfo: simplify SignalStrengthLoop/update_rate interaction
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5219d593d0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-21 (Sat, 21 Feb 2015)


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

------------------
This commit was generated by Migit
2015-02-21 18:18:28 +01:00
Stefan Seyfried
2263c8bd2e Merge remote-tracking branch 'check/cst-next'
*needs buildfixing*

Conflicts:
	src/daemonc/Makefile.am
	src/daemonc/remotecontrol.cpp
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/driver/vfd.cpp
	src/gui/bedit/Makefile.am
	src/gui/components/Makefile.am
	src/gui/luainstance.cpp
	src/gui/widget/Makefile.am
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: b5a64e6887
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-26 (Mon, 26 Jan 2015)



------------------
This commit was generated by Migit
2015-01-26 17:26:26 +01:00
Jacek Jendrzej
57da7844d3 streaminfo2.cpp fix possible segfault if audio mode mismatch
Origin commit data
------------------
Branch: ni/coolstream
Commit: b8e8e46a98
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-12-30 (Tue, 30 Dec 2014)


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

------------------
This commit was generated by Migit
2014-12-30 13:29:11 +01:00
Stefan Seyfried
770e405c50 Merge remote-tracking branch 'check/cst-next'
Conflicts:
	src/daemonc/remotecontrol.cpp
	src/gui/luainstance.cpp
	src/gui/movieplayer.cpp
	src/gui/videosettings.cpp
	src/neutrino.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: d37b3c0f9a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-28 (Sun, 28 Dec 2014)



------------------
This commit was generated by Migit
2014-12-28 12:32:12 +01:00
Stefan Seyfried
c8e3ec41a9 Merge remote-tracking branch 'check/cst-next'
needs build- and functional fixes

Conflicts:
	configure.ac
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libmd5sum/md5.c
	src/driver/scanepg.cpp
	src/driver/streamts.cpp
	src/driver/vfd.cpp
	src/driver/vfd.h
	src/driver/volume.cpp
	src/eitd/dmx.cpp
	src/eitd/xmlutil.cpp
	src/gui/Makefile.am
	src/gui/audiomute.cpp
	src/gui/channellist.cpp
	src/gui/dboxinfo.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/hdd_menu.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/infoviewer_bb.h
	src/gui/keybind_setup.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/miscsettings_menu.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_progressbar_setup.cpp
	src/gui/osd_progressbar_setup.h
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/personalize.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/update_settings.cpp
	src/gui/user_menue.cpp
	src/gui/user_menue_setup.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/menue.h
	src/gui/widget/progresswindow.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/yhttpd.cpp
	src/system/helpers.cpp
	src/system/locals.h
	src/system/locals_intern.h
	src/system/setting_helpers.cpp
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/fastscan.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/scannit.cpp
	src/zapit/src/scanpmt.cpp
	src/zapit/src/transponder.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 69c4dbbdba
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)



------------------
This commit was generated by Migit
2014-12-25 18:03:08 +01:00