Commit Graph

11798 Commits

Author SHA1 Message Date
vanhofen
dbdda1de51 Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox
Conflicts:
	acinclude.m4
	lib/hardware/coolstream/hardware_caps.cpp
	src/Makefile.am
	src/driver/screenshot.cpp
	src/gui/epgplus.cpp
	src/gui/scan_setup.cpp
	src/neutrino.cpp
	src/zapit/src/frontend.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: bb00f9f2e8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-25 (Fri, 25 Aug 2017)



------------------
This commit was generated by Migit
2017-08-25 14:29:45 +02:00
vanhofen
4198cb9a35 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3c35e98212
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-25 (Fri, 25 Aug 2017)



------------------
This commit was generated by Migit
2017-08-25 14:15:22 +02:00
vanhofen
84b01945fb Merge branch 'ni/tuxbox' of bitbucket.org:neutrino-images/ni-neutrino-hd into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: e6ba09c94c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-23 (Wed, 23 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-23 15:24:48 +02:00
vanhofen
79c24b3173 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 470a8b62dd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-23 (Wed, 23 Aug 2017)



------------------
This commit was generated by Migit
2017-08-23 15:24:38 +02:00
Jacek Jendrzej
6b015862c1 fix possible out of bound memory access
Origin commit data
------------------
Branch: ni/coolstream
Commit: 350a73ce08
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-23 (Wed, 23 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-23 13:05:57 +02:00
Jacek Jendrzej
d4247c0036 null pointer check
Origin commit data
------------------
Branch: ni/coolstream
Commit: 527c0de33a
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-23 (Wed, 23 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-23 13:03:34 +02:00
Jacek Jendrzej
7b57171e46 fxi possible buffer overflow
Origin commit data
------------------
Branch: ni/coolstream
Commit: e58e72635b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-23 (Wed, 23 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-23 13:00:24 +02:00
Jacek Jendrzej
d7856dc0ce some inits and never read var
Origin commit data
------------------
Branch: ni/coolstream
Commit: ba600f0e5c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-23 (Wed, 23 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-23 12:58:26 +02:00
gixxpunk
147aab409a Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: c68222408f
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-08-21 (Mon, 21 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-21 21:25:30 +02:00
Jacek Jendrzej
c592fe60d6 some inits warnings
Origin commit data
------------------
Branch: ni/coolstream
Commit: c99486520e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-21 (Mon, 21 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-21 14:42:24 +02:00
gixxpunk
d31c0df3f3 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: f2446caf3b
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-08-21 (Mon, 21 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-21 14:16:12 +02:00
vanhofen
cb19741014 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
------------------
Branch: ni/coolstream
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


------------------
This commit was generated by Migit
2017-08-21 12:56:00 +02:00
Jacek Jendrzej
254893c889 Revert "- neutrino: fix hw_caps init; it must be initialized after zapit start"
This reverts commit 4ded8abb12.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8c8ae9595c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-21 (Mon, 21 Aug 2017)



------------------
This commit was generated by Migit
2017-08-21 12:53:05 +02:00
Stefan Seyfried
ec932813a0 Revert "- hardware_caps: fix has_fan and add detection of Neo Twin"
This reverts commit 2770d07bea.
This leads to a segfault at start and the upstream solution
is not yet ready for primetime, so revert this for now.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 009838b977
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-20 (Sun, 20 Aug 2017)



------------------
This commit was generated by Migit
2017-08-20 16:19:57 +02:00
Stefan Seyfried
e11dd6323d rcinput: add two more keys in the ugly azbox translate() table
Origin commit data
------------------
Branch: ni/coolstream
Commit: f8ca80e0ca
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-20 (Sun, 20 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-20 11:52:04 +02:00
Stefan Seyfried
ff293617d9 zapit: trivial azbox compile fix
Origin commit data
------------------
Branch: ni/coolstream
Commit: 30a7d083c5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-20 (Sun, 20 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-20 11:44:57 +02:00
Stefan Seyfried
a2decedbd8 rcinput: fix getKeyName for RC_none case
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6ca45cb5fa
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-20 (Sun, 20 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-20 11:44:01 +02:00
Stefan Seyfried
fec7979dfa CKeyChooserItemNoKey: fix type cast
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8d02b3213f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-20 (Sun, 20 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-20 11:30:57 +02:00
Stefan Seyfried
659f5c8552 fb_accel_sti: reorder blit_mutex locking
This seems to help spurious deadlocks in the STI framebuffer blit code.
Not 100% sure why, butthis helps, but I have not seen lockups with this.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 56c24f4031
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-19 (Sat, 19 Aug 2017)



------------------
This commit was generated by Migit
2017-08-19 21:43:54 +02:00
vanhofen
90a51a4564 audioplayer: update gui if streamripper has stopped or crashed
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5a5843ca02
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-18 (Fri, 18 Aug 2017)

Origin message was:
------------------
- audioplayer: update gui if streamripper has stopped or crashed

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-18 13:16:40 +02:00
vanhofen
181f43c137 re-sort locals
Origin commit data
------------------
Branch: ni/coolstream
Commit: fddd6bbd5f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-18 (Fri, 18 Aug 2017)

Origin message was:
------------------
- re-sort locals

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-18 08:21:01 +02:00
vanhofen
330752d9b7 clearify headers for ausioplayer/internetradio setup
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8314675161
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-17 (Thu, 17 Aug 2017)

Origin message was:
------------------
- clearify headers for ausioplayer/internetradio setup

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-17 21:49:43 +02:00
vanhofen
e587c43b9d audioplayer-setup: re-align some items
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2c9c310def
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-17 (Thu, 17 Aug 2017)

Origin message was:
------------------
- audioplayer-setup: re-align some items

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-17 21:16:17 +02:00
vanhofen
025b8adad6 audioplayer. add streamripper control to record current stream
Origin commit data
------------------
Branch: ni/coolstream
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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-17 21:13:19 +02:00
vanhofen
ceab6aafbb 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
------------------
Branch: ni/coolstream
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


------------------
This commit was generated by Migit
2017-08-14 10:56:45 +02:00
vanhofen
9b23f854ed Revert "- neutrino: fix hw_caps init; it must be initialized after zapit start"
This reverts commit 4ded8abb12 in
preparation for following changes.

Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: affcf191a9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-14 (Mon, 14 Aug 2017)



------------------
This commit was generated by Migit
2017-08-14 09:56:23 +02:00
gixxpunk
510e01f833 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8c18008f93
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-08-12 (Sat, 12 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-12 14:25:37 +02:00
vanhofen
66e825b39d upnpbrowser: fix mode_ts for videos; was switched back to mode_upnp by stopAudio()
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6659dbb6f3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-12 (Sat, 12 Aug 2017)

Origin message was:
------------------
- upnpbrowser: fix mode_ts for videos; was switched back to mode_upnp by stopAudio()

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


------------------
This commit was generated by Migit
2017-08-12 14:05:23 +02:00
vanhofen
e8711e0475 Revert "neutrino: disable some menus in upnp & ts mode"
This reverts commit aaee0baf07.

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 944ad7cb63
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-12 (Sat, 12 Aug 2017)



------------------
This commit was generated by Migit
2017-08-12 14:05:17 +02:00
vanhofen
b416fcda65 themes: add new shadow-color to our material themes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 88d34a3e0d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-12 (Sat, 12 Aug 2017)

Origin message was:
------------------
- themes: add new shadow-color to our material themes

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-12 13:51:00 +02:00
vanhofen
cc044dc947 upnpbrowser: fix mode_ts for videos; was switched back to mode_upnp by stopAudio()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6e66f8802c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-12 (Sat, 12 Aug 2017)

Origin message was:
------------------
- upnpbrowser: fix mode_ts for videos; was switched back to mode_upnp by stopAudio()

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-12 12:48:17 +02:00
vanhofen
a0b132d7ff Revert "neutrino: disable some menus in upnp & ts mode"
This reverts commit aaee0baf07.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2e04d34a9c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-12 (Sat, 12 Aug 2017)



------------------
This commit was generated by Migit
2017-08-12 12:47:33 +02:00
vanhofen
e739f3746e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 27252ecee5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-12 (Sat, 12 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-12 12:47:19 +02:00
Thilo Graf
cc78c40678 Revert "infoviewer.cpp: handle timeout of mode upnp like mode ts"
This reverts commit 6f7b583b59.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 40fee47523
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-12 (Sat, 12 Aug 2017)



------------------
This commit was generated by Migit
2017-08-12 11:27:55 +02:00
vanhofen
6d0a2f8950 netfs_setup: write correct filenames into fstab and auto.net
Origin commit data
------------------
Branch: ni/coolstream
Commit: 19189cc09d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-12 (Sat, 12 Aug 2017)

Origin message was:
------------------
- netfs_setup: write correct filenames into fstab and auto.net

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-12 09:28:17 +02:00
gixxpunk
793c4a801e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 82be5768a8
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-08-11 (Fri, 11 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-11 23:02:24 +02:00
Thilo Graf
135555143a CComponentsScrollBar: try to fix handling with very much segment count
In some cases, eg. with very much pages in channellist, the effort
to handle with all count of scrollbar segments was too much. Result: long
waiting times during page scrolling and slider was not visible. This
should be fixed now.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 71f5779a40
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-11 (Fri, 11 Aug 2017)



------------------
This commit was generated by Migit
2017-08-11 22:35:07 +02:00
gixxpunk
360b6e9ec8 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3cb9902e7d
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-08-11 (Fri, 11 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-11 21:24:04 +02:00
GetAway
6f7b583b59 infoviewer.cpp: handle timeout of mode upnp like mode ts
Signed-off-by: Thilo Graf <dbt@novatux.de>

Infobar timeout in the upnp mode is fixed to 6 sec.
Because it's acting about streams, so we should use the same timeout
such as with playing a movie file.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0225b043db
Author: GetAway <get-away@t-online.de>
Date: 2017-08-11 (Fri, 11 Aug 2017)



------------------
This commit was generated by Migit
2017-08-11 20:14:49 +02:00
gixxpunk
569e4dfa86 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: f50b3e1b42
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-08-09 (Wed, 09 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-09 21:37:57 +02:00
Thilo Graf
ee80c4475f CComponentsScrollBar: use matching type names
Origin commit data
------------------
Branch: ni/coolstream
Commit: b863f874b0
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-09 (Wed, 09 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-09 21:36:26 +02:00
gixxpunk
cd53c5ddb2 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: e6861daf34
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-08-09 (Wed, 09 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-09 21:34:39 +02:00
Thilo Graf
951ee6c24c CComponentsScrollBar: fix possible build error with -Werror=sign-compare
Origin commit data
------------------
Branch: ni/coolstream
Commit: 431cfadcc2
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-09 (Wed, 09 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-09 20:29:22 +02:00
Thilo Graf
fb51e7dde6 CComponentsScrollBar: fix possible too small type size
Possible segment count could be more than 265.
Was a remnant from scrollbar test phase.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 379d1ffa76
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-09 (Wed, 09 Aug 2017)



------------------
This commit was generated by Migit
2017-08-09 19:13:36 +02:00
vanhofen
a4ebf460c1 Merge branch 'pu/mp' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a9d1c7be17
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-09 (Wed, 09 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-09 11:40:03 +02:00
Jacek Jendrzej
383e466472 Fix merge-error; add missing add_gxa_sync_marker() function
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0b781da031
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-09 (Wed, 09 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-09 11:36:14 +02:00
vanhofen
d38bcb0310 Merge branch 'pu/mp' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4f4394d303
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-09 (Wed, 09 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-09 10:38:21 +02:00
vanhofen
c09cdaff18 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: e0cd8f75d8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-09 (Wed, 09 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-09 10:37:47 +02:00
vanhofen
6ab8ca92b6 dboxinfo: fix compile
Origin commit data
------------------
Branch: ni/coolstream
Commit: 76fb1243b9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-09 (Wed, 09 Aug 2017)

Origin message was:
------------------
- dboxinfo: fix compile

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-09 10:09:13 +02:00
vanhofen
873e9405af netfs_setup: align smb-mounts to new automount-syntax
Origin commit data
------------------
Branch: ni/coolstream
Commit: b9c285018c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-09 (Wed, 09 Aug 2017)

Origin message was:
------------------
- netfs_setup: align smb-mounts to new automount-syntax

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-09 09:04:15 +02:00