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

13581 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vanhofen
eee00885ef locale: minor changes on new tunersetup locales 
Signed-off-by: Thilo Graf <dbt@novatux.de>


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

Origin message was:
------------------
- locale: minor changes on new tunersetup locales

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-12-01 14:26:27 +01:00
vanhofen
03f13be48b Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox 
Origin commit data
------------------
Commit: aa1e28cfa8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-01 (Fri, 01 Dec 2017)
 2017-12-01 13:06:22 +01:00
Jacek Jendrzej
e9ef8e0d1e disable setVolume in standby mode 
Origin commit data
------------------
Commit: 518ebde76d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-12-01 (Fri, 01 Dec 2017)
 2017-12-01 10:33:00 +01:00
vanhofen
0c1581b1a1 infoicons: don't hide already hidden icons; ... 
this fixes wholes in radiotext gui


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

Origin message was:
------------------
- infoicons: don't hide already hidden icons; ...

this fixes wholes in radiotext gui
 2017-11-30 23:22:53 +01:00
vanhofen
c288c0d3b8 Revert "- media-menu: disable currently broken audioplayer for ARM_HARDWARE" 
This reverts commit 38a431fcda because it's fixed in 334ce41


Origin commit data
------------------
Commit: d59df7c1e6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-30 (Thu, 30 Nov 2017)
 2017-11-30 12:38:40 +01:00
max_10
3390c4ef3d ffmpegdec: fix audio playback for ARM_HARDWARE 
Origin commit data
------------------
Commit: 647a69c0cf
Author: max_10 <max_10@gmx.de>
Date: 2017-11-30 (Thu, 30 Nov 2017)

Origin message was:
------------------
- ffmpegdec: fix audio playback for ARM_HARDWARE
 2017-11-30 12:38:40 +01:00
vanhofen
4e5efd627f infoviewer: avoid display of radiotext icon in virtual zap mode 
Origin commit data
------------------
Commit: a38e827010
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-30 (Thu, 30 Nov 2017)

Origin message was:
------------------
- infoviewer: avoid display of radiotext icon in virtual zap mode
 2017-11-30 10:55:14 +01:00
vanhofen
d68d51d2b2 infoviewer: cleanup from some unused code 
Origin commit data
------------------
Commit: d039017aa7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-30 (Thu, 30 Nov 2017)

Origin message was:
------------------
- infoviewer: cleanup from some unused code
 2017-11-30 10:55:14 +01:00
vanhofen
32b9af3d96 infoviewer_bb: fix offset for first status-icon 
Origin commit data
------------------
Commit: 1751a00cc3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-29 (Wed, 29 Nov 2017)

Origin message was:
------------------
- infoviewer_bb: fix offset for first status-icon
 2017-11-29 10:47:34 +01:00
vanhofen
0063f7c008 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/zapit/src/frontend.cpp


Origin commit data
------------------
Commit: caf1b5d31e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-29 (Wed, 29 Nov 2017)
 2017-11-29 09:51:59 +01:00
vanhofen
c792b497c3 infoviewer_bb: use OFFSET defines; ... 
height of ca-bar now depends on height of ca-icons
cleanup from commented code


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

Origin message was:
------------------
- infoviewer_bb: use OFFSET defines; ...

height of ca-bar now depends on height of ca-icons
cleanup from commented code
 2017-11-28 14:41:42 +01:00
vanhofen
5ee250c9e9 infoviewer_bb: take footer height from CComponentsFooter ... 
to get this footer in sync with the footers of other gui elements


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

Origin message was:
------------------
- infoviewer_bb: take footer height from CComponentsFooter ...

to get this footer in sync with the footers of other gui elements
 2017-11-28 14:41:42 +01:00
vanhofen
46188df646 zapit/frontend: fix compiler warning 
Origin commit data
------------------
Commit: 79bad6babd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)

Origin message was:
------------------
- zapit/frontend: fix compiler warning
 2017-11-28 10:52:01 +01:00
TangoCash
9722e91878 frontend: fix fall through 
Origin commit data
------------------
Commit: 6f1a7638eb
Author: TangoCash <eric@loxat.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)
 2017-11-28 10:52:01 +01:00
TangoCash
230d8a2c0f add DVB-T2 support, enable 5V supply 
Origin commit data
------------------
Commit: e4bdd4700d
Author: TangoCash <eric@loxat.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)
 2017-11-28 10:52:01 +01:00
