Commit Graph

225 Commits

Author SHA1 Message Date
vanhofen
aec6fb88ef streaminfo2: add real channelname if it differs to channelname (part 2)
Origin commit data
------------------
Branch: ni/coolstream
Commit: b06e8eccd2
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-03-16 (Sat, 16 Mar 2019)

Origin message was:
------------------
- streaminfo2: add real channelname if it differs to channelname (part 2)

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

------------------
This commit was generated by Migit
2019-03-16 21:26:13 +01:00
vanhofen
df99864f41 streaminfo2: add real channelname if it differs to channelname
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9205158812
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-03-16 (Sat, 16 Mar 2019)

Origin message was:
------------------
- streaminfo2: add real channelname if it differs to channelname

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

------------------
This commit was generated by Migit
2019-03-16 21:15:47 +01:00
vanhofen
42832ff7c9 streaminfo2: formatting code using astyle
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3dccd3e52a
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-03-16 (Sat, 16 Mar 2019)

Origin message was:
------------------
- streaminfo2: formatting code using astyle

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

------------------
This commit was generated by Migit
2019-03-16 21:15:47 +01:00
vanhofen
d9d89e9476 streaminfo2: pre-init col in struct row
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2969c7cd99
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-03-16 (Sat, 16 Mar 2019)

Origin message was:
------------------
- streaminfo2: pre-init col in struct row

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

------------------
This commit was generated by Migit
2019-03-16 21:15:46 +01:00
vanhofen
7796c5fc70 streaminfo2: some position fixes; mosty on the right side
Origin commit data
------------------
Branch: ni/coolstream
Commit: 23bbd2bbf7
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-03-16 (Sat, 16 Mar 2019)

Origin message was:
------------------
- streaminfo2: some position fixes; mosty on the right side

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

------------------
This commit was generated by Migit
2019-03-16 21:15:46 +01:00
vanhofen
3a2119d247 streaminfo: use fixed fonts
TODO: some small position fixes


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8e321292e2
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-03-08 (Fri, 08 Mar 2019)

Origin message was:
------------------
- streaminfo: use fixed fonts

TODO: some small position fixes


------------------
This commit was generated by Migit
2019-03-08 23:16:46 +01:00
Frankenstone
18579fd9b7 reduce ffmpeg warnings, thx DboxOldie
Origin commit data
------------------
Branch: ni/coolstream
Commit: b160f48143
Author: Frankenstone <dampf_acc@online.de>
Date: 2019-03-01 (Fri, 01 Mar 2019)


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

------------------
This commit was generated by Migit
2019-03-01 18:34:51 +01:00
Frankenstone
244d1d9447 fix ffmpeg compiler warnings, thx DboxOldie
Origin commit data
------------------
Branch: ni/coolstream
Commit: 48882de906
Author: Frankenstone <dampf_acc@online.de>
Date: 2019-02-27 (Wed, 27 Feb 2019)


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

------------------
This commit was generated by Migit
2019-02-27 23:25:44 +01:00
vanhofen
774b23685e move compatibility headers to /lib/hardware
Origin commit data
------------------
Branch: ni/coolstream
Commit: 651a56aab8
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-12-21 (Fri, 21 Dec 2018)

Origin message was:
------------------
- move compatibility headers to /lib/hardware

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

------------------
This commit was generated by Migit
2018-12-21 22:30:34 +01:00
Knicko
a71860b7fa streaminfo2: change name Picon to Logo
Origin commit data
------------------
Branch: ni/coolstream
Commit: 88b9c7883d
Author: Knicko <knicko@glj.servebbs.com>
Date: 2018-11-15 (Thu, 15 Nov 2018)

Origin message was:
------------------
- streaminfo2: change name Picon to Logo

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

------------------
This commit was generated by Migit
2018-11-15 22:35:20 +01:00
GetAway
34cea26979 streaminfo: show techinfo in TS_MODE if channelist is empty
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6c6ef9b43a
Author: GetAway <get-away@t-online.de>
Date: 2018-11-13 (Tue, 13 Nov 2018)


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

------------------
This commit was generated by Migit
2018-11-13 20:52:30 +01:00
GetAway
c44c807710 streaminfo2.cpp: show resolution in TS_MODE if no channel is tuned
Origin commit data
------------------
Branch: ni/coolstream
Commit: 307eea9fc7
Author: GetAway <get-away@t-online.de>
Date: 2018-11-13 (Tue, 13 Nov 2018)


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

