Commit Graph

10844 Commits

Author SHA1 Message Date
Jacek Jendrzej
2aa2cc738f fix clang compil, use swap()
Origin commit data
------------------
Commit: 0f26434550
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-28 (Thu, 28 Sep 2017)
2017-09-28 13:43:51 +02:00
Jacek Jendrzej
8d9241ff68 Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 7ae7765460
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-27 (Wed, 27 Sep 2017)
2017-09-27 14:30:28 +02:00
vanhofen
5bbee58487 menue: only add hint_height to full_height, if we really have a hint
Origin commit data
------------------
Commit: 58e05cfd99
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)

Origin message was:
------------------
- menue: only add hint_height to full_height, if we really have a hint
2017-09-27 14:29:51 +02:00
vanhofen
120ebdbe64 bouqueteditor_channels: allow to navigate with left/right through the bouquets
add corresponding context-icons to header


Origin commit data
------------------
Commit: e94e0780b0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)

Origin message was:
------------------
- bouqueteditor_channels: allow to navigate with left/right through the bouquets

add corresponding context-icons to header
2017-09-27 14:20:11 +02:00
Jacek Jendrzej
894b1c146a Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 1fc8437a34
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-27 (Wed, 27 Sep 2017)
2017-09-27 11:56:03 +02:00
vanhofen
68cb4281d6 bouqueteditor: some more timeout-fixes
Origin commit data
------------------
Commit: c00013ea52
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)

Origin message was:
------------------
- bouqueteditor: some more timeout-fixes
2017-09-27 11:55:22 +02:00
Jacek Jendrzej
ab4decf40e Revert "CMenuWidget: simplify menu_left_exit code, add missing break"
This reverts commit a381903b02.


Origin commit data
------------------
Commit: 1deaebf1cf
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-27 (Wed, 27 Sep 2017)
2017-09-27 11:11:12 +02:00
Jacek Jendrzej
b786ce7397 Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 2e696818d1
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-27 (Wed, 27 Sep 2017)
2017-09-27 09:58:18 +02:00
vanhofen
ff62bdcdb7 fix some timout-off-bugs in bouquetlist and channellist
Origin commit data
------------------
Commit: 95157b1f8f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)

Origin message was:
------------------
- fix some timout-off-bugs in bouquetlist and channellist
2017-09-27 09:57:19 +02:00
vanhofen
6c32f7b375 fix some timout-off-bugs in epgplus, epgview, eventlist and filebrowser
Origin commit data
------------------
Commit: f0e7069878
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)

Origin message was:
------------------
- fix some timout-off-bugs in epgplus, epgview, eventlist and filebrowser
2017-09-27 09:57:10 +02:00
vanhofen
18fd66d365 bouqueteditor: fix timeout; editor doesn't open when timeout was "off"
Origin commit data
------------------
Commit: db80514499
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)

Origin message was:
------------------
- bouqueteditor: fix timeout; editor doesn't open when timeout was "off"
2017-09-27 09:50:14 +02:00
vanhofen
f6405d15f0 network-setup: add header-icon to network-test
Origin commit data
------------------
Commit: db5af2d9ca
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)

Origin message was:
------------------
- network-setup: add header-icon to network-test
2017-09-27 09:50:14 +02:00
vanhofen
0721dcc47f network-setup: fix text-alignment for network-test
Origin commit data
------------------
Commit: b37deab766
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-26 (Tue, 26 Sep 2017)

Origin message was:
------------------
- network-setup: fix text-alignment for network-test
2017-09-27 09:50:14 +02:00
Jacek Jendrzej
0b3c315cae Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 0abeb742bd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-26 (Tue, 26 Sep 2017)
2017-09-26 13:38:07 +02:00
vanhofen
e0c5fe6321 menue: fix coordinates for savescreen function
Origin commit data
------------------
Commit: 96bb48b281
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)

Origin message was:
------------------
- menue: fix coordinates for savescreen function
2017-09-26 13:36:33 +02:00
vanhofen
1165d734ec bouqueteditor_bouquets: RC_yellow now stops move bouquets too
Origin commit data
------------------
Commit: a961191863
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)

