mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-13 16:33:36 +02:00
Code Issues Packages Projects Releases Wiki Activity
12,571 Commits 2 Branches 9 Tags
2ee2bcff88ce7b4e00e75e95e973959e812a7f61
Commit Graph

503 Commits

Author SHA1 Message Date
vanhofen
2ee2bcff88 movieplayer: don't stop playback with RC_home; it's confusing 
Origin commit data
------------------
Commit: c3292a4919
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-07 (Tue, 07 Nov 2017)

Origin message was:
------------------
- movieplayer: don't stop playback with RC_home; it's confusing
 2017-11-07 16:13:41 +01:00
gixxpunk
c021719bcd Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 8d52b3c110
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-11-06 (Mon, 06 Nov 2017)
 2017-11-06 11:12:38 +01:00
Jacek Jendrzej
7e261c5b5f src/gui/movieplayer.cpp fix audioselect in not filpeplayer mode (after merge) 
Origin commit data
------------------
Commit: 02aefef167
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-11-06 (Mon, 06 Nov 2017)
 2017-11-06 10:17:10 +01:00
vanhofen
7c221cf3d1 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 5fdbea4bb0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-06 (Mon, 06 Nov 2017)
 2017-11-06 01:01:16 +01:00
Jacek Jendrzej
19859ab82e disable file player mode for cst 
Origin commit data
------------------
Commit: fd17bd9c57
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-11-05 (Sun, 05 Nov 2017)
 2017-11-05 21:31:53 +01:00
vanhofen
fe80e11f72 movieplayer: add some console spam to check modes 
Origin commit data
------------------
Commit: eae97a31f7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-05 (Sun, 05 Nov 2017)

Origin message was:
------------------
- movieplayer: add some console spam to check modes
 2017-11-05 01:30:16 +01:00
vanhofen
71f1608ad1 movieplayer: try to fix rezap audiostreams 
Origin commit data
------------------
Commit: c5be130ba8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-04 (Sat, 04 Nov 2017)

Origin message was:
------------------
- movieplayer: try to fix rezap audiostreams
 2017-11-04 13:54:44 +01:00
vanhofen
5cc3392ec1 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 9fd268cc31
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)
 2017-11-03 11:09:51 +01:00
vanhofen
d38b57d43e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/movieplayer.cpp


Origin commit data
------------------
Commit: 255f1a0cff
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)
 2017-11-03 11:09:28 +01:00
Jacek Jendrzej
d2ddd61d10 src/gui/movieplayer.cpp reEnable YT 
Origin commit data
------------------
Commit: 9ac5258ac0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-11-03 (Fri, 03 Nov 2017)
 2017-11-03 10:02:18 +01:00
Jacek Jendrzej
bab9fac99d src/gui/movieplayer.cpp fix page up/down jump and stop play after merge 
Origin commit data
------------------
Commit: 8746340a87
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-11-03 (Fri, 03 Nov 2017)
 2017-11-03 09:53:50 +01:00
vanhofen
bc7bbb92c1 movieplayer: fix for 6ce6fd0222648b0111e30a512ad88292e92c8a12 
Origin commit data
------------------
Commit: 6eea11af95
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- movieplayer: fix for 6ce6fd0222648b0111e30a512ad88292e92c8a12
 2017-11-03 09:36:20 +01:00
vanhofen
273bb22242 movieplayer: rename isWebTV => isWebChannel 
Origin commit data
------------------
Commit: ee8627a842
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- movieplayer: rename isWebTV => isWebChannel
 2017-11-03 09:36:20 +01:00
vanhofen
268e94d9e3 rename IS_WEBTV => IS_WEBCHAN 
Origin commit data
------------------
Commit: ebcd15da41
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- rename IS_WEBTV => IS_WEBCHAN
 2017-11-03 09:36:19 +01:00
vanhofen
560914abb0 movieplayer: fix new mode 
Origin commit data
------------------
Commit: 1a304cede1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- movieplayer: fix new mode
 2017-11-03 09:36:19 +01:00
vanhofen
f061d0973e fix another merge error vol.2 
Origin commit data
------------------
Commit: ee3599ea6a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- fix another merge error vol.2
 2017-11-03 08:48:54 +01:00
vanhofen
d99f701c0b Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	acinclude.m4
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/lcdd.h
	src/driver/rcinput.cpp
	src/driver/rcinput.h
	src/driver/screenshot.cpp
	src/driver/screenshot.h
	src/driver/simple_display.cpp
	src/driver/vfd.cpp
	src/gui/audio_select.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/movieplayer.cpp
	src/gui/movieplayer.h
	src/zapit/include/zapit/capmt.h
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Commit: 1fa735aa45
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)
 2017-11-03 00:09:05 +01:00