------------------
This commit was generated by Migit
2018-11-13 20:52:29 +01:00
Jacek Jendrzej
1d559a5520 fix framerate 29970 signalisatiom (by bazi98)
Origin commit data
------------------
Branch: ni/coolstream
Commit: baca01d736
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2018-05-31 (Thu, 31 May 2018)


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

------------------
This commit was generated by Migit
2018-05-31 21:14:59 +02:00
Jacek Jendrzej
81e429d201 fix signalisation bitrate 599940 (by bazi98)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9000b01d08
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2018-05-30 (Wed, 30 May 2018)


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

------------------
This commit was generated by Migit
2018-05-30 23:05:30 +02:00
max_10
43035f3ece streaminfo2: fix ffmpeg 3.0 API
Origin commit data
------------------
Branch: ni/coolstream
Commit: 388924ae2a
Author: max_10 <max_10@gmx.de>
Date: 2018-02-10 (Sat, 10 Feb 2018)


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

------------------
This commit was generated by Migit
2018-02-10 21:36:00 +01:00
vanhofen
8dfe39f6c5 streaminfo: add fallback to delivery system detection
Origin commit data
------------------
Branch: ni/coolstream
Commit: dac03ade1f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-18 (Mon, 18 Dec 2017)

Origin message was:
------------------
- streaminfo: add fallback to delivery system detection

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

------------------
This commit was generated by Migit
2017-12-18 12:23:57 +01:00
TangoCash
ba866666be update cryptsystems
Origin commit data
------------------
Branch: ni/coolstream
Commit: 78a7c344c2
Author: TangoCash <eric@loxat.de>
Date: 2017-12-11 (Mon, 11 Dec 2017)


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

------------------
This commit was generated by Migit
2017-12-11 21:00:17 +01:00
vanhofen
476ce63d99 neutrino: unify modes handling; ...
remove double enum from CNeutrinoApp and move mostly used enum from NeutrinoMessages to new NeutrinoModes


Origin commit data
------------------
Branch: ni/coolstream
Commit: 028ec3cf3c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-20 (Mon, 20 Nov 2017)

Origin message was:
------------------
- neutrino: unify modes handling; ...

remove double enum from CNeutrinoApp and move mostly used enum from NeutrinoMessages to new NeutrinoModes


------------------
This commit was generated by Migit
2017-11-20 15:19:06 +01:00
vanhofen
db8e96aa9b streaminfo2: cleanup from unsupported hardware ifdefs
Origin commit data
------------------
Branch: ni/coolstream
Commit: 38c86eed6b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-07 (Tue, 07 Nov 2017)

Origin message was:
------------------
- streaminfo2: cleanup from unsupported hardware ifdefs

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

------------------
This commit was generated by Migit
2017-11-07 21:42:59 +01:00
vanhofen
88d5909c47 streaminfo: fix compile for coolstream; add dummies to libcs-headers
Origin commit data
------------------
Branch: ni/coolstream
Commit: ff04c8ce97
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-07 (Tue, 07 Nov 2017)

Origin message was:
------------------
- streaminfo: fix compile for coolstream; add dummies to libcs-headers

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

------------------
This commit was generated by Migit
2017-11-07 07:49:49 +01:00
vanhofen
76e3ea4470 streaminfo: some more position fixes; ...
use COL_MENUCONTENTINACTIVE_TEXT for inactive apids and caids


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4a4548379f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-06 (Mon, 06 Nov 2017)

Origin message was:
------------------
- streaminfo: some more position fixes; ...

use COL_MENUCONTENTINACTIVE_TEXT for inactive apids and caids


------------------
This commit was generated by Migit
2017-11-06 23:08:43 +01:00
vanhofen
b61d2b2ec7 streaminfo: add channelname for webtv/radio too; simplify code
Origin commit data
------------------
Branch: ni/coolstream
Commit: da57a16a8b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-06 (Mon, 06 Nov 2017)

Origin message was:
------------------
- streaminfo: add channelname for webtv/radio too; simplify code

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

