Commit Graph

10353 Commits

Author SHA1 Message Date
gixxpunk
29eea6d908 increase HTTPD_MAX_CONNECTIONS to 50
This fixes crashes/problems caused by FHEM plugins.
https://forum.fhem.de/index.php/topic,54481.msg460625.html#msg460625


Origin commit data
------------------
Commit: 873d056d2e
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-07-11 (Tue, 11 Jul 2017)

Origin message was:
------------------
- increase HTTPD_MAX_CONNECTIONS to 50

This fixes crashes/problems caused by FHEM plugins.
https://forum.fhem.de/index.php/topic,54481.msg460625.html#msg460625
2017-07-11 18:21:27 +02:00
vanhofen
1e05ae41b4 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: e7f499e8ff
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-07-05 (Wed, 05 Jul 2017)
2017-07-05 13:39:15 +02:00
TangoCash
e17852237a no shutdown if streaming (thx dbo)
prevent shutdown from timer if stb is started from deep standby > does a
timer-record > and meanwhile streaming (eg. localTV or via web-if to PC)
is active

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


Origin commit data
------------------
Commit: 57f46e1f2b
Author: TangoCash <eric@loxat.de>
Date: 2017-07-05 (Wed, 05 Jul 2017)
2017-07-05 10:41:27 +02:00
vanhofen
73aeca3b3c Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/audioplayer.cpp
	src/system/localize.h


Origin commit data
------------------
Commit: c5df56955b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-07-04 (Tue, 04 Jul 2017)
2017-07-04 14:06:36 +02:00
vanhofen
6e80613adf audioplayer: remove wrong transparency from cover
Origin commit data
------------------
Commit: eb2153d482
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-07-04 (Tue, 04 Jul 2017)

Origin message was:
------------------
- audioplayer: remove wrong transparency from cover
2017-07-04 13:46:45 +02:00
vanhofen
a828c8a32a epgscan: allow to set rescan period to catch a bug in epgscan
Scan isn't executed while a movie is played. When movie is stopped
the scan-timer is ignored too.

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


Origin commit data
------------------
Commit: 761a2b2e73
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-07-04 (Tue, 04 Jul 2017)

Origin message was:
------------------
- epgscan: allow to set rescan period to catch a bug in epgscan

Scan isn't executed while a movie is played. When movie is stopped
the scan-timer is ignored too.

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-07-04 12:22:53 +02:00
vanhofen
4b9d497a9c moviebrowser: another fix for deletion function ...
and add some temporary console output to see what happens

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


Origin commit data
------------------
Commit: f191f0730f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-07-03 (Mon, 03 Jul 2017)

Origin message was:
------------------
- moviebrowser: another fix for deletion function ...

and add some temporary console output to see what happens

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-07-04 12:22:53 +02:00
vanhofen
59842a764e audioplayer: don't scale covers to quadrat-dimensions
Signed-off-by: Thilo Graf <dbt@novatux.de>

# Conflicts:
#	src/gui/audioplayer.cpp


Origin commit data
------------------
Commit: dd19314000
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-07-04 (Tue, 04 Jul 2017)

Origin message was:
------------------
- audioplayer: don't scale covers to quadrat-dimensions

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

# Conflicts:
#	src/gui/audioplayer.cpp
2017-07-04 12:22:53 +02:00
Thilo Graf
e9fbf6c816 CLocaleManager: add casted version of getText() function
Allows easier handling with strings instead const char
for usage as string source. Separate casts are not requiered.

Overload of getText() was not possible but,
name getTextAsString() is keeping namespace of base function
getText().


Origin commit data
------------------
Commit: 6aa66b84c1
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-07-03 (Mon, 03 Jul 2017)

Origin message was:
------------------
CLocaleManager: add casted version of getText() function

Allows easier handling with strings instead const char
for usage as string source. Separate casts are not requiered.

Overload of getText() was not possible but,
name getTextAsString() is keeping namespace of base function
getText().
2017-07-04 12:22:53 +02:00
TangoCash
dac472f809 fix epgplus detailsline hide bug (thx dbo)
Signed-off-by: Thilo Graf <dbt@novatux.de>

dline was not removed after called epg info.

btw. Small request:
It would be nice if a short brief justification would be included.
That would be make some things easier to track and saves unnecessary questions.
Thx!


Origin commit data
------------------
Commit: d7e196c58a
Author: TangoCash <eric@loxat.de>
Date: 2017-07-02 (Sun, 02 Jul 2017)
2017-07-04 12:22:53 +02:00
vanhofen
fe6f8eb2b2 epgscan: allow to set rescan period to catch a bug in epgscan
Scan isn't executed while a movie is played. When movie is stopped
the scan-timer is ignored too.


