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

1482 Commits

Author SHA1 Message Date
vanhofen
bc33663742 Merge branch 'ni/mp' into ni/cst-next 
Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/Makefile.am
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libdvbsub/dvbsub.cpp
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/gui/dboxinfo.cpp
	src/gui/movieplayer.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/Makefile.am
	src/system/flashtool.cpp


Origin commit data
------------------
Commit: 161347db29
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)
 2016-08-26 19:13:47 +02:00
Michael Liebmann
4246a31ba6 Merge branch 'cst-next' into nmp-cst-next 
- Fix merge conflicts


Origin commit data
------------------
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)
 2016-08-19 17:40:48 +02:00
vanhofen
fd1e06e0f3 neutrino: fix if-logic in CNeutrinoApp::upgradeSetup() 
Origin commit data
------------------
Commit: 6f1572c5e4
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-09 (Tue, 09 Aug 2016)

Origin message was:
------------------
- neutrino: fix if-logic in CNeutrinoApp::upgradeSetup()
 2016-08-09 17:21:09 +02:00
vanhofen
547f049745 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/neutrino.cpp
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Commit: 646a41c52f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-08 (Mon, 08 Aug 2016)
 2016-08-08 23:18:12 +02:00
vanhofen
c128b2950b allow to disable online services w/o cleaning the keys 
Origin commit data
------------------
Commit: db896847b9
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-08 (Mon, 08 Aug 2016)

Origin message was:
------------------
- allow to disable online services w/o cleaning the keys
 2016-08-08 23:11:17 +02:00
vanhofen
812d95d50c Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/epgview.cpp
	src/neutrino.cpp
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Commit: 4d898949e3
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-06 (Sat, 06 Aug 2016)
 2016-08-06 23:06:36 +02:00
vanhofen
80917aa811 disable youtube, when youtube_dev_id is empty 
Origin commit data
------------------
Commit: 5ce13c651d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-06 (Sat, 06 Aug 2016)

Origin message was:
------------------
- disable youtube, when youtube_dev_id is empty
 2016-08-06 22:52:37 +02:00
vanhofen
ed8e7c6d78 disable tmdb, when tmdb_api_key is empty 
Origin commit data
------------------
Commit: bbccd92b49
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-06 (Sat, 06 Aug 2016)

Origin message was:
------------------
- disable tmdb, when tmdb_api_key is empty
 2016-08-06 22:52:37 +02:00
vanhofen
2d54a78eb1 disable shoutcast, when shoutcast_dev_id is empty 
Origin commit data
------------------
Commit: 1f224be672
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-06 (Sat, 06 Aug 2016)

Origin message was:
------------------
- disable shoutcast, when shoutcast_dev_id is empty
 2016-08-06 22:52:37 +02:00
vanhofen
adfd265368 neutrino: force tmdb_api_key if previos entry is default 
Origin commit data
------------------
Commit: 22d5e35fb8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-04 (Thu, 04 Aug 2016)

Origin message was:
------------------
- neutrino: force tmdb_api_key if previos entry is default
 2016-08-04 12:18:23 +02:00
vanhofen
41083ff567 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: afb6e0d4a1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-04 (Thu, 04 Aug 2016)
 2016-08-04 12:02:35 +02:00
vanhofen
e3daec4e2d eventlist: allow to disable epgplus 
Origin commit data
------------------
Commit: 5837b922b1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-04 (Thu, 04 Aug 2016)

Origin message was:
------------------
- eventlist: allow to disable epgplus
 2016-08-04 09:44:36 +02:00
vanhofen
cf571980bb neutrino: add tmdb_api_key 
Origin commit data
------------------
Commit: 21e03f8084
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-03 (Wed, 03 Aug 2016)

Origin message was:
------------------
- neutrino: add tmdb_api_key
 2016-08-03 00:39:50 +02:00
vanhofen
21b7299720 Merge /home/svenhoefer/cst-public-gui-neutrino into ni/cst-next 
Conflicts:
	src/gui/Makefile.am
	src/neutrino.h