------------------
This commit was generated by Migit
2017-11-06 23:08:43 +01:00
vanhofen
e1aaa12189 streaminfo: re-add osd resolution
Origin commit data
------------------
Branch: ni/coolstream
Commit: fc12241af7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-06 (Mon, 06 Nov 2017)

Origin message was:
------------------
- streaminfo: re-add osd resolution

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

------------------
This commit was generated by Migit
2017-11-06 23:08:43 +01:00
vanhofen
59f4fb44ac streaminfo: use OFFSET defines; some position fixes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 20ad20b577
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-06 (Mon, 06 Nov 2017)

Origin message was:
------------------
- streaminfo: use OFFSET defines; some position fixes

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

------------------
This commit was generated by Migit
2017-11-06 23:08:43 +01:00
vanhofen
6f69cce01f streaminfo: minor re-formatations and whitespace cleanups
Origin commit data
------------------
Branch: ni/coolstream
Commit: 63cd2d48d8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-06 (Mon, 06 Nov 2017)

Origin message was:
------------------
- streaminfo: minor re-formatations and whitespace cleanups

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

------------------
This commit was generated by Migit
2017-11-06 23:08:42 +01:00
vanhofen
6c6e914922 streaminfo: show channellogo in mode-webradio too
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4963a6a771
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-06 (Mon, 06 Nov 2017)

Origin message was:
------------------
- streaminfo: show channellogo in mode-webradio too

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

------------------
This commit was generated by Migit
2017-11-06 23:08:42 +01:00
vanhofen
9267192aa6 streaminfo: port from TangoCash
Origin commit data
------------------
Branch: ni/coolstream
Commit: d3b4fae12a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-06 (Mon, 06 Nov 2017)

Origin message was:
------------------
- streaminfo: port from TangoCash

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

------------------
This commit was generated by Migit
2017-11-06 23:08:42 +01:00
vanhofen
625dd19d66 streaminfo: fix resolution for webradio; ...
add channellogo to movieplayer-info too; not nice but informative


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8d9bce4cd7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-06 (Mon, 06 Nov 2017)

Origin message was:
------------------
- streaminfo: fix resolution for webradio; ...

add channellogo to movieplayer-info too; not nice but informative


------------------
This commit was generated by Migit
2017-11-06 00:40:13 +01:00
vanhofen
b9f4f1b894 streaminfo: fix merge error
Origin commit data
------------------
Branch: ni/coolstream
Commit: 11eac4a843
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-06 (Mon, 06 Nov 2017)

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

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

------------------
This commit was generated by Migit
2017-11-06 00:26:34 +01:00
vanhofen
ad44b421eb streaminfo: some mode_webradio fixes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5bbbfe3ec0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-06 (Mon, 06 Nov 2017)

Origin message was:
------------------
- streaminfo: some mode_webradio fixes

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

------------------
This commit was generated by Migit
2017-11-06 00:17:54 +01:00
vanhofen
52a5d800a4 rename IS_WEBTV => IS_WEBCHAN
Origin commit data
------------------
Branch: ni/coolstream
Commit: ebcd15da41
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- rename IS_WEBTV => IS_WEBCHAN

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

------------------
This commit was generated by Migit
2017-11-03 09:36:19 +01:00
vanhofen
66784d42af add webradio; first steps
Origin commit data
------------------
Branch: ni/coolstream
Commit: a8b0fee599
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- add webradio; first steps

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

------------------
This commit was generated by Migit
2017-11-03 09:36:19 +01:00
vanhofen
f504430ba9 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	configure.ac
	data/locale/english.locale
	src/gui/components/cc_frm_footer.cpp
	src/gui/dboxinfo.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/plugins.h
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 20d546e42f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-18 (Wed, 18 Oct 2017)