vanhofen
6bda6dbce7 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	acinclude.m4
	configure.ac
	data/fonts/Makefile.am
	data/locale/deutsch.locale
	data/locale/english.locale
	data/webtv/Makefile.am
	data/y-web/Y_Tools_Boxcontrol.yhtm
	data/y-web/Y_Tools_Screenshot.yhtm
	lib/hardware/coolstream/hardware_caps.h
	lib/libtuxtxt/tuxtxt_common.h
	src/gui/audioplayer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/movieplayer.cpp
	src/gui/movieplayer.h
	src/gui/network_setup.cpp
	src/gui/widget/menue.cpp


Origin commit data
------------------
Commit: ae4307bc1c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-02 (Thu, 02 Nov 2017)
 2017-11-02 23:25:41 +01:00
TangoCash
d1054e7875 movieplayer: add progress to vfd 
Origin commit data
------------------
Commit: ad757a9a60
Author: TangoCash <eric@loxat.de>
Date: 2017-10-31 (Tue, 31 Oct 2017)

Origin message was:
------------------
- movieplayer: add progress to vfd
 2017-11-01 15:40:28 +01:00
TangoCash
bbf308232b movieplayer: add progress to vfd 
Origin commit data
------------------
Commit: fbbf396d13
Author: TangoCash <eric@loxat.de>
Date: 2017-10-31 (Tue, 31 Oct 2017)

Origin message was:
------------------
- movieplayer: add progress to vfd
 2017-10-31 23:35:01 +01:00
vanhofen
a932fa921c movieplayer: align some variables names to tango's names 
Origin commit data
------------------
Commit: 28fbb16cf9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-30 (Mon, 30 Oct 2017)

Origin message was:
------------------
- movieplayer: align some variables names to tango's names
 2017-10-30 01:44:01 +01:00
Thilo Graf
59c07e5163 CScreenShot: fix build 
Some lines were wrong picked


Origin commit data
------------------
Commit: b26fc7fb8d
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-27 (Fri, 27 Oct 2017)
 2017-10-29 18:48:28 +01:00
vanhofen
b63a225088 let playback handle devices 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: b9ed20ac53
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-15 (Sun, 15 Oct 2017)
 2017-10-29 18:33:05 +01:00
TangoCash
6dee5239ef fix gstreamer playback 
Origin commit data
------------------
Commit: c93b2a9b0b
Author: TangoCash <eric@loxat.de>
Date: 2017-10-06 (Fri, 06 Oct 2017)
 2017-10-29 18:31:48 +01:00
vanhofen
f8d931aad8 add hd51; mostly ported from TangoCash's neutrino-mp 
Origin commit data
------------------
Commit: 6fe5d269af
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-05 (Thu, 05 Oct 2017)

Origin message was:
------------------
- add hd51; mostly ported from TangoCash's neutrino-mp
 2017-10-29 18:31:30 +01:00
TangoCash
429aba8352 movieplayer: fix updateposition loop 
Origin commit data
------------------
Commit: af6f850ded
Author: TangoCash <eric@loxat.de>
Date: 2017-10-28 (Sat, 28 Oct 2017)
 2017-10-28 21:02:48 +02:00
TangoCash
67c6a6d8cb fixup tags 
Origin commit data
------------------
Commit: 3340b22b11
Author: TangoCash <eric@loxat.de>
Date: 2017-10-28 (Sat, 28 Oct 2017)
 2017-10-28 21:02:29 +02:00
vanhofen
8ebff3af91 allow to play audiofiles with multiformat player; split into video and audio 
Origin commit data
------------------
Commit: ab3b4993ae
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-28 (Sat, 28 Oct 2017)

Origin message was:
------------------
- allow to play audiofiles with multiformat player; split into video and audio
 2017-10-28 19:13:45 +02:00
vanhofen
7137d5abd8 movieplayer: fix quickzap with RC_previoussong/nextsong 
Origin commit data
------------------
Commit: 6f6195e7ba
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-28 (Sat, 28 Oct 2017)

Origin message was:
------------------
- movieplayer: fix quickzap with RC_previoussong/nextsong
 2017-10-28 14:18:09 +02:00
vanhofen
2c7d04afc5 Revert "- movieplayer: fix eof-handling for non-coolstream platforms" 
This reverts commit bdea718755 as suggested by Satbaby


Origin commit data
------------------
Commit: 1dbbb2f2ca
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-27 (Fri, 27 Oct 2017)
 2017-10-27 23:44:50 +02:00