Origin commit data
------------------
Commit: 36a1a146fc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-07-04 (Tue, 04 Jul 2017)

Origin message was:
------------------
- epgscan: allow to set rescan period to catch a bug in epgscan

Scan isn't executed while a movie is played. When movie is stopped
the scan-timer is ignored too.
2017-07-04 11:07:30 +02:00
vanhofen
a6f3cf3e94 moviebrowser: another fix for deletion function ...
and add some temporary console output to see what happens


Origin commit data
------------------
Commit: 14c137b8ac
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-07-03 (Mon, 03 Jul 2017)

Origin message was:
------------------
- moviebrowser: another fix for deletion function ...

and add some temporary console output to see what happens
2017-07-03 22:02:50 +02:00
vanhofen
d47de206b4 audioplayer: don't scale covers to quadrat-dimensions
Origin commit data
------------------
Commit: 99a6c9e1ee
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-07-03 (Mon, 03 Jul 2017)

Origin message was:
------------------
- audioplayer: don't scale covers to quadrat-dimensions
2017-07-03 22:02:50 +02:00
TangoCash
4cc14d335b fix epgplus detailsline hide bug (thx dbo)
Origin commit data
------------------
Commit: eecc1b6af3
Author: TangoCash <eric@loxat.de>
Date: 2017-07-02 (Sun, 02 Jul 2017)
2017-07-03 10:42:40 +02:00
gixxpunk
2c57a95546 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 934d3ae386
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-07-01 (Sat, 01 Jul 2017)
2017-07-01 22:23:58 +02:00
Thilo Graf
0cba28602c CUpnpBrowserGui: try to reduce flicker effects on scroll
Some parts on screen should be painted only if changed.
This should help to reduce some flicker effects.


Origin commit data
------------------
Commit: 3213999198
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-07-01 (Sat, 01 Jul 2017)
2017-07-01 22:10:26 +02:00
Thilo Graf
07964c4a82 CUpnpBrowserGui: fix dline paint during directory selection
Dline was not removed on directory selection.


Origin commit data
------------------
Commit: baf441b5d0
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-07-01 (Sat, 01 Jul 2017)
2017-07-01 22:09:08 +02:00
gixxpunk
7e52df7feb Merge branch 'ni/tuxbox' of bitbucket.org:neutrino-images/ni-neutrino-hd into ni/tuxbox
Origin commit data
------------------
Commit: 3ed024c1b3
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-07-01 (Sat, 01 Jul 2017)
2017-07-01 21:50:43 +02:00
vanhofen
830edcec56 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 3477104928
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-07-01 (Sat, 01 Jul 2017)
2017-07-01 14:40:12 +02:00
gixxpunk
fce31144b0 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: fc302d8871
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-07-01 (Sat, 01 Jul 2017)
2017-07-01 10:55:12 +02:00
Jacek Jendrzej
70130c8cff src/gui/opkg_manager.cpp fix esource leak; supplement to 0e522bb6e6
Origin commit data
------------------
Commit: 18e1ec060f
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-07-01 (Sat, 01 Jul 2017)
2017-07-01 10:26:33 +02:00
gixxpunk
677a327591 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 0e862002b6
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-06-30 (Fri, 30 Jun 2017)
2017-06-30 21:27:49 +02:00
vanhofen
3cc347df42 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: ea1a4ad6f1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-30 (Fri, 30 Jun 2017)
2017-06-30 14:41:19 +02:00
Thilo Graf
3218759464 CBouquetList: fix scrollbar shadow
Footer is painted as first item and scrollbar as last, so shadow
overpaint footer body. Either paint scrollbar as first or use
matching shadow parameter.


Origin commit data
------------------
Commit: acb5b7e292
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-29 (Thu, 29 Jun 2017)
2017-06-30 13:53:43 +02:00
Jacek Jendrzej
82099d9faa src/gui/movieplayer.cpp fix play icon after pause->seek
Origin commit data
------------------
Commit: 4318615a60
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-30 (Fri, 30 Jun 2017)
2017-06-30 13:42:09 +02:00
Jacek Jendrzej
6f65302911 src/gui/movieplayer.cpp show FileTimeOSD only if setSpeed work
Origin commit data
------------------
Commit: 1f095b96c9
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-30 (Fri, 30 Jun 2017)
2017-06-30 13:40:19 +02:00
vanhofen
35e13eb34e Revert "- bouquetlist: fix footer; CComponentsFooter doesn't like 0 buttons as it seems"
This reverts commit 7442c19a59.


