mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-18 02:43:37 +02:00
Code Issues Packages Projects Releases Wiki Activity
11,055 Commits 2 Branches 9 Tags
a4da9d28a958f4ebdb30a17dc22f9ca13939ad9c
Commit Graph

1075 Commits

Author SHA1 Message Date
vanhofen
224292f9e3 neutrino: try to fix timer_wakeup handling; ... 
The return to deepstandby after timer-wakeups was broken.

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


Origin commit data
------------------
Commit: 50cc4ef7a2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)

Origin message was:
------------------
- neutrino: try to fix timer_wakeup handling; ...

The return to deepstandby after timer-wakeups was broken.

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-12-01 14:26:29 +01:00
vanhofen
9ecf495b75 neutrino: don't write timerinfo's when exiting to reboot 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 37028e518b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-26 (Sun, 26 Nov 2017)

Origin message was:
------------------
- neutrino: don't write timerinfo's when exiting to reboot

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-27 22:26:30 +01:00
vanhofen
386f195c95 neutrino: re-disable screensaver for mode_webradio on ARM_HARDWARE 
when screensaver is stopped the playback is stopped too

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


Origin commit data
------------------
Commit: 25c8220888
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-25 (Sat, 25 Nov 2017)

Origin message was:
------------------
- neutrino: re-disable screensaver for mode_webradio on ARM_HARDWARE

when screensaver is stopped the playback is stopped too

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-27 22:25:23 +01:00
vanhofen
b3dc977b23 screensaver: move more repeatedly used code to screensaver's code 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 81b82668ac
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-25 (Sat, 25 Nov 2017)

Origin message was:
------------------
- screensaver: move more repeatedly used code to screensaver's code

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-27 22:23:32 +01:00
vanhofen
00f4cb4ee2 neutrino: move screensaver members to screensaver's code 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 74bc2e88d5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-25 (Sat, 25 Nov 2017)

Origin message was:
------------------
- neutrino: move screensaver members to screensaver's code

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-27 20:38:38 +01:00
vanhofen
ab9422c64e neutrino: enable screensaver for mode_webradio 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 962bcae745
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-25 (Sat, 25 Nov 2017)

Origin message was:
------------------
- neutrino: enable screensaver for mode_webradio

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-27 20:38:07 +01:00
vanhofen
9980d2822e neutrino: deactivate compatibility code in ExitRun(); ... 
our start script is aligned to new exit code 2
see cd1328c41c

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


Origin commit data
------------------
Commit: a857be6cc3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-21 (Tue, 21 Nov 2017)

Origin message was:
------------------
- neutrino: deactivate compatibility code in ExitRun(); ...

our start script is aligned to new exit code 2
see cd1328c41c

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-22 15:42:10 +01:00
vanhofen
c0eb1608b1 neutrino: add exit codes to handle some actions in neutrino's start script 
EXIT_REBOOT is inactive yet; see comment in ExitRun()

 Conflicts:
	src/neutrino.cpp

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


Origin commit data
------------------
Commit: d6bba3e488
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-21 (Tue, 21 Nov 2017)

Origin message was:
------------------
- neutrino: add exit codes to handle some actions in neutrino's start script

EXIT_REBOOT is inactive yet; see comment in ExitRun()

 Conflicts:
	src/neutrino.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-22 15:42:09 +01:00
vanhofen
8decdc5f31 neutrino: always write /tmp/.timer ... 
otherwise the vfd stays blank in deepstandby, if leds are configured off
and no timer is set. HD2's vfd urgently needs the fp.brightness value
which is not written to frontpanel in this case.

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


Origin commit data
------------------
Commit: f67ddda1f7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-20 (Mon, 20 Nov 2017)

Origin message was:
------------------
- neutrino: always write /tmp/.timer ...

otherwise the vfd stays blank in deepstandby, if leds are configured off
and no timer is set. HD2's vfd urgently needs the fp.brightness value
which is not written to frontpanel in this case.

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-22 15:42:09 +01:00
vanhofen
a8a27b4403 neutrino: unify console-output for different conditions in ExitRun() 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 14fafa3059
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-20 (Mon, 20 Nov 2017)

Origin message was:
------------------
- neutrino: unify console-output for different conditions in ExitRun()

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-22 15:42:09 +01:00
vanhofen
305ea03d9c neutrino: fix file-check in ExitRun() ... was a c/p error 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 3f60582c78
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-20 (Mon, 20 Nov 2017)

Origin message was:
------------------
- neutrino: fix file-check in ExitRun() ... was a c/p error

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-22 15:42:09 +01:00
vanhofen
35bde613c0 neutrino: more small cleanups in ExitRun() 
Conflicts:
	src/neutrino.cpp

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


Origin commit data
------------------
Commit: c95d5118ef
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-20 (Mon, 20 Nov 2017)

Origin message was:
------------------
- neutrino: more small cleanups in ExitRun()

 Conflicts:
	src/neutrino.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-22 15:42:09 +01:00
vanhofen
1572b72962 neutrino: cleanup ExitRun() function from unused code 
Conflicts:
	src/neutrino.cpp

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


