mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 00:41:09 +02:00
Code Issues Packages Projects Releases Wiki Activity
13,524 Commits 2 Branches 9 Tags
56c4f5943d2ec43014d6257ce0a56ee28ca2350c
Commit Graph

159 Commits

Author SHA1 Message Date
vanhofen
56c4f5943d moviebrowser: fix display of mp_movie_info->dateOfLastPlay 
Origin commit data
------------------
Commit: 98b00c1a70
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-07-05 (Thu, 05 Jul 2018)

Origin message was:
------------------
- moviebrowser: fix display of mp_movie_info->dateOfLastPlay
 2018-07-05 20:40:27 +02:00
vanhofen
8a6dc7904d movieinfo/moviebrowser: do not use any fake date to fill dateOfLastPlay and file.Time 
Origin commit data
------------------
Commit: 08a4e95113
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-07-04 (Wed, 04 Jul 2018)

Origin message was:
------------------
- movieinfo/moviebrowser: do not use any fake date to fill dateOfLastPlay and file.Time
 2018-07-04 22:58:11 +02:00
vanhofen
54c6a548a8 moviebrowser: check for channelname too to change channellogo; ... 
usefull for popup-channels with same id but different names


Origin commit data
------------------
Commit: 59070b3120
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-06-05 (Tue, 05 Jun 2018)

Origin message was:
------------------
- moviebrowser: check for channelname too to change channellogo; ...

usefull for popup-channels with same id but different names
 2018-06-05 23:11:22 +02:00
vanhofen
fb3afddc3c moviebrowser: remove NI tags 
Origin commit data
------------------
Commit: c85c75b3f6
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-04-29 (Sun, 29 Apr 2018)

Origin message was:
------------------
- moviebrowser: remove NI tags
 2018-04-29 03:13:08 +02:00
vanhofen
ec95250a62 framebuffer: better name for getWindowWidth/Height() functions 
getScreenWidth/HeightRel() was confusing because it depends on users window settings.
Replace names in old unused framebuffer code too.


Origin commit data
------------------
Commit: 86cdc12c8f
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-22 (Mon, 22 Jan 2018)

Origin message was:
------------------
- framebuffer: better name for getWindowWidth/Height() functions

getScreenWidth/HeightRel() was confusing because it depends on users window settings.
Replace names in old unused framebuffer code too.
 2018-01-22 12:06:15 +01:00
vanhofen
3d638b5ea4 moviebrowser: use new marker icons 
Origin commit data
------------------
Commit: 267fa531d6
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-04 (Thu, 04 Jan 2018)

Origin message was:
------------------
- moviebrowser: use new marker icons
 2018-01-04 16:07:46 +01:00
vanhofen
9b5c4e7618 neutrino: add more RC_playpause handling 
Origin commit data
------------------
Commit: 764b25542f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-19 (Tue, 19 Dec 2017)

Origin message was:
------------------
- neutrino: add more RC_playpause handling
 2017-12-19 10:58:44 +01:00
vanhofen
8729b26638 neutrino: unify modes handling; ... 
remove double enum from CNeutrinoApp and move mostly used enum from NeutrinoMessages to new NeutrinoModes


Origin commit data
------------------
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
 2017-11-20 15:19:06 +01:00
gixxpunk
81b39f2745 CMovieBrowser::info_hdd_level(): fix miscalculation 
Origin commit data
------------------
Commit: a75915414d
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-10-30 (Mon, 30 Oct 2017)

Origin message was:
------------------
- CMovieBrowser::info_hdd_level(): fix miscalculation
 2017-10-30 21:01:52 +01: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
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
Jacek Jendrzej
079772e63d Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: b7ceb705a0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-26 (Tue, 26 Sep 2017)
 2017-09-26 12:52:04 +02:00
Stefan Seyfried
abf326730e moviebrowser: fix format-string warnings 
Origin commit data
------------------
Commit: 5457ddc108
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-23 (Sat, 23 Sep 2017)
 2017-09-26 12:41:05 +02:00
Stefan Seyfried
4a360cf8ac moviebrowser: fix format-string warnings 
Origin commit data
------------------
Commit: 85c1a8e451
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)
 2017-09-25 11:25:51 +02:00
Jacek Jendrzej
01fd3b4e90 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 72a9fa40db
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-07-05 (Wed, 05 Jul 2017)
 2017-07-05 21:43:36 +02:00
vanhofen
4b9d497a9c moviebrowser: another fix for deletion function ... 
and add some temporary console output to see what happens

Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: f191f0730f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-07-03 (Mon, 03 Jul 2017)

Origin message was:
------------------
- moviebrowser: another fix for deletion function ...