Origin commit data
------------------
Commit: 768bb1330b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-30 (Fri, 30 Jun 2017)
2017-06-30 10:43:06 +02:00
vanhofen
e4fdbbaa80 cc_frm_footer: avoid division by 0
Origin commit data
------------------
Commit: f7a95bd3ac
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-30 (Fri, 30 Jun 2017)

Origin message was:
------------------
- cc_frm_footer: avoid division by 0
2017-06-30 10:41:24 +02:00
vanhofen
8cbcfcabaf Merge branch 'ni/tuxbox' of bitbucket.org:neutrino-images/ni-neutrino-hd into ni/tuxbox
Origin commit data
------------------
Commit: 936a6ab3f7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-29 (Thu, 29 Jun 2017)
2017-06-29 21:37:11 +02:00
vanhofen
7442c19a59 bouquetlist: fix footer; CComponentsFooter doesn't like 0 buttons as it seems
Origin commit data
------------------
Commit: 5b3be66a93
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-29 (Thu, 29 Jun 2017)

Origin message was:
------------------
- bouquetlist: fix footer; CComponentsFooter doesn't like 0 buttons as it seems
2017-06-29 21:35:51 +02:00
gixxpunk
c2a2ab7509 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 2594a60728
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-06-29 (Thu, 29 Jun 2017)
2017-06-29 21:29:56 +02:00
Jacek Jendrzej
c44fcd296b src/gui/moviebrowser/mb.cpp fix segfault if m_movieSelectionHandler is NULL
Origin commit data
------------------
Commit: fc5ba460a5
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-29 (Thu, 29 Jun 2017)
2017-06-29 19:04:10 +02:00
vanhofen
51a20d00c7 settings.h: rename FRAME_MIN_WIDTH to FRAME_WIDTH_MIN ...
to get same name-structure as in the existing defines

(cherry picked from commit 834e9e3843)
Signed-off-by: Thilo Graf <dbt@novatux.de>

Conflicts:
	src/system/settings.h


Origin commit data
------------------
Commit: 6a7ac6c0b0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-29 (Thu, 29 Jun 2017)

Origin message was:
------------------
- settings.h: rename FRAME_MIN_WIDTH to FRAME_WIDTH_MIN ...

to get same name-structure as in the existing defines

(cherry picked from commit 834e9e3843)
Signed-off-by: Thilo Graf <dbt@novatux.de>

Conflicts:
	src/system/settings.h
2017-06-29 17:18:06 +02:00
Michael Liebmann
3c32edae9d lib-libtuxtxt-tuxtxt.cpp avoid segfault, supplement to d6b7d95
Origin commit data
------------------
Commit: a6344b3527
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-06-29 (Thu, 29 Jun 2017)
2017-06-29 15:05:30 +02:00
vanhofen
834e9e3843 settings.h: rename FRAME_MIN_WIDTH to FRAME_WIDTH_MIN ...
to get same name-structure as in the existing defines


Origin commit data
------------------
Commit: f77c2b897c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-28 (Wed, 28 Jun 2017)

Origin message was:
------------------
- settings.h: rename FRAME_MIN_WIDTH to FRAME_WIDTH_MIN ...

to get same name-structure as in the existing defines
2017-06-28 23:08:22 +02:00
vanhofen
171e52c0e6 settings.h: set FRAME_MIN_WIDTH to 1
Origin commit data
------------------
Commit: eb6863a340
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-28 (Wed, 28 Jun 2017)

Origin message was:
------------------
- settings.h: set FRAME_MIN_WIDTH to 1
2017-06-28 22:50:47 +02:00
vanhofen
25e1efbc73 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/audioplayer.cpp
	src/gui/audioplayer.h


Origin commit data
------------------
Commit: 3f812037a5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-28 (Wed, 28 Jun 2017)
2017-06-28 22:49:34 +02:00
vanhofen
c1f17ef758 upnpbrowser: fix some wrong OFFSETs
Origin commit data
------------------
Commit: 788181bf27
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-28 (Wed, 28 Jun 2017)

Origin message was:
------------------
- upnpbrowser: fix some wrong OFFSETs
2017-06-28 22:44:08 +02:00
Thilo Graf
b955b5bc79 CAudioPlayerGui: add cc scquare objekt as title box, fix caption bg colors
Use of cc square object saves unnecessary paintBoxRel() calls.
BgColors of metatdata and time display were different to
titlebox body color, but was not to see with all themes.

btw: time box was too much on the right side. Frame of titelbox
was overpainted but was not very noticeable if frame width < 2.