vanhofen
debe510f38 movieplayer: allow RC_previoussong and RC_nextsong 
Origin commit data
------------------
Commit: 4bea5029e1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-27 (Fri, 27 Oct 2017)

Origin message was:
------------------
- movieplayer: allow RC_previoussong and RC_nextsong
 2017-10-27 22:05:11 +02:00
vanhofen
bdea718755 movieplayer: fix eof-handling for non-coolstream platforms; thx to Satbaby 
Origin commit data
------------------
Commit: 5ba724d65a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-23 (Mon, 23 Oct 2017)

Origin message was:
------------------
- movieplayer: fix eof-handling for non-coolstream platforms; thx to Satbaby
 2017-10-23 14:50:01 +02:00
vanhofen
9d1691fb8d 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
------------------
Commit: 20d546e42f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-18 (Wed, 18 Oct 2017)
 2017-10-18 09:53:55 +02:00
vanhofen
904003dede 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
------------------
Commit: 4121099dcf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-18 (Wed, 18 Oct 2017)
 2017-10-18 09:41:46 +02:00
Jacek Jendrzej
d49c063273 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 306c52642d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-17 (Tue, 17 Oct 2017)
 2017-10-17 12:45:19 +02:00
Jacek Jendrzej
be413a20a0 movieplayer.cpp remove free , attempting free on address which was not malloc()-ed 
Origin commit data
------------------
Commit: 79a9186515
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-17 (Tue, 17 Oct 2017)

Origin message was:
------------------
movieplayer.cpp remove free , attempting free on address which was not malloc()-ed
 2017-10-17 12:42:32 +02:00
TangoCash
9f4e6ff79f let playback handle devices 
Origin commit data
------------------
Commit: 9f0397c363
Author: TangoCash <eric@loxat.de>
Date: 2017-10-15 (Sun, 15 Oct 2017)
 2017-10-15 17:36:35 +02:00
gixxpunk
c2a44aa4d8 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: a6de24c7b7
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-10-11 (Wed, 11 Oct 2017)
 2017-10-11 21:35:55 +02:00
vanhofen
659076d4e0 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 32414b6a48
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-11 (Wed, 11 Oct 2017)
 2017-10-11 20:58:45 +02:00
Jacek Jendrzej
d299bb89a0 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 3010cd24d7
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-08 (Sun, 08 Oct 2017)
 2017-10-08 16:50:46 +02:00
Jacek Jendrzej
85df730d64 fix video folderplay 
Origin commit data
------------------
Commit: ea0cd48d18
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-08 (Sun, 08 Oct 2017)
 2017-10-08 16:49:23 +02:00
TangoCash
877145289f fix gstreamer playback 
Origin commit data
------------------
Commit: 3aa3995156
Author: TangoCash <eric@loxat.de>
Date: 2017-10-06 (Fri, 06 Oct 2017)
 2017-10-06 22:29:41 +02:00
vanhofen
7fcd8dea4c add hd51; mostly ported from TangoCash's neutrino-mp 
Origin commit data
------------------
Commit: 09ae4c3a51
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-05 (Thu, 05 Oct 2017)

Origin message was:
------------------
- add hd51; mostly ported from TangoCash's neutrino-mp
 2017-10-05 12:52:53 +02:00
vanhofen
384333992b Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 1e8fde7b21
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)
 2017-10-02 23:56:34 +02:00
vanhofen
5cd7e219d8 fix build 
Origin commit data
------------------
Commit: df6bc99337
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)

Origin message was:
------------------
- fix build
 2017-10-02 23:55:51 +02:00
vanhofen
c2cc8c434f Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/hdd_menu.cpp
	src/gui/hdd_menu.h


Origin commit data
------------------
Commit: 73418490bc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)
 2017-10-02 23:21:37 +02:00
vanhofen
583f45fad7 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/dboxinfo.cpp
	src/gui/infoviewer_bb.cpp


Origin commit data
------------------
Commit: 9e8dd73320
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)
 2017-10-02 23:19:49 +02:00
Jacek Jendrzej
f4c51e829b Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 7ad4a0e6cc
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-02 (Mon, 02 Oct 2017)
 2017-10-02 13:56:25 +02:00
Stefan Seyfried
c9d4fdd9cc 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
------------------
Commit: 0d9139054a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-10-01 (Sun, 01 Oct 2017)
 2017-10-02 13:43:57 +02:00
Stefan Seyfried
3a758cade1 moviplayer: suppress unused variable warning 
Origin commit data
------------------
Commit: c7f429019d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-23 (Sat, 23 Sep 2017)
 2017-09-26 11:29:19 +02:00