Origin commit data
------------------
Commit: f128d38ad3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-20 (Mon, 20 Nov 2017)

Origin message was:
------------------
- neutrino: cleanup ExitRun() function from unused code

 Conflicts:
	src/neutrino.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-22 15:42:09 +01:00
vanhofen
8011e23c26 neutrino: clearify mode handling in saveEpg() function 
Conflicts:
	src/driver/scanepg.cpp
	src/neutrino.cpp

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


Origin commit data
------------------
Commit: 9645cb24d1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-20 (Mon, 20 Nov 2017)

Origin message was:
------------------
- neutrino: clearify mode handling in saveEpg() function

 Conflicts:
	src/driver/scanepg.cpp
	src/neutrino.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-22 15:42:09 +01:00
vanhofen
49b29a81a9 neutrino: unify modes handling; ... 
remove double enum from CNeutrinoApp and move mostly used enum from NeutrinoMessages to new NeutrinoModes

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


Origin commit data
------------------
Commit: 0fc3e793a4
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

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-22 15:42:09 +01:00
vanhofen
11a699c689 simple_display: show scrambled icon on scrambled channels 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 91098917e0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-17 (Fri, 17 Nov 2017)

Origin message was:
------------------
- simple_display: show scrambled icon on scrambled channels

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-19 21:12:54 +01:00
vanhofen
b16b5d3048 neutrino: fix tv/radio switch for coolstream; ... 
the TV/Radio key returns RC_tv. So we can't use RC_radio code here.

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


Origin commit data
------------------
Commit: 6911ffe0b6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-17 (Fri, 17 Nov 2017)

Origin message was:
------------------
- neutrino: fix tv/radio switch for coolstream; ...

the TV/Radio key returns RC_tv. So we can't use RC_radio code here.

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-17 19:22:51 +01:00
vanhofen
f824593105 neutrino: don't load webradio xml on HD1 hardware; ... 
audiostreams doesn't work

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


Origin commit data
------------------
Commit: 8acb4a4f67
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-15 (Wed, 15 Nov 2017)

Origin message was:
------------------
- neutrino: don't load webradio xml on HD1 hardware; ...

audiostreams doesn't work

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-16 20:39:34 +01:00
vanhofen
551555d7b7 vfd-setup: allow to set scroll_repeats if possible 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: dbf2fa3f18
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-13 (Mon, 13 Nov 2017)

Origin message was:
------------------
- vfd-setup: allow to set scroll_repeats if possible

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-16 20:39:34 +01:00
vanhofen
468d76f4b9 neutrino: display's setScrollMode() needs to be called on every start 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: bf88e2976f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-13 (Mon, 13 Nov 2017)

Origin message was:
------------------
- neutrino: display's setScrollMode() needs to be called on every start

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-16 20:39:34 +01:00
vanhofen
a557ba2b1a neutrino: avoid some ifdef's; prioritize proc filesystem 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 456c12dfb3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-13 (Mon, 13 Nov 2017)

Origin message was:
------------------
- neutrino: avoid some ifdef's; prioritize proc filesystem

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-16 20:39:34 +01:00
vanhofen
1a647a9c9e neutrino: fix console output to signalize timer wakeups 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: dc78eaf018
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-09 (Thu, 09 Nov 2017)

Origin message was:
------------------
- neutrino: fix console output to signalize timer wakeups

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-16 19:43:26 +01:00
vanhofen
bc9ef7cc77 neutrino: don't add web-channels to sat-bouquet 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 5bc21a6edd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-07 (Tue, 07 Nov 2017)

Origin message was:
------------------
- neutrino: don't add web-channels to sat-bouquet

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-16 19:43:26 +01:00
vanhofen
cf90f67818 neutrino: some more mode_radio/mode_webradio fixes #2 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 4202218b47
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-06 (Mon, 06 Nov 2017)

Origin message was:
------------------
- neutrino: some more mode_radio/mode_webradio fixes #2

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-16 19:43:26 +01:00
vanhofen
93c8e3d193 neutrino: some more mode_radio/mode_webradio fixes 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: d84331689a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-06 (Mon, 06 Nov 2017)

Origin message was:
------------------
- neutrino: some more mode_radio/mode_webradio fixes

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-16 19:43:26 +01:00
vanhofen
8608644900 neutrino: respect user's infoviewer timeout settings for different modes 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 942c6415c5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-05 (Sun, 05 Nov 2017)

Origin message was:
------------------
- neutrino: respect user's infoviewer timeout settings for different modes

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-16 19:43:26 +01:00
vanhofen
1962d8feb9 try to fix tv <-> radio switch 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 6259467ac8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- try to fix tv <-> radio switch

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-16 19:43:26 +01:00
vanhofen
875a7b720b rename LIST_MODE_WEBTV => LIST_MODE_WEB 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 0b78ac9e3f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- rename LIST_MODE_WEBTV => LIST_MODE_WEB

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-16 19:43:26 +01:00
vanhofen
ab30c38463 rename IS_WEBTV => IS_WEBCHAN 
Conflicts:
	src/zapit/src/capmt.cpp

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