and add some temporary console output to see what happens

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-07-04 12:22:53 +02:00
vanhofen
a6f3cf3e94 moviebrowser: another fix for deletion function ... 
and add some temporary console output to see what happens


Origin commit data
------------------
Commit: 14c137b8ac
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-07-03 (Mon, 03 Jul 2017)

Origin message was:
------------------
- moviebrowser: another fix for deletion function ...

and add some temporary console output to see what happens
 2017-07-03 22:02:50 +02:00
Jacek Jendrzej
6fb14f5c06 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: f791ee1455
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-07-02 (Sun, 02 Jul 2017)
 2017-07-02 17:22:23 +02:00
gixxpunk
c2a2ab7509 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 2594a60728
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-06-29 (Thu, 29 Jun 2017)
 2017-06-29 21:29:56 +02:00
Jacek Jendrzej
c44fcd296b src/gui/moviebrowser/mb.cpp fix segfault if m_movieSelectionHandler is NULL 
Origin commit data
------------------
Commit: fc5ba460a5
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-29 (Thu, 29 Jun 2017)
 2017-06-29 19:04:10 +02:00
Jacek Jendrzej
e26b8378e6 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 8b89baa7a2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-26 (Mon, 26 Jun 2017)
 2017-06-26 22:22:07 +02:00
vanhofen
30f56a7edc moviebrowser: fix deletion of non-marked movies via mute-key 
(cherry picked from commit 15e33337a6)
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 2f8ae15b66
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-26 (Mon, 26 Jun 2017)

Origin message was:
------------------
- moviebrowser: fix deletion of non-marked movies via mute-key

(cherry picked from commit 15e33337a6)
Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-06-26 20:53:12 +02:00
vanhofen
15e33337a6 moviebrowser: fix deletion of non-marked movies via mute-key 
Origin commit data
------------------
Commit: 895aa1ca8c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-26 (Mon, 26 Jun 2017)

Origin message was:
------------------
- moviebrowser: fix deletion of non-marked movies via mute-key
 2017-06-26 11:49:17 +02:00
Jacek Jendrzej
da7d2ce50f Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 2ddad19873
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-21 (Wed, 21 Jun 2017)
 2017-06-21 13:54:49 +02:00
vanhofen
8d10fdd53b moviebrowser: clearify deletion-locale; add movie-title to menu 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 37f9306862
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-21 (Wed, 21 Jun 2017)

Origin message was:
------------------
- moviebrowser: clearify deletion-locale; add movie-title to menu

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-06-21 10:31:22 +02:00
vanhofen
154ec086f0 moviebrowser: fix deletion of cursor_only movie via "menu" -> "yellow" 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 8b4f34857f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-21 (Wed, 21 Jun 2017)

Origin message was:
------------------
- moviebrowser: fix deletion of cursor_only movie via "menu" -> "yellow"

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-06-21 10:31:22 +02:00
vanhofen
7a10a093f7 moviebrowser: clearify deletion-locale; add movie-title to menu 
Origin commit data
------------------
Commit: b6b4286c99
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-20 (Tue, 20 Jun 2017)

Origin message was:
------------------
- moviebrowser: clearify deletion-locale; add movie-title to menu
 2017-06-20 22:56:23 +02:00
vanhofen
37e730f7a8 moviebrowser: fix deletion of cursor_only movie via "menu" -> "yellow" 
Origin commit data
------------------
Commit: 3e053e7728
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-20 (Tue, 20 Jun 2017)

Origin message was:
------------------
- moviebrowser: fix deletion of cursor_only movie via "menu" -> "yellow"
 2017-06-20 22:13:49 +02:00
TangoCash
7236cf6f48 moviebrowser: fix directory count (thx dbo) 
Origin commit data
------------------
Commit: 7b0eb94e76
Author: TangoCash <eric@loxat.de>
Date: 2017-06-19 (Mon, 19 Jun 2017)

Origin message was:
------------------
-moviebrowser: fix directory count (thx dbo)
 2017-06-19 20:57:23 +02:00
Jacek Jendrzej
4643ac3f51 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: ca83324763
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-07 (Wed, 07 Jun 2017)
 2017-06-07 16:20:47 +02:00
vanhofen
ec0a5de898 imdb: change getIMDbElement() handling; function now returns a string 
Origin commit data
------------------
Commit: 0b5a851514
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-29 (Mon, 29 May 2017)

Origin message was:
------------------
- imdb: change getIMDbElement() handling; function now returns a string
 2017-05-29 11:49:00 +02:00