Origin commit data
------------------
Commit: 0d42384f0d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-07-01 (Fri, 01 Jul 2016)
 2016-07-01 15:28:37 +02:00
vanhofen
353e0f504b no need to assign mainmenu as an argument to realrun() 
Origin commit data
------------------
Commit: 0c0b1981f6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-06-23 (Thu, 23 Jun 2016)

Origin message was:
------------------
- no need to assign mainmenu as an argument to realrun()
 2016-07-01 15:13:54 +02:00
gixxpunk
11c54a873b fontscaling: force users with old 112% scaling to new 105% 
Origin commit data
------------------
Commit: b69e362dae
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2016-06-23 (Thu, 23 Jun 2016)

Origin message was:
------------------
- fontscaling: force users with old 112% scaling to new 105%
 2016-06-23 19:09:08 +02:00
gixxpunk
957095feeb fontscaling: new NI default = 105% 
Origin commit data
------------------
Commit: 8319e614c3
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2016-06-23 (Thu, 23 Jun 2016)

Origin message was:
------------------
- fontscaling: new NI default = 105%
 2016-06-23 17:58:13 +02:00
vanhofen
29fda03a8c defaults: better solution for 34877d97e9 
Origin commit data
------------------
Commit: 83dcb4de65
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-06-13 (Mon, 13 Jun 2016)

Origin message was:
------------------
- defaults: better solution for 34877d97e9
 2016-06-13 19:17:01 +02:00
vanhofen
34877d97e9 defaults: set German as prefered language for audio and subtitles 
Origin commit data
------------------
Commit: 5eb8250d12
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-06-13 (Mon, 13 Jun 2016)

Origin message was:
------------------
- defaults: set German as prefered language for audio and subtitles
 2016-06-13 18:52:47 +02:00
vanhofen
cc0f541291 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Commit: 796bd79e0e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-06-02 (Thu, 02 Jun 2016)
 2016-06-02 21:42:10 +02:00
vanhofen
2c239533a6 record_setup: add check existing recordings before set new timers 
Origin commit data
------------------
Commit: 6dddaff0d2
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-06-02 (Thu, 02 Jun 2016)

Origin message was:
------------------
- record_setup: add check existing recordings before set new timers
 2016-06-02 21:37:33 +02:00
FlatTV
321fcbf98f Zap when recording needs CAM 
Origin commit data
------------------
Commit: 7556db08f2
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-05-31 (Tue, 31 May 2016)
 2016-05-31 22:32:04 +02:00
vanhofen
384d73b425 lcd4linux: allow to switch umlauts conversion 
Origin commit data
------------------
Commit: 4a7696b404
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-24 (Tue, 24 May 2016)

Origin message was:
------------------
- lcd4linux: allow to switch umlauts conversion
 2016-05-24 10:32:02 +02:00
vanhofen
4cf2b60722 NI \o/ 
Origin commit data
------------------
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)
 2016-05-19 22:59:54 +02:00
Jacek Jendrzej
62adf72b7d try to fix current channel after edit mode 
Origin commit data
------------------
Commit: e7e158a273
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-05-17 (Tue, 17 May 2016)
 2016-05-17 14:11:59 +02:00
Jacek Jendrzej
f3f69bb8ce some nver read compil fixes 
Origin commit data
------------------
Commit: 8a98ee851e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-26 (Tue, 26 Apr 2016)
 2016-04-26 19:39:43 +02:00
[CST] Focus
38ede6dfb0 neutrino: add webtv channel list mode 
Origin commit data
------------------
Commit: 302642cee7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-23 (Wed, 23 Mar 2016)
 2016-03-23 16:36:00 +03:00
[CST] Focus
ffd48bb389 neutrino.cpp: try to fix sat/fav keys handling after calling zap history 
Origin commit data
------------------
Commit: 9e3b1c5844
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-09 (Wed, 09 Mar 2016)
 2016-03-09 10:53:15 +03:00