Origin message was:
------------------
- bouqueteditor_bouquets: RC_yellow now stops move bouquets too
2017-09-26 13:36:33 +02:00
Jacek Jendrzej
3adca6f79c Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: e4d0065909
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-26 (Tue, 26 Sep 2017)
2017-09-26 13:02:04 +02:00
vanhofen
a856e0c40e menue: add missing delete
Origin commit data
------------------
Commit: 77643f3b3b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)

Origin message was:
------------------
- menue: add missing delete
2017-09-26 13:00:49 +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
Jacek Jendrzej
816a0ae326 Revert "src/gui/osd_setup.cpp disable hint paint in channellist-mode, is broken"
This reverts commit 9566002cf8.


Origin commit data
------------------
Commit: ca09c92542
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-26 (Tue, 26 Sep 2017)
2017-09-26 12:41:05 +02:00
vanhofen
cb235bd82c menue: user smaller vertical offset for hintboxes to keep it in sync with other vertical offsets
* get bottom menu offset from CMenuSeparator()->getHeight()


Origin commit data
------------------
Commit: 33a596d175
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)

Origin message was:
------------------
- menue: user smaller vertical offset for hintboxes to keep it in sync with other vertical offsets

* get bottom menu offset from CMenuSeparator()->getHeight()
2017-09-26 12:41:05 +02:00
vanhofen
459deeca9f osd-setup: use 0 as a localized value for timeout-settings
Origin commit data
------------------
Commit: 7c429c17e0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)

Origin message was:
------------------
- osd-setup: use 0 as a localized value for timeout-settings
2017-09-26 12:41:05 +02:00
vanhofen
25d195e7bb menue: add possibility to add localized values in CMenuOptionNumberChooser seperately
Origin commit data
------------------
Commit: d9e540b865
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)

Origin message was:
------------------
- menue: add possibility to add localized values in CMenuOptionNumberChooser seperately
2017-09-26 12:41:05 +02:00
vanhofen
937cddf6e5 detailsline: reduce two times the shadow width from the h_marks
Otherwise shadows will be painted lower then the height of the object
the detailsline is docked to.


Origin commit data
------------------
Commit: 95ab4ac708
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)

Origin message was:
------------------
- detailsline: reduce two times the shadow width from the h_marks