vanhofen
6e4b9acf50 moviebrowser: bind display of channelogo to g_settings.channellist_show_channellogo 
Origin commit data
------------------
Commit: d2da458a94
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-23 (Tue, 23 May 2017)

Origin message was:
------------------
- moviebrowser: bind display of channelogo to g_settings.channellist_show_channellogo
 2017-05-23 17:58:53 +02:00
Jacek Jendrzej
36e33154a1 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 0b2f2afe01
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-05 (Fri, 05 May 2017)
 2017-05-05 13:27:14 +02:00
gixxpunk
ce02d01a5a Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 115c78404b
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-05-04 (Thu, 04 May 2017)
 2017-05-04 20:04:03 +02:00
Thilo Graf
73cd00ddc2 Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: de43d212a4
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-04 (Thu, 04 May 2017)
 2017-05-04 16:59:01 +02:00
Thilo Graf
929a561c3d CMovieBrowser: prevent possible segfault 
Clock is disabled, will crash here.

comes with: b3ecc2b65c


Origin commit data
------------------
Commit: 329fad5545
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-04 (Thu, 04 May 2017)
 2017-05-04 16:55:37 +02:00
vanhofen
fc65a7b6cf Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/channellist.cpp
	src/gui/epgview.cpp
	src/gui/epgview.h
	src/gui/eventlist.cpp


Origin commit data
------------------
Commit: 3210b958a8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-03 (Wed, 03 May 2017)
 2017-05-03 22:57:24 +02:00
Thilo Graf
add5cc9491 Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: 326fca55c0
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-03 (Wed, 03 May 2017)
 2017-05-03 21:36:45 +02:00
TangoCash
b3ecc2b65c eventlist,epgview: adjust style, implement new header class 
picked from:	https://github.com/TangoCash/neutrino-mp-cst-next
commit:	477db186ee4f306e191035ed2201ff4fc9d70b9d

Signed-off-by: Thilo Graf <dbt@novatux.de>
review reqiured


Origin commit data
------------------
Commit: 3ac2f99a67
Author: TangoCash <eric@loxat.de>
Date: 2017-05-03 (Wed, 03 May 2017)

Origin message was:
------------------
-eventlist,epgview: adjust style, implement new header class

picked from:	https://github.com/TangoCash/neutrino-mp-cst-next
commit:	477db186ee4f306e191035ed2201ff4fc9d70b9d

Signed-off-by: Thilo Graf <dbt@novatux.de>
review reqiured
 2017-05-03 21:29:41 +02:00
vanhofen
b9db68a682 moviebrowser: try to speed up reload movies 
Origin commit data
------------------
Commit: 424250a7b7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-24 (Mon, 24 Apr 2017)

Origin message was:
------------------
- moviebrowser: try to speed up reload movies
 2017-04-24 10:36:23 +02:00
vanhofen
fb4c0f65a6 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 4fb2785d72
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-19 (Wed, 19 Apr 2017)
 2017-04-19 21:34:05 +02:00
Thilo Graf
615120c0d9 CMovieBrowser: try to reduce effort for vizualized scan 
For comparings I added a benchmark with log output.


Origin commit data
------------------
Commit: 68c2b29caf
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-13 (Thu, 13 Apr 2017)
 2017-04-13 22:36:48 +02:00
Michael Liebmann
bbaad5b19d Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: 2677543cc4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-13 (Mon, 13 Mar 2017)
 2017-03-13 21:55:50 +01:00
vanhofen
14f84f0bec Merge remote-tracking branch 'neutrino-mp/master' into pu/mp 
Conflicts:
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/neutrinoyparser.cpp


Origin commit data
------------------
Commit: 8bdb16cec6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)
 2017-03-13 16:14:33 +01:00
vanhofen
30fd965086 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/channellist.cpp
	src/gui/components/cc_detailsline.cpp
	src/gui/widget/menue.cpp


Origin commit data
------------------
Commit: c4fa0eb30e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)
 2017-03-13 12:45:30 +01:00
vanhofen
9c009ade29 unify DetailsLine-names; move define to settings.h 
Origin commit data
------------------
Commit: 5b0faeab8c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)

Origin message was:
------------------
- unify DetailsLine-names; move define to settings.h
 2017-03-13 12:40:04 +01:00
vanhofen
b5ce0f99fb Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/moviebrowser/mb.h


Origin commit data
------------------
Commit: 73ea6fddcb
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)
 2017-03-06 23:26:32 +01:00
Thilo Graf
75c7b9c6f4 CMovieBrowser/cYTFeedParser: implement signals from CProgressSignals 
Origin commit data
------------------
Commit: 8c6a47ee3a
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)
 2017-03-06 21:26:26 +01:00