bazi98
70d4cd9430 tmdb: Add read apikey from neutrino.conf 
Origin commit data
------------------
Commit: 6e8b9b6d1b
Author: bazi98 <bazi98@web.de>
Date: 2016-03-04 (Fri, 04 Mar 2016)
 2016-03-04 14:15:50 +01:00
vanhofen
091b14fb59 adzap: call adzap directly from usermenu 
Origin commit data
------------------
Commit: 2b0996e3d3
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-29 (Mon, 29 Feb 2016)

Origin message was:
------------------
- adzap: call adzap directly from usermenu
 2016-03-03 11:18:15 +01:00
vanhofen
87689bdf1e adzap: use adzap-thread in epg view; remove pseudo timertype ADZAP 
Origin commit data
------------------
Commit: 19154192db
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-29 (Mon, 29 Feb 2016)

Origin message was:
------------------
- adzap: use adzap-thread in epg view; remove pseudo timertype ADZAP
 2016-03-03 11:18:15 +01:00
vanhofen
ef3bd7774a adzap: add possibility to write status data to /tmp/adzap.data 
Origin commit data
------------------
Commit: 00e5cf6759
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-29 (Mon, 29 Feb 2016)

Origin message was:
------------------
- adzap: add possibility to write status data to /tmp/adzap.data
 2016-03-03 11:18:15 +01:00
vanhofen
4534e82b39 adzap: don't leave all menues, when adzap isn't active 
Origin commit data
------------------
Commit: 6d4aba4a6c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-29 (Mon, 29 Feb 2016)

Origin message was:
------------------
- adzap: don't leave all menues, when adzap isn't active
 2016-03-03 11:18:14 +01:00
martii
06aae05e48 adzap: port code from martiis-neutrino-mp 
Origin commit data
------------------
Commit: c015d4670f
Author: martii <m4rtii@gmx.de>
Date: 2016-03-03 (Thu, 03 Mar 2016)

Origin message was:
------------------
- adzap: port code from martiis-neutrino-mp
 2016-03-03 11:18:14 +01:00
Thilo Graf
39c87f723b CNeutrinoApp: add signal OnAfterSetupFonts 
This allows to implement methodes already inside classes without any
additional external var constructions.


Origin commit data
------------------
Commit: a87d16f62a
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-03-02 (Wed, 02 Mar 2016)
 2016-03-03 09:52:19 +01:00
vanhofen
3333d7997e neutrino: add upgradeSetup function ... 
... to upgrade neutrino.conf to new defaults if needed


Origin commit data
------------------
Commit: 66258704bf
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-03-03 (Thu, 03 Mar 2016)

Origin message was:
------------------
- neutrino: add upgradeSetup function ...

... to upgrade neutrino.conf to new defaults if needed
 2016-03-03 09:46:42 +01:00
vanhofen
e98005c96f neutrino: add version_pseudo.h to allow changes ... 
by comparing old version_pseudo with new one


Origin commit data
------------------
Commit: 273dc68da5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-03-03 (Thu, 03 Mar 2016)

Origin message was:
------------------
- neutrino: add version_pseudo.h to allow changes ...

by comparing old version_pseudo with new one
 2016-03-03 09:46:42 +01:00
Michael Liebmann
ed7b2f91e4 movieplayer: Use Lua scripts for selecting live stream urls 
Origin commit data
------------------
Commit: b4a2856e1c
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-03-03 (Thu, 03 Mar 2016)
 2016-03-03 09:46:42 +01:00
[CST] Focus
c4a07ea711 nhttpd/tuxboxapi/controlapi.cpp: add direct record start for current channel 
Origin commit data
------------------
Commit: fc11a76c01
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-02 (Wed, 02 Mar 2016)
 2016-03-02 14:30:51 +03:00
Stefan Seyfried
b90b5624f8 add a method for migrating config file values 
e.g. commit c6905d2f changed the names of config file entries, which
leads to unwanted changes in appearance.
To avoid this in the future, add a migrateConfig() function in neutrino
which fixes this commit and can be extended in the future if necessary.