Otherwise shadows will be painted lower then the height of the object
the detailsline is docked to.
2017-09-26 12:41:05 +02:00
vanhofen
2cbe08d217 bouqueteditor: massively rework gui; ...
* add CBEGlobals to globalize some basic calculations
 (maybe there's something more to globalize)
* add header-icons
* change header-captions
* add info-texts for webtv-channels
* change arrangement of status-icons
* small code re-formattings

bouqueteditor_bouquets:
* RC_yellow now starts and stops moving of bouquets
* RC_tv now switches to tv-channels
* RC_radio now switches to radio-channels

bouqueteditor_chanselect:
* RC_green now add channels too
* don't use listbox-widget anymore (listbox is unused now)


Origin commit data
------------------
Commit: 4f50b2009a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-24 (Sun, 24 Sep 2017)

Origin message was:
------------------
- bouqueteditor: massively rework gui; ...

* add CBEGlobals to globalize some basic calculations
 (maybe there's something more to globalize)
* add header-icons
* change header-captions
* add info-texts for webtv-channels
* change arrangement of status-icons
* small code re-formattings

bouqueteditor_bouquets:
* RC_yellow now starts and stops moving of bouquets
* RC_tv now switches to tv-channels
* RC_radio now switches to radio-channels

bouqueteditor_chanselect:
* RC_green now add channels too
* don't use listbox-widget anymore (listbox is unused now)
2017-09-26 12:41:05 +02:00
Stefan Seyfried
3c2ba0b757 epgview: swap RC_info and RC_help in EPG view
this restores old behaviour of RC_info toggling big fonts.
RC_help toggles TMDB display (which is disabled by default anyway)


Origin commit data
------------------
Commit: 940fdf36fd
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-24 (Sun, 24 Sep 2017)
2017-09-26 12:41:05 +02:00
Stefan Seyfried
f2520852e4 audioplayer: allow to add https:// urls from playlist
Origin commit data
------------------
Commit: 163815a2e0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-24 (Sun, 24 Sep 2017)
2017-09-26 12:41:05 +02:00
Stefan Seyfried
5ab35e941d netfile: avoid possible buffer overflows spotted by gcc7
* use strcpy instead of sprintf(x, "constant") or sprintf(x, "%s", str)
* use strncpy and ensure termination where necessary
* use snprintf instead of sprintf


Origin commit data
------------------
Commit: 7955467a77
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-24 (Sun, 24 Sep 2017)
2017-09-26 12:41:05 +02:00
Stefan Seyfried
61d892bdaf fb_accel: fix blit after time_monotonic_ms fix
Origin commit data
------------------
Commit: a294b610a4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-24 (Sun, 24 Sep 2017)
2017-09-26 12:41:05 +02:00
Stefan Seyfried
b1d1d399d7 abstime: fix time_monotonic_ms on 32bit systems
m)


Origin commit data
------------------
Commit: 7f2d58f956
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-24 (Sun, 24 Sep 2017)
2017-09-26 12:41:05 +02:00
Stefan Seyfried
339cf712ec rcinput: disable timer debug messages
Origin commit data
------------------
Commit: 9425caa6e5
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
8b7bf711c9 subchannel_select: ensure buffer does not overflow
Origin commit data
------------------
Commit: 8a243ea12e
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
74155189b4 audioplayer: fix buffer overflow
Origin commit data
------------------
Commit: 96006a04f6
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
abf326730e moviebrowser: fix format-string warnings
Origin commit data
------------------
Commit: 5457ddc108
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
548d90b18f zapit: properly initialize arrays in scanbat and scansdt
Origin commit data
------------------
Commit: 8e4907b2db
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
a381903b02 CMenuWidget: simplify menu_left_exit code, add missing break
Origin commit data
------------------
Commit: aa0863f0c3
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
aa0e257820 zapit: suppress one more implicit-fallthrough warning
Origin commit data
------------------
Commit: 468fd6a3c7
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
f7a8eacf54 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: 99c8168d2c
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
69dd02f458 neutrinoyparser: fix invalid logic in func_unmount_get_list
Origin commit data
------------------
Commit: ea30b22119
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
cc14797738 pictureviewer: fix build with gcc7
Origin commit data
------------------
Commit: 125eb6a7d1
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
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
89cd4ce8a4 add LUA_CFLAGS everywhere widget/menue.h is used
Origin commit data
------------------
Commit: 9e2a7d7f79
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
Stefan Seyfried
3a758cade1 moviplayer: suppress unused variable warning
Origin commit data
------------------
Commit: c7f429019d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-23 (Sat, 23 Sep 2017)
2017-09-26 11:29:19 +02:00
Thilo Graf
3001ba022f cc_detailsline.cpp: fix possible unintended reduced height of bottom marker
Decrement value removed.

Height of bottom marker was decreased on every new repaint if no new
height was assigned. Was to see in bouqueteditor while scrolling with bouqets or
channel select window.

comes in with e534457250


Origin commit data
------------------
Commit: dca7e10179
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-09-24 (Sun, 24 Sep 2017)
2017-09-24 22:27:46 +02:00
Jacek Jendrzej
56b7cb31a6 Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 17afd5c87a
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-21 (Thu, 21 Sep 2017)
2017-09-21 18:47:32 +02:00
Jacek Jendrzej
8337c2402b fix stack buffer underflow
Origin commit data
------------------
Commit: bdd23e0ece
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-21 (Thu, 21 Sep 2017)
2017-09-21 18:46:21 +02:00
Jacek Jendrzej
27634c1c08 fix use stack after scope
Origin commit data
------------------
Commit: d61b9745bc
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-21 (Thu, 21 Sep 2017)
2017-09-21 18:45:47 +02:00
vanhofen
16f0d0ca8a code alignments to master branch
Origin commit data
------------------
Commit: dbb726e191
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-21 (Thu, 21 Sep 2017)

Origin message was:
------------------
- code alignments to master branch
2017-09-21 11:41:59 +02:00
Michael Liebmann
e137542efe Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: abfb02aa47
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-09-21 (Thu, 21 Sep 2017)
2017-09-21 09:07:15 +02:00