Origin commit data
------------------
Commit: 86742b1d72
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-28 (Wed, 28 Jun 2017)
2017-06-28 22:07:34 +02:00
Thilo Graf
9e012d61a8 settings.h: add define for minimal frame width
Mostly we are using a frame width of 2 lines. This should ensure
correct scaling with other screen resolution.


Origin commit data
------------------
Commit: 6aaa403197
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-28 (Wed, 28 Jun 2017)
2017-06-28 21:24:09 +02:00
Thilo Graf
1203bd054a CComponentsFooter: remove FIXME tag
fixed since 428788c8a4
Obsolete wrong types caused this.


Origin commit data
------------------
Commit: 47f7426aa7
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-28 (Wed, 28 Jun 2017)
2017-06-28 20:36:51 +02:00
vanhofen
6d71bdbcb7 audioplayer: reset idle time to avoid screensaver ...
when returning from shoutcast-filebrowser

(cherry picked from commit 3587c5e1a7)
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: b62bb3715f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-28 (Wed, 28 Jun 2017)

Origin message was:
------------------
- audioplayer: reset idle time to avoid screensaver ...

when returning from shoutcast-filebrowser

(cherry picked from commit 3587c5e1a7)
Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-06-28 20:35:20 +02:00
vanhofen
1e25393c20 audioplayer: fix round borders in footer when playlist is hidden ...
and use large roundings as in the other gui-elements

cherry-picked from 4785f5324f

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


Origin commit data
------------------
Commit: bb7b9e2207
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-28 (Wed, 28 Jun 2017)

Origin message was:
------------------
- audioplayer: fix round borders in footer when playlist is hidden ...

and use large roundings as in the other gui-elements

cherry-picked from 4785f5324f

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-06-28 20:35:20 +02:00
vanhofen
4041279511 audioplayer: reset idle time to avoid screensaver ...
when returning from filebrowser

(cherry picked from commit e21440a6b7)
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: bab708281a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-28 (Wed, 28 Jun 2017)

Origin message was:
------------------
- audioplayer: reset idle time to avoid screensaver ...

when returning from filebrowser

(cherry picked from commit e21440a6b7)
Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-06-28 20:35:19 +02:00
vanhofen
92c28e21e8 audioplayer: fix position of meta data in titlebox
(cherry picked from commit 0ccd2a5cc7)
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: f0c70b854c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-27 (Tue, 27 Jun 2017)

Origin message was:
------------------
- audioplayer: fix position of meta data in titlebox

(cherry picked from commit 0ccd2a5cc7)
Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-06-28 20:35:19 +02:00
vanhofen
c0b9460184 audiometadata: add logo to metadata
# Conflicts:
#	src/driver/audiometadata.cpp
#	src/driver/audiometadata.h

cherry-picked from da7b7b0930

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


Origin commit data
------------------
Commit: b66ea2f9cc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-28 (Wed, 28 Jun 2017)

Origin message was:
------------------
- audiometadata: add logo to metadata

# Conflicts:
#	src/driver/audiometadata.cpp
#	src/driver/audiometadata.h

cherry-picked from da7b7b0930

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-06-28 20:35:19 +02:00
vanhofen
00694dfcf8 audioplayer: fix coordinates to clear title-box
(cherry picked from commit 0fbfbc4bc3)
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 4b4cf14d6b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-27 (Tue, 27 Jun 2017)

Origin message was:
------------------
- audioplayer: fix coordinates to clear title-box

(cherry picked from commit 0fbfbc4bc3)
Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-06-28 20:35:18 +02:00
vanhofen
2b74966d80 audiodec: unify cover handling
(cherry picked from commit a33f81ba2e)
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 99d72a0b8a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-27 (Tue, 27 Jun 2017)

Origin message was:
------------------
- audiodec: unify cover handling

(cherry picked from commit a33f81ba2e)
Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-06-28 20:35:18 +02:00
vanhofen
6a8e1d8e55 audioplayer: change scanXmlData() arguments order ...
switch url <-> name to get the same order as in other used functions

(cherry picked from commit e93c9416be)
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: d75a3b0f58
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-27 (Tue, 27 Jun 2017)

Origin message was:
------------------
- audioplayer: change scanXmlData() arguments order ...

switch url <-> name to get the same order as in other used functions

(cherry picked from commit e93c9416be)
Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-06-28 20:35:17 +02:00
vanhofen
a762acd9cc audioplayer: allow to load radio-favorites.xml via menu
Origin commit data
------------------
Commit: 6a3fa8c4e7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-28 (Wed, 28 Jun 2017)

Origin message was:
------------------
- audioplayer: allow to load radio-favorites.xml via menu
2017-06-28 16:26:36 +02:00