------------------
This commit was generated by Migit
2017-10-18 09:53:55 +02:00
vanhofen
e143e0bcb0 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	configure.ac
	data/icons/buttons/0.png
	data/icons/buttons/1.png
	data/icons/buttons/2.png
	data/icons/buttons/3.png
	data/icons/buttons/4.png
	data/icons/buttons/5.png
	data/icons/buttons/6.png
	data/icons/buttons/7.png
	data/icons/buttons/8.png
	data/icons/buttons/9.png
	data/icons/buttons/blau.png
	data/icons/buttons/btn_backward.png
	data/icons/buttons/btn_forward.png
	data/icons/buttons/btn_pause.png
	data/icons/buttons/btn_play.png
	data/icons/buttons/btn_record_active.png
	data/icons/buttons/btn_record_inactive.png
	data/icons/buttons/btn_stop.png
	data/icons/buttons/down.png
	data/icons/buttons/gelb.png
	data/icons/buttons/gruen.png
	data/icons/buttons/help.png
	data/icons/buttons/help_small.png
	data/icons/buttons/home.png
	data/icons/buttons/info.png
	data/icons/buttons/info_small.png
	data/icons/buttons/left.png
	data/icons/buttons/menu.png
	data/icons/buttons/menu_small.png
	data/icons/buttons/mute_small.png
	data/icons/buttons/mute_zap_gray.png
	data/icons/buttons/mute_zap_green.png
	data/icons/buttons/ok.png
	data/icons/buttons/power.png
	data/icons/buttons/right.png
	data/icons/buttons/rot.png
	data/icons/buttons/up.png
	data/icons/filetypes/movie.png
	data/icons/filetypes/mp3.png
	data/icons/headers/audio.png
	data/icons/headers/bookmarkmanager.png
	data/icons/headers/colors.png
	data/icons/headers/error.png
	data/icons/headers/features.png
	data/icons/headers/games.png
	data/icons/headers/icon_blue.png
	data/icons/headers/icon_green.png
	data/icons/headers/icon_red.png
	data/icons/headers/icon_yellow.png
	data/icons/headers/information.png
	data/icons/headers/keybinding.png
	data/icons/headers/language.png
	data/icons/headers/lcd.png
	data/icons/headers/mainmenue.png
	data/icons/headers/multimedia.png
	data/icons/headers/network.png
	data/icons/headers/personalize.png
	data/icons/headers/shell.png
	data/icons/headers/softupdate.png
	data/icons/headers/streaming.png
	data/icons/headers/timer.png
	data/icons/headers/upnp.png
	data/icons/headers/video.png
	data/icons/movieplayer/mp_b-skip.png
	data/icons/movieplayer/mp_f-skip.png
	data/icons/movieplayer/mp_pause.png
	data/icons/movieplayer/mp_play.png
	data/icons/movieplayer/mp_play_repeat_all.png
	data/icons/movieplayer/mp_play_repeat_track.png
	data/icons/status/ca/biss_green.png
	data/icons/status/ca/biss_white.png
	data/icons/status/ca/biss_yellow.png
	data/icons/status/ca/conax_green.png
	data/icons/status/ca/conax_white.png
	data/icons/status/ca/conax_yellow.png
	data/icons/status/ca/cw_green.png
	data/icons/status/ca/cw_white.png
	data/icons/status/ca/cw_yellow.png
	data/icons/status/ca/d_green.png
	data/icons/status/ca/d_white.png
	data/icons/status/ca/d_yellow.png
	data/icons/status/ca/ird_green.png
	data/icons/status/ca/ird_white.png
	data/icons/status/ca/ird_yellow.png
	data/icons/status/ca/nagra_green.png
	data/icons/status/ca/nagra_white.png
	data/icons/status/ca/nagra_yellow.png
	data/icons/status/ca/nds_green.png
	data/icons/status/ca/nds_white.png
	data/icons/status/ca/nds_yellow.png
	data/icons/status/ca/powervu_green.png
	data/icons/status/ca/powervu_white.png
	data/icons/status/ca/powervu_yellow.png
	data/icons/status/ca/seca_green.png
	data/icons/status/ca/seca_white.png
	data/icons/status/ca/seca_yellow.png
	data/icons/status/ca/via_green.png
	data/icons/status/ca/via_white.png
	data/icons/status/ca/via_yellow.png
	data/icons/status/ca/x_green.png
	data/icons/status/ca/x_white.png
	data/icons/status/ca/x_yellow.png
	data/icons/status/channel/16_9.png
	data/icons/status/channel/16_9_gray.png
	data/icons/status/channel/ca2.png
	data/icons/status/channel/ca2_gray.png
	data/icons/status/channel/dd.png
	data/icons/status/channel/dd_avail.png
	data/icons/status/channel/dd_gray.png
	data/icons/status/channel/radiotextget.png
	data/icons/status/channel/radiotextoff.png
	data/icons/status/channel/radiotextwait.png
	data/icons/status/channel/res_000.png
	data/icons/status/channel/res_1080.png
	data/icons/status/channel/res_1280.png
	data/icons/status/channel/res_1440.png
	data/icons/status/channel/res_1920.png
	data/icons/status/channel/res_288.png
	data/icons/status/channel/res_352.png
	data/icons/status/channel/res_382.png
	data/icons/status/channel/res_480.png
	data/icons/status/channel/res_528.png
	data/icons/status/channel/res_544.png
	data/icons/status/channel/res_576.png
	data/icons/status/channel/res_704.png
	data/icons/status/channel/res_720.png
	data/icons/status/channel/res_hd.png
	data/icons/status/channel/res_sd.png
	data/icons/status/channel/subt.png
	data/icons/status/channel/subt_gray.png
	data/icons/status/channel/tuner_1.png
	data/icons/status/channel/tuner_2.png
	data/icons/status/channel/tuner_3.png
	data/icons/status/channel/tuner_4.png
	data/icons/status/channel/vtxt.png
	data/icons/status/channel/vtxt_gray.png
	data/icons/status/various/ats.png
	data/icons/status/various/ats_gray.png
	data/icons/status/various/ca.png
	data/icons/status/various/lock.png
	data/icons/status/various/mounted.png
	data/icons/status/various/mute.png
	data/icons/status/various/not_mounted.png
	data/icons/status/various/pip.png
	data/icons/status/various/rec_event_marker.png
	data/icons/status/various/rec_gray.png
	data/icons/status/various/zap.png
	data/locale/Makefile.am
	data/locale/english.locale
	data/pictures/backgrounds/1280x720/start.jpg
	src/driver/fb_accel_sti.cpp
	src/gui/Makefile.am
	src/gui/dboxinfo.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/system/flashtool.cpp
	src/system/settings.cpp
	src/system/settings.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4121099dcf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-18 (Wed, 18 Oct 2017)



