Commit Graph

12197 Commits

Author SHA1 Message Date
vanhofen
63398f923d Revert "epgview: swap RC_info and RC_help in EPG view"
This reverts commit 3c2ba0b757.

Conflicts:
	src/gui/epgview.cpp


Origin commit data
------------------
Commit: eba2c14d8f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-26 (Tue, 26 Sep 2017)
2017-09-26 16:08:55 +02:00
vanhofen
fa1a2351bb Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/driver/fb_accel_sti.cpp
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp


Origin commit data
------------------
Commit: b3319a4561
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-26 (Tue, 26 Sep 2017)
2017-09-26 16:01:46 +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
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
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
vanhofen
2f674ed6c0 menue: add missing delete
Origin commit data
------------------
Commit: 8277f9f931
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)

Origin message was:
------------------
- menue: add missing delete
2017-09-25 22:27:26 +02:00
vanhofen
0639e863d5 osd-setup: add missing delete
Origin commit data
------------------
Commit: 2cb8235ae4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)

Origin message was:
------------------
- osd-setup: add missing delete
2017-09-25 22:27:26 +02:00
vanhofen
0721f777a8 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: 367b0a68ef
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)
2017-09-25 13:57:26 +02:00
vanhofen
a38df2dbc3 Revert "src/gui/osd_setup.cpp disable hint paint in channellist-mode, is broken"
This reverts commit 9566002cf8.


Origin commit data
------------------
Commit: 317f267ef2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)
2017-09-25 13:52:37 +02:00
vanhofen
0fafaec36d menue: fix coordinates for savescreen function
Origin commit data
------------------
Commit: fd3a6a4ab0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)

Origin message was:
------------------
- menue: fix coordinates for savescreen function
2017-09-25 13:51:56 +02:00
vanhofen
b46852eaec bouqueteditor_bouquets: RC_yellow now stops move bouquets too
Origin commit data
------------------
Commit: bba488cee8
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-25 13:08:06 +02:00
vanhofen
aedfcdc52e Revert "epgview: swap RC_info and RC_help in EPG view"
This reverts commit 05d2a7b8b1.

Conflicts:
	src/gui/epgview.cpp


Origin commit data
------------------
Commit: f0a8d2ccf7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)
2017-09-25 11:42:46 +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
3c6d8b4f5c radio-stations.xml: add some Radio BOB! streams
Origin commit data
------------------
Commit: d07e45166e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)
2017-09-25 11:25:52 +02:00
Stefan Seyfried
059c5107fb radio-stations.xml: clean out nonworking entries
Remove all entries that give plain 404 errors or where the host
name cannot be resolved.
Left in some where the playlist url redirects to unreachable hosts
because that might be a temporary failure.


Origin commit data
------------------
Commit: c3b5af06a9
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)
2017-09-25 11:25:52 +02:00
Stefan Seyfried
9ac3f7934f audioplayer: allow to add https:// urls from playlist
Origin commit data
------------------
Commit: 573ced1134
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)
2017-09-25 11:25:51 +02:00
Stefan Seyfried
98268eee35 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: 207559800d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)
2017-09-25 11:25:51 +02:00
Stefan Seyfried
9aef1ca078 rcinput: disable timer debug messages
Origin commit data
------------------
Commit: 3aebc6cf22
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)
2017-09-25 11:25:51 +02:00
Stefan Seyfried
df817f18f4 subchannel_select: ensure buffer does not overflow
Origin commit data
------------------
Commit: cd60b58cae
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)
2017-09-25 11:25:51 +02:00
Stefan Seyfried
e7cf2870ce audioplayer: fix buffer overflow
Origin commit data
------------------
Commit: df74ee2d18
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)
2017-09-25 11:25:51 +02:00
Stefan Seyfried
4a360cf8ac moviebrowser: fix format-string warnings
Origin commit data
------------------
Commit: 85c1a8e451
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)
2017-09-25 11:25:51 +02:00
Stefan Seyfried
564815c90d zapit: properly initialize arrays in scanbat and scansdt
Origin commit data
------------------
Commit: cbccd82b9c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)
2017-09-25 11:25:51 +02:00
Stefan Seyfried
1c4ac9a0e2 CMenuWidget: simplify menu_left_exit code, add missing break
Origin commit data
------------------
Commit: 3ae33950eb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)
2017-09-25 11:25:51 +02:00
Stefan Seyfried
5577e1bf3b zapit: suppress one more implicit-fallthrough warning
Origin commit data
------------------
Commit: 28197b0ba2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)
2017-09-25 11:25:51 +02:00
Stefan Seyfried
1c9982f2c9 neutrinoyparser: fix invalid logic in func_unmount_get_list
Origin commit data
------------------
Commit: e04eb24ff4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)
2017-09-25 11:25:51 +02:00
Stefan Seyfried
70522a9cbe pictureviewer: fix build with gcc7
Origin commit data
------------------
Commit: 6f88e781cd
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)
2017-09-25 11:25:50 +02:00