Origin commit data
------------------
Commit: 698839b44a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-01 (Fri, 01 Jan 2016)
 2016-02-26 09:25:12 +01:00
vanhofen
e11a006f04 miscsettings_menu: allow to reset movieplayer plugin 
Origin commit data
------------------
Commit: a4bd8cc5a8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-22 (Mon, 22 Feb 2016)

Origin message was:
------------------
- miscsettings_menu: allow to reset movieplayer plugin
 2016-02-22 21:06:46 +01:00
[CST] Focus
ed0235a51b neutrino.cpp: disable starting subtitles from event, for testing 
Origin commit data
------------------
Commit: 1132b7970e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-02-16 (Tue, 16 Feb 2016)
 2016-02-16 18:56:10 +03:00
vanhofen
de6347e64f movieplayer/browser: add user key to create/remove movie cover 
Origin commit data
------------------
Commit: 61a4b3bf9c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-11 (Thu, 11 Feb 2016)

Origin message was:
------------------
- movieplayer/browser: add user key to create/remove movie cover
 2016-02-11 15:04:11 +01:00
vanhofen
a22d2344b8 moviebrowser: introduce user-assignable keys 
Origin commit data
------------------
Commit: ab82c36b9f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-09 (Tue, 09 Feb 2016)

Origin message was:
------------------
- moviebrowser: introduce user-assignable keys
 2016-02-09 15:53:56 +01:00
vanhofen
bf7275e0c7 moviebrowser: add possibility to search for movies in SMS-style 
This feature has to be activated first. Menu -> Settings ->
Key Setup -> Edit -> My recordings

In moviebrowser press three times key "3" to select first movie
title starting with a "F" or press two times "6" to select first
movie title starting with a "N".

The new item in keybind-setup is the first step to introduce user-
assignable keys in moviebrowser. So finally the horrible hotkeys
for the cutting functions can be removed and/or replaced.


Origin commit data
------------------
Commit: 0a98143e49
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-09 (Tue, 09 Feb 2016)

Origin message was:
------------------
- moviebrowser: add possibility to search for movies in SMS-style

This feature has to be activated first. Menu -> Settings ->
Key Setup -> Edit -> My recordings

In moviebrowser press three times key "3" to select first movie
title starting with a "F" or press two times "6" to select first
movie title starting with a "N".

The new item in keybind-setup is the first step to introduce user-
assignable keys in moviebrowser. So finally the horrible hotkeys
for the cutting functions can be removed and/or replaced.
 2016-02-09 12:05:28 +01:00
[CST] Focus
73c3d7e831 neutrino.cpp: fix webtv subtitles crash when subtitle arrive 
while other gui on the screen (re-post deleted msg)


Origin commit data
------------------
Commit: b047fe0261
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-02-02 (Tue, 02 Feb 2016)
 2016-02-03 18:29:50 +03:00
Michael Liebmann
9450b80eb0 Merge branch 'cst-next' into nmp-cst-next 
Origin commit data
------------------
Commit: 16afe5c81e
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-28 (Thu, 28 Jan 2016)
 2016-01-28 14:17:14 +01:00
vanhofen
d9f2427b3c neutrino: initialize lastMode; just for safety 
Origin commit data
------------------
Commit: bb11139eb4
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-01-28 (Thu, 28 Jan 2016)

Origin message was:
------------------
- neutrino: initialize lastMode; just for safety
 2016-01-28 09:50:52 +01:00
vanhofen
1099d0f0f2 neutrino: fix lastMode when switching to mode_upnp 
Origin commit data
------------------
Commit: 93413dad3e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-01-28 (Thu, 28 Jan 2016)

Origin message was:
------------------
- neutrino: fix lastMode when switching to mode_upnp
 2016-01-28 09:42:51 +01:00
Michael Liebmann
86fd5344a6 Merge branch 'cst-next' into nmp-cst-next 
Origin commit data
------------------
Commit: ed99066466
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-26 (Tue, 26 Jan 2016)
 2016-01-26 06:55:54 +01:00