Jacek Jendrzej
23d92f85b0 prepare for T2 patch 
Origin commit data
------------------
Commit: ff4a17e387
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-11-28 (Tue, 28 Nov 2017)
 2017-11-28 10:52:01 +01:00
vanhofen
94b4f9a712 Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox 
Conflicts:
	configure.ac
	data/icons/buttons/btn_record_active.png
	data/icons/buttons/gelb.png
	data/icons/buttons/gruen.png
	data/icons/buttons/rot.png
	data/icons/headers/icon_green.png
	data/icons/headers/icon_red.png
	data/icons/headers/icon_yellow.png
	data/icons/status/various/lock.png
	data/pictures/backgrounds/1280x720/shutdown.jpg
	data/pictures/backgrounds/1280x720/start.jpg
	src/driver/streamts.cpp
	src/gui/plugins.h
	src/gui/videosettings.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Commit: 74aab8ddd2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-28 (Tue, 28 Nov 2017)
 2017-11-28 10:31:10 +01:00
vanhofen
532b55c841 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox 
Conflicts:
	src/neutrino.cpp
	src/zapit/src/frontend.cpp


Origin commit data
------------------
Commit: 3dc600766a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-28 (Tue, 28 Nov 2017)
 2017-11-28 10:23:12 +01:00
vanhofen
5f09835c12 usermenu: cleanup from ITEM_RASS 
Origin commit data
------------------
Commit: 5e7472e96b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)

Origin message was:
------------------
- usermenu: cleanup from ITEM_RASS
 2017-11-27 23:24:55 +01:00
vanhofen
d46e7e7166 infoviewer: rework radiotext element; ... 
use OFFSET defines, larger font, fix header width


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

Origin message was:
------------------
- infoviewer: rework radiotext element; ...

use OFFSET defines, larger font, fix header width
 2017-11-27 23:18:14 +01:00
TangoCash
f286440928 fix AAC record and playback 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: edee40e2a6
Author: TangoCash <eric@loxat.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)
 2017-11-27 22:28:12 +01:00
vanhofen
438fbf2744 zapit: remove some ifdef's; prepare for upcoming patches 
Signed-off-by: Thilo Graf <dbt@novatux.de>


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

Origin message was:
------------------
- zapit: remove some ifdef's; prepare for upcoming patches

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-27 22:27:09 +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
49c2231c35 movieplayer: use members from screensaver's code 
Conflicts:
	src/gui/movieplayer.cpp

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


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

Origin message was:
------------------
- movieplayer: use members from screensaver's code

 Conflicts:
	src/gui/movieplayer.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-27 22:22:57 +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
1d3745ec50 shutdown_helper: better explanation of what the tool does; ... 
small code re-formatting

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


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

Origin message was:
------------------
- shutdown_helper: better explanation of what the tool does; ...

small code re-formatting

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-27 20:37:27 +01:00
vanhofen
4d491d579d radiotext: cleanup from tons of unused code; rass is dead 
Origin commit data
------------------
Commit: e8bb447fcf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)

Origin message was:
------------------
- radiotext: cleanup from tons of unused code; rass is dead
 2017-11-27 16:47:50 +01:00
vanhofen
68bf0eecd2 icons: cleanup from unused icons 
Origin commit data
------------------
Commit: 1c638ba13d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)

Origin message was:
------------------
- icons: cleanup from unused icons
 2017-11-27 16:04:43 +01:00
vanhofen
d45b41bb71 icons.h: cleanup from unused defines 
Origin commit data
------------------
Commit: 811fcbe2d8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)

Origin message was:
------------------
- icons.h: cleanup from unused defines
 2017-11-27 16:04:43 +01:00
vanhofen
bd33d56fa7 remove unused src/driver/stacktrace.h; use src/system/stacktrace.h if needed 
Origin commit data
------------------
Commit: 52b0f6c27e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)

Origin message was:
------------------
- remove unused src/driver/stacktrace.h; use src/system/stacktrace.h if needed
 2017-11-27 14:16:38 +01:00
vanhofen
79086af7b2 neutrino: try to fix timer_wakeup handling; ... 
The return to deepstandby after timer-wakeups was broken.


Origin commit data
------------------
Commit: a063b370aa
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.
 2017-11-27 12:50:53 +01:00
