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
14,721 Commits 2 Branches 9 Tags
f1c074fc83c3b52840d83acfc683d3854ee4bed3
Commit Graph

1482 Commits

Author SHA1 Message Date
vanhofen
18bbbbabfe audio_select: copy full code from TangoCash 
Just compile tested. Maybe some more alignments needed.


Origin commit data
------------------
Commit: e264e6334b
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.
 2017-10-12 08:52:32 +02:00
vanhofen
a20b55bb75 neutrino: don't scroll standby/resume text on frontdisplay 
Origin commit data
------------------
Commit: 27a16a6f9f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)

Origin message was:
------------------
- neutrino: don't scroll standby/resume text on frontdisplay
 2017-10-12 00:43:56 +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
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
vanhofen
3b0222d2d5 Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox 
Conflicts:
	configure.ac
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/videosettings.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Commit: 11d7263bcd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)
 2017-09-25 11:41:44 +02:00
vanhofen
0d9a80486a Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/driver/rcinput.cpp
	src/gui/audioplayer.cpp
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Commit: a58f2cc447
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)
 2017-09-25 11:36:34 +02:00
Stefan Seyfried
0e185cdc08 add comments to suppres -Wimplicit-fallthrough warnings 
Origin commit data
------------------
Commit: 0ea72b9d51
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)
 2017-09-25 11:25:50 +02:00
Stefan Seyfried
6534abad88 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: 99ff4857ff
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-23 (Sat, 23 Sep 2017)
 2017-09-23 21:35:01 +02:00
Stefan Seyfried
f7b93d88e2 add comments to suppres -Wimplicit-fallthrough warnings 
Origin commit data
------------------
Commit: a497a2b86c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-23 (Sat, 23 Sep 2017)
 2017-09-23 18:11:47 +02:00
Stefan Seyfried
25e3075876 Merge remote-tracking branch 'tuxbox/master' 
needs buildfixes


Origin commit data
------------------
Commit: 514cb3ed1e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-23 (Sat, 23 Sep 2017)
 2017-09-23 17:01:42 +02:00
vanhofen
5c12837f35 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 6dd6df52fb
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-18 (Mon, 18 Sep 2017)
 2017-09-18 21:53:44 +02:00
gixxpunk
abee9b0913 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 315a87f2be
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-09-18 (Mon, 18 Sep 2017)
 2017-09-18 16:31:55 +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
vanhofen
af919290b2 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: a0f93d9281
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)
 2017-09-13 15:07:03 +02:00
vanhofen
e7f85aba40 rework multimedia-menu code; cleanup from many unused code 
Origin commit data
------------------
Commit: 56cdb2dd6c
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 14:46:38 +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
Jacek Jendrzej
c44f82f12a Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 2c5bf73006
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-13 (Wed, 13 Sep 2017)
 2017-09-13 13:40:40 +02:00
vanhofen
9db42a7d2b drop easymenu 
Origin commit data
------------------
Commit: 816de89898
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- drop easymenu
 2017-09-13 13:35:23 +02:00
vanhofen
99455725dc remove unused nkplay stuff 
Origin commit data
------------------
Commit: 93c8768fbf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- remove unused nkplay stuff
 2017-09-13 13:09:34 +02:00
vanhofen
f71684c751 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/neutrino_menue.cpp


Origin commit data
------------------
Commit: bf366676b8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)
 2017-09-13 12:52:23 +02:00
vanhofen
2d6e2ab9c1 remove easymenu from config-file 
Origin commit data
------------------
Commit: f42b74a317
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- remove easymenu from config-file
 2017-09-13 10:45:23 +02:00
vanhofen
487fa232a3 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/videosettings.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Commit: 163a6004fa
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)
 2017-09-13 08:36:25 +02:00
vanhofen
ff21981795 drop easymenu 
Origin commit data
------------------
Commit: b502ed31b9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- drop easymenu
 2017-09-12 23:46:22 +02:00
vanhofen
c6c61f6b22 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/osd_setup.cpp


Origin commit data
------------------
Commit: 9e6dc9fbce
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)
 2017-09-12 22:32:07 +02:00
vanhofen
7f86f04782 move some actionkey-stuff from ni-menu directly to neutrino.cpp 
Origin commit data
------------------
Commit: 16b57e40a8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- move some actionkey-stuff from ni-menu directly to neutrino.cpp
 2017-09-12 22:30:35 +02:00
vanhofen
f37efba8f7 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 4bc4a80094
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-09 (Sat, 09 Sep 2017)
 2017-09-09 08:44:18 +02:00