------------------
This commit was generated by Migit
2017-10-18 09:41:46 +02:00
Jacek Jendrzej
dbf6f5127d Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4b8cf23d70
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-16 (Mon, 16 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-16 13:17:17 +02:00
vanhofen
e68b2c1260 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/streaminfo2.cpp


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



------------------
This commit was generated by Migit
2017-10-14 16:10:22 +02:00
vanhofen
a5478f7798 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: d5fb26c405
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-14 (Sat, 14 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-14 16:07:44 +02:00
Jacek Jendrzej
a1d2509af1 streaminfo2: add desc to audiotype
Origin commit data
------------------
Branch: ni/coolstream
Commit: ff61f5aef1
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-14 (Sat, 14 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-14 13:26:55 +02:00
vanhofen
30b9dbb0b8 Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox
Conflicts:
	src/gui/dboxinfo.cpp
	src/gui/infoviewer_bb.cpp


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



------------------
This commit was generated by Migit
2017-10-02 23:24:39 +02:00
Jacek Jendrzej
0145e87bef fix compil after merge
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ba69b43ec
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 14:23:17 +02:00
Stefan Seyfried
fb13a5533d 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: aa240a9457
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-10-01 (Sun, 01 Oct 2017)



------------------
This commit was generated by Migit
2017-10-01 14:12:55 +02:00
Stefan Seyfried
6979a29c94 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
------------------
Branch: ni/coolstream
Commit: 8dad062eff
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-23 (Sat, 23 Sep 2017)



------------------
This commit was generated by Migit
2017-09-26 11:37:19 +02:00
vanhofen
b6954dec34 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
------------------
Branch: ni/coolstream
Commit: 11d7263bcd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)



------------------
This commit was generated by Migit
2017-09-25 11:41:44 +02:00
Stefan Seyfried
267ba4b9f4 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
------------------
Branch: ni/coolstream
Commit: 99ff4857ff
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-23 (Sat, 23 Sep 2017)



------------------
This commit was generated by Migit
2017-09-23 21:35:01 +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
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
vanhofen
79c24b3173 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 470a8b62dd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-23 (Wed, 23 Aug 2017)



------------------
This commit was generated by Migit
2017-08-23 15:24:38 +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
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
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