TangoCash
43d3374d30 frontend: fix fall through 
Origin commit data
------------------
Commit: 2360934df2
Author: TangoCash <eric@loxat.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)
 2017-11-27 10:32:55 +01:00
vanhofen
a239e8a4d6 zapit/frontend: fix compiler warning 
Origin commit data
------------------
Commit: ef0f1eedf8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)

Origin message was:
------------------
- zapit/frontend: fix compiler warning
 2017-11-27 10:22:52 +01:00
vanhofen
50cb93af8c locale: minor changes on new tunersetup locales 
Origin commit data
------------------
Commit: 090fcd4e54
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)

Origin message was:
------------------
- locale: minor changes on new tunersetup locales
 2017-11-27 10:22:52 +01:00
TangoCash
66ab9eca6d add DVB-T2 support, enable 5V supply 
Origin commit data
------------------
Commit: 91379feece
Author: TangoCash <eric@loxat.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)
 2017-11-27 10:22:52 +01:00
TangoCash
670664a5d6 fix AAC record and playback 
Origin commit data
------------------
Commit: e5a4a53720
Author: TangoCash <eric@loxat.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)
 2017-11-27 10:22:52 +01:00
vanhofen
b638d73b4a zapit: remove some ifdef's; prepare for upcoming patches 
Origin commit data
------------------
Commit: 37cbd7c5e6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)

Origin message was:
------------------
- zapit: remove some ifdef's; prepare for upcoming patches
 2017-11-27 10:22:52 +01:00
vanhofen
2c8e8538b5 neutrino: don't write timerinfo's when exiting to reboot 
Origin commit data
------------------
Commit: 9c53be06d5
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
 2017-11-26 23:29:43 +01:00
Stefan Seyfried
01e3a494d8 de-saturize color buttons a bit 
Origin commit data
------------------
Commit: 241ea9d46e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-11-26 (Sun, 26 Nov 2017)
 2017-11-26 18:44:54 +01:00
Stefan Seyfried
a4bc0c37e8 restore start and shutdown pictures after merge 
Origin commit data
------------------
Commit: 60ff2da2ab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-11-26 (Sun, 26 Nov 2017)
 2017-11-26 17:41:42 +01:00
vanhofen
2ab1a35f43 cablex.xml: add OstTelCom; thx to elstablo 
http://www.neutrino-images.de/board/viewtopic.php?f=28&t=2125#p12037
Signed-off-by: Thilo Graf <dbt@novatux.de>


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

Origin message was:
------------------
- cablex.xml: add OstTelCom; thx to elstablo

http://www.neutrino-images.de/board/viewtopic.php?f=28&t=2125#p12037
Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-25 21:20:24 +01:00
vanhofen
5857c80705 neutrino: re-disable screensaver for mode_webradio on ARM_HARDWARE 
when screensaver is stopped the playback is stopped too


Origin commit data
------------------
Commit: c409630993
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
 2017-11-25 09:58:55 +01:00
vanhofen
da538f8c8d mediaplayer: disable fileplayback audio for coolstream; that doesn't work 
Origin commit data
------------------
Commit: 66979ea916
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-25 (Sat, 25 Nov 2017)

Origin message was:
------------------
- mediaplayer: disable fileplayback audio for coolstream; that doesn't work
 2017-11-25 09:58:55 +01:00
vanhofen
59dd52f825 screensaver: move more repeatedly used code to screensaver's code 
Origin commit data
------------------
Commit: 7c1058382f
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
 2017-11-25 09:58:55 +01:00
vanhofen
8cd208eab7 movieplayer: use members from screensaver's code 
Origin commit data
------------------
Commit: 668d29790c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-25 (Sat, 25 Nov 2017)

Origin message was:
------------------
- movieplayer: use members from screensaver's code
 2017-11-25 09:58:55 +01:00
vanhofen
02dffb9d98 neutrino: move screensaver members to screensaver's code 
Origin commit data
------------------
Commit: 8a08024e9c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-25 (Sat, 25 Nov 2017)

Origin message was:
------------------
- neutrino: move screensaver members to screensaver's code
 2017-11-25 09:58:55 +01:00
vanhofen
86e6a34a2e neutrino: enable screensaver for mode_webradio 
Origin commit data
------------------
Commit: e55fc416f7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-25 (Sat, 25 Nov 2017)

Origin message was:
------------------
- neutrino: enable screensaver for mode_webradio
 2017-11-25 09:58:55 +01:00