vanhofen
2ee7a428d9 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: eb76978295
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-09 (Sat, 09 Sep 2017)
 2017-09-09 08:43:52 +02:00
Jacek Jendrzej
b03ab5cb9e remove double includes 
Origin commit data
------------------
Commit: 6576729fd1
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-08 (Fri, 08 Sep 2017)
 2017-09-08 21:21:32 +02:00
vanhofen
4250a45ea5 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/Makefile.am


Origin commit data
------------------
Commit: 6488fbf13a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-07 (Thu, 07 Sep 2017)
 2017-09-07 16:41:06 +02:00
vanhofen
abd30071dd add possibility to signalize available online-updates in infoicons 
Origin commit data
------------------
Commit: 3294d9f74d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-04 (Mon, 04 Sep 2017)

Origin message was:
------------------
- add possibility to signalize available online-updates in infoicons
 2017-09-04 17:17:27 +02:00
vanhofen
284426853d Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: ff282cbad1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-27 (Sun, 27 Aug 2017)
 2017-08-27 23:56:52 +02:00
vanhofen
25a4911df4 Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox 
Conflicts:
	configure.ac
	src/driver/screenshot.cpp
	src/driver/streamts.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: a4fd09ecc2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-27 (Sun, 27 Aug 2017)
 2017-08-27 23:55:53 +02:00
Stefan Seyfried
5db1afe258 Merge remote-tracking branch 'tuxbox/master' 
Origin commit data
------------------
Commit: d1f5ea76a0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-26 (Sat, 26 Aug 2017)
 2017-08-26 12:58:44 +02:00
vanhofen
e87210b1d2 remove possibility to change iconsets for infoviewer 
Origin commit data
------------------
Commit: ae9435f75d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-26 (Sat, 26 Aug 2017)

Origin message was:
------------------
- remove possibility to change iconsets for infoviewer
 2017-08-26 10:19:37 +02:00
vanhofen
7c75ab360f Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: 3c35e98212
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-25 (Fri, 25 Aug 2017)
 2017-08-25 14:15:22 +02:00
Jacek Jendrzej
a887d8b2e9 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 8c45b2eea6
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-21 (Mon, 21 Aug 2017)
 2017-08-21 13:13:03 +02:00
vanhofen
cce5365b59 hw_caps: remove CFEManager-code; ... 
the relevant boxmodels are handled now in a "dirty part of hw_caps"
in neutrino.cpp after zapit-start


Origin commit data
------------------
Commit: c307ed5b36
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-14 (Mon, 14 Aug 2017)

Origin message was:
------------------
- hw_caps: remove CFEManager-code; ...

the relevant boxmodels are handled now in a "dirty part of hw_caps"
in neutrino.cpp after zapit-start
 2017-08-21 12:56:00 +02:00
Jacek Jendrzej
d5966753c1 Revert "- neutrino: fix hw_caps init; it must be initialized after zapit start" 
This reverts commit 2d4130dab8.


Origin commit data
------------------
Commit: 8c8ae9595c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-21 (Mon, 21 Aug 2017)
 2017-08-21 12:53:05 +02:00
Jacek Jendrzej
f9a565da5d part from c2095e1759 
Origin commit data
------------------
Commit: 0238049daf
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-21 (Mon, 21 Aug 2017)
 2017-08-21 10:57:18 +02:00
Jacek Jendrzej
da5998afc1 Revert "- neutrino: fix hw_caps init; it must be initialized after zapit start" 
This reverts commit 2d4130dab8.


Origin commit data
------------------
Commit: 491e51beeb
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-21 (Mon, 21 Aug 2017)
 2017-08-21 10:03:52 +02:00
vanhofen
378dfeeda6 audioplayer. add streamripper control to record current stream 
Origin commit data
------------------
Commit: 24affa8a8b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-17 (Thu, 17 Aug 2017)

Origin message was:
------------------
- audioplayer. add streamripper control to record current stream
 2017-08-17 21:13:19 +02:00
vanhofen
c2095e1759 hw_caps: remove CFEManager-code; ... 
the relevant boxmodels are handled now in a "dirty part of hw_caps"
in neutrino.cpp after zapit-start


Origin commit data
------------------
Commit: 382181e289
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-14 (Mon, 14 Aug 2017)

Origin message was:
------------------
- hw_caps: remove CFEManager-code; ...

the relevant boxmodels are handled now in a "dirty part of hw_caps"
in neutrino.cpp after zapit-start
 2017-08-14 10:56:45 +02:00