Origin commit data
------------------
Commit: 740fd3ac0d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

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

 Conflicts:
	src/zapit/src/capmt.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-16 19:43:26 +01:00
vanhofen
5689d19646 fix mode in SetChannelMode() 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 8d3f2ce860
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- fix mode in SetChannelMode()

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-16 19:43:26 +01:00
vanhofen
7a4b625567 fix -Wlogical-op errors 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: a65a63982d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- fix -Wlogical-op errors

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-16 19:43:26 +01:00
vanhofen
ba98bb87f5 add webradio; first steps 
Conflicts:
	data/Makefile.am
	data/scripts/backup.sh
	src/neutrino.cpp
	src/zapit/include/zapit/zapit.h

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


Origin commit data
------------------
Commit: 3fd544737a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

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

 Conflicts:
	data/Makefile.am
	data/scripts/backup.sh
	src/neutrino.cpp
	src/zapit/include/zapit/zapit.h

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-16 19:43:26 +01:00
TangoCash
d3e1d344c5 hd51: fix wakeup from standby 
Origin commit data
------------------
Commit: c4a59375b3
Author: TangoCash <eric@loxat.de>
Date: 2017-11-09 (Thu, 09 Nov 2017)
 2017-11-13 21:08:58 +01:00
Jacek Jendrzej
5c5e1b0603 remove unused 
Origin commit data
------------------
Commit: 39440333e8
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-11-03 (Fri, 03 Nov 2017)
 2017-11-03 10:22:11 +01:00
TangoCash
25164c9c50 modify autocreate HD _and_ UHD channels as seperate lists 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 9c12ce65aa
Author: TangoCash <eric@loxat.de>
Date: 2017-10-20 (Fri, 20 Oct 2017)
 2017-10-29 18:33:58 +01:00
vanhofen
284138fbc5 audio_select: copy full code from TangoCash 
Just compile tested. Maybe some more alignments needed.

Signed-off-by: Thilo Graf <dbt@novatux.de>
Additional changes on cs playback_cs.h, because broken build
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 5fd7ec68ac
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)

Origin message was:
------------------
- audio_select: copy full code from TangoCash

Just compile tested. Maybe some more alignments needed.

Signed-off-by: Thilo Graf <dbt@novatux.de>
Additional changes on cs playback_cs.h, because broken build
Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-10-29 18:32:30 +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
Thilo Graf
fcd9d06d45 Merge branch 'pu/mp' into 'master' 
Origin commit data
------------------
Commit: ccb19a8880
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-17 (Tue, 17 Oct 2017)
 2017-10-17 20:38:58 +02:00
Thilo Graf
cdc251da82 neutrino.cpp: show logo on start up 
Origin commit data
------------------
Commit: 54750e49b7
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-16 (Mon, 16 Oct 2017)
 2017-10-17 20:02:45 +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
d41f19b667 add comments to suppres -Wimplicit-fallthrough warnings 
Origin commit data
------------------
Commit: 971f3703a6
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
b12f7f3320 change time_monotonic_ms() from time_t to int64_t 
time_monotonic_ms values did wrap every ~24 days, leading to problems
in code that did not cope with that. Instead of fixing all places where
relative comparisons with time_monotonic_ms() are made, just use a
bigger datatype. Convert all users to the new type.


Origin commit data
------------------
Commit: 8dad062eff
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-23 (Sat, 23 Sep 2017)
 2017-09-26 11:37:19 +02:00
Jacek Jendrzej
b2b526b987 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 2dd24f8c21
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-18 (Mon, 18 Sep 2017)
 2017-09-18 15:55:41 +02:00
Jacek Jendrzej
b34c510658 fix memleak 
Origin commit data
------------------
Commit: 511d953a18
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-18 (Mon, 18 Sep 2017)
 2017-09-18 14:11:34 +02:00
Jacek Jendrzej
ecf78ec322 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 98a31ea821
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-13 (Wed, 13 Sep 2017)
 2017-09-13 15:53:42 +02:00
vanhofen
ea1be5ae2a rework multimedia-menu code; cleanup from many unused code 
Origin commit data
------------------
Commit: d23323758c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- rework multimedia-menu code; cleanup from many unused code
 2017-09-13 15:52:19 +02:00
Jacek Jendrzej
b9a280c14a Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: a5bc9f1050
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-13 (Wed, 13 Sep 2017)
 2017-09-13 14:09:21 +02:00
Jacek Jendrzej
db4c1d616f fix pick diff error 
Origin commit data
------------------
Commit: a7813a885d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-13 (Wed, 13 Sep 2017)
 2017-09-13 14:08:29 +02:00
Jacek Jendrzej
1e3e303592 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 4e232439c3
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-13 (Wed, 13 Sep 2017)
 2017-09-13 13:52:49 +02:00
vanhofen
cca884105b remove unused nkplay stuff 
Origin commit data
------------------
Commit: 1fae4130b8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- remove unused nkplay stuff
 2017-09-13 13:48:16 +02:00