Commit Graph

10745 Commits

Author SHA1 Message Date
Stefan Seyfried
00e83ba596 tuxtxt: convert to int-pointer arithmetic, work with all framebuffers
This converts the drawing code from byte-pointer to fb_pixel_t-pointer
arithmetic, making the calculations more obvious and probably more
efficient.
Additionally, the color tables are now generated in a way that it should
work regardless of the frame buffer color format. Allows to remove a few
hardware specific #ifdefs.


Origin commit data
------------------
Commit: c977c98217
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-15 (Wed, 15 Feb 2017)
2017-02-15 18:38:03 +01:00
Michael Liebmann
47c93ee999 libtuxtxt: Transfer from neutrino-mp for better compatibility
Origin commit data
------------------
Commit: 5612baaff7
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-15 (Wed, 15 Feb 2017)
2017-02-15 18:38:03 +01:00
Stefan Seyfried
ed8d0ba5c5 fb_accel_td: add missing getBackBufferPointer()
this fixes tuxtxt rendering problems


Origin commit data
------------------
Commit: 20a85c3874
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-15 (Wed, 15 Feb 2017)
2017-02-15 18:38:03 +01:00
vanhofen
ee64adc00b neutrino: small code cosmetics in loadSetup()
Origin commit data
------------------
Commit: d457cc8ef5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-15 (Wed, 15 Feb 2017)

Origin message was:
------------------
- neutrino: small code cosmetics in loadSetup()
2017-02-15 08:48:38 +01:00
vanhofen
6467636232 disable strange try-to-detect-bad-config-file if-statement
Origin commit data
------------------
Commit: 56b99e0b47
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-15 (Wed, 15 Feb 2017)

Origin message was:
------------------
- disable strange try-to-detect-bad-config-file if-statement
2017-02-15 08:48:38 +01:00
Stefan Seyfried
689feeee28 tuxtxt: convert to int-pointer arithmetic, work with all framebuffers
This converts the drawing code from byte-pointer to fb_pixel_t-pointer
arithmetic, making the calculations more obvious and probably more
efficient.
Additionally, the color tables are now generated in a way that it should
work regardless of the frame buffer color format. Allows to remove a few
hardware specific #ifdefs.


Origin commit data
------------------
Commit: f51278b094
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-15 (Wed, 15 Feb 2017)
2017-02-15 00:31:26 +01:00
Stefan Seyfried
358acd6ab6 fb_accel_td: add missing getBackBufferPointer()
this fixes tuxtxt rendering problems


Origin commit data
------------------
Commit: 3413af4236
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-15 (Wed, 15 Feb 2017)
2017-02-15 00:10:59 +01:00
Michael Liebmann
15c81625d6 Merge branch 'master' into pu/fb-setmode
Fix merge conflict


Origin commit data
------------------
Commit: 65f81b146d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-14 (Tue, 14 Feb 2017)
2017-02-14 20:11:08 +01:00
Michael Liebmann
bef9e4166a fb_generic: make blitBox2FB virtual
Origin commit data
------------------
Commit: e8ec4540ca
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-14 (Tue, 14 Feb 2017)
2017-02-14 20:01:55 +01:00
Michael Liebmann
4228150845 fb_generic.h: Add missing function add_gxa_sync_marker()
- is required for cs hd1


Origin commit data
------------------
Commit: de80748cac
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-14 (Tue, 14 Feb 2017)
2017-02-14 20:01:55 +01:00
Stefan Seyfried
fb65402fa0 system/helpers: disable GetWidth4FB_HW_ACC()
...will be removed later


Origin commit data
------------------
Commit: e1e2052edb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-14 (Tue, 14 Feb 2017)
2017-02-14 20:01:55 +01:00
Stefan Seyfried
ee986e0e2f remove hardware specific code from gui
Use the framebuffer's getWidth4FB_HW_ACC() instead of system/helpers.
The use in cc_item_picture was guarded by a hardware #ifdef, use
needAlign4Blit() instead.

This needs testing on the affected hardware, which I do not have :-)


Origin commit data
------------------
Commit: c9e1072b94
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-14 (Tue, 14 Feb 2017)
2017-02-14 20:01:55 +01:00
Stefan Seyfried
78419473da implement getWidth4FB_HW_ACC in fb_accel class
This helper to determine alignment for hardware blitting is now in
system/helpers.h, where it does not really belong. Put it into the
framebuffer class instead. Framebuffers that don't need it will just
get a dummy function, the cs_hd2 framebuffer gets the real thing.
Also add a bool function that indicates the need for alignment.


Origin commit data
------------------
Commit: b6909fb815
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-14 (Tue, 14 Feb 2017)
2017-02-14 20:01:55 +01:00
Stefan Seyfried
15dfa3449a fb_generic: remove hardware specific #ifdef
Origin commit data
------------------
Commit: 7fdc4c7178
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-14 (Tue, 14 Feb 2017)
2017-02-14 20:01:55 +01:00
Stefan Seyfried
2823bb29b6 acinclude: only set default model to hd1 if boxtype=coolstream
Origin commit data
------------------
Commit: 62ee5185b5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)
2017-02-14 20:01:55 +01:00
Michael Liebmann
9b16352df5 screenshot: Workaround for broken osd screenshot with new fb driver...
...and 1280x720 resolution.


Origin commit data
------------------
Commit: 56446c358f
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-14 (Tue, 14 Feb 2017)
2017-02-14 16:21:37 +01:00
Stefan Seyfried
c6a902816b lcdd (tripledragon): remove bogus warning message
Origin commit data
------------------
Commit: 9ed6cfe859
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-14 (Tue, 14 Feb 2017)
2017-02-14 00:17:03 +01:00
Stefan Seyfried
d007fc68bd system/helpers: disable GetWidth4FB_HW_ACC()
...will be removed later


Origin commit data
------------------
Commit: c95601630a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-14 (Tue, 14 Feb 2017)
2017-02-14 00:15:11 +01:00
Stefan Seyfried
b9080f81dc remove hardware specific code from gui
Use the framebuffer's getWidth4FB_HW_ACC() instead of system/helpers.
The use in cc_item_picture was guarded by a hardware #ifdef, use
needAlign4Blit() instead.

This needs testing on the affected hardware, which I do not have :-)


Origin commit data
------------------
Commit: a5333b4ec1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-14 (Tue, 14 Feb 2017)
2017-02-14 00:14:30 +01:00
Stefan Seyfried
33629504fa implement getWidth4FB_HW_ACC in fb_accel class
This helper to determine alignment for hardware blitting is now in
system/helpers.h, where it does not really belong. Put it into the
framebuffer class instead. Framebuffers that don't need it will just
get a dummy function, the cs_hd2 framebuffer gets the real thing.
Also add a bool function that indicates the need for alignment.


Origin commit data
------------------
Commit: 05d1732cea
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-14 (Tue, 14 Feb 2017)
2017-02-14 00:09:33 +01:00
Stefan Seyfried
62fb2c2f7e fb_generic: remove hardware specific #ifdef
Origin commit data
------------------
Commit: bedee6b4c3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-14 (Tue, 14 Feb 2017)
2017-02-14 00:06:47 +01:00
vanhofen
ca916b849c Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/driver/fb_generic.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: 8a4a5e1ae6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)
2017-02-13 23:29:07 +01:00
vanhofen
1a0368da1e align new osd-presets to good old NI-values
Origin commit data
------------------
Commit: af88313946
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)

Origin message was:
------------------
- align new osd-presets to good old NI-values
2017-02-13 23:19:58 +01:00
vanhofen
89ecafc611 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 49b9be599b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)
2017-02-13 23:16:26 +01:00
vanhofen
9027fb96e9 ni-menu; fix build; OSD-Scart-Fix needs fixes, as it seems
Origin commit data
------------------
Commit: 477ed4a017
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)

Origin message was:
------------------
- ni-menu; fix build; OSD-Scart-Fix needs fixes, as it seems
2017-02-13 23:15:25 +01:00
vanhofen
89d74444cf set new osd-presets closer to old values; auto-calc screenEnd-values
Origin commit data
------------------
Commit: 145c0d41b4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)

Origin message was:
------------------
- set new osd-presets closer to old values; auto-calc screenEnd-values
2017-02-13 22:50:48 +01:00
vanhofen
913fcbeb07 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 5506a6c290
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)
2017-02-13 21:41:11 +01:00
vanhofen
8704cb914a Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/osd_setup.cpp
	src/neutrino.cpp
	src/neutrino.h
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Commit: ba8bdde8c8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)
2017-02-13 21:41:04 +01:00
vanhofen
66861f155d fix keywords in strange try-to-detect-bad-config-file if-statement
Origin commit data
------------------
Commit: 6964b62c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)

Origin message was:
------------------
- fix keywords in strange try-to-detect-bad-config-file if-statement
2017-02-13 21:34:01 +01:00
vanhofen
789fdb6d86 migrate users settings; screen_StartX_crt/lcd -> screen_StartX_crt/lcd_0
Origin commit data
------------------
Commit: 9792b47666
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)

Origin message was:
------------------
- migrate users settings; screen_StartX_crt/lcd -> screen_StartX_crt/lcd_0
2017-02-13 21:21:11 +01:00
vanhofen
c9ab20d703 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: b4b328a0bc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)
2017-02-13 19:36:03 +01:00
vanhofen
ad57b03429 capmt: remove newlines from debug output
Origin commit data
------------------
Commit: c23e423e8f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)

Origin message was:
------------------
- capmt: remove newlines from debug output
2017-02-13 19:34:55 +01:00
Michael Liebmann
0c20bf9af6 neutrino: Add switch osd resolution when supported from hardware
- At the moment supported hardware: CS HD2

 Currently known problems:
 -------------------------
 - Display menus after changing resolution (Reboot required)
 - Display headers after changing resolution hd => fullhd (Reboot required)
 - Display infobar after changing resolution hd => fullhd (Reboot required)
 - Screenshot broken (With new driver and set resolution to 1280x720)


Origin commit data
------------------
Commit: 7b158903f8
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-13 (Mon, 13 Feb 2017)

Origin message was:
------------------
neutrino: Add switch osd resolution when supported from hardware

 - At the moment supported hardware: CS HD2

 Currently known problems:
 -------------------------
 - Display menus after changing resolution (Reboot required)
 - Display headers after changing resolution hd => fullhd (Reboot required)
 - Display infobar after changing resolution hd => fullhd (Reboot required)
 - Screenshot broken (With new driver and set resolution to 1280x720)
2017-02-13 12:51:14 +01:00
Michael Liebmann
166919764a neutrino: Upscaling fonts, infoclock and volumebar for full hd
Origin commit data
------------------
Commit: 13a7358e64
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-13 (Mon, 13 Feb 2017)
2017-02-13 12:51:14 +01:00
Michael Liebmann
dec085f4ee CFbAccelCSHD2: Add scaleFont()function for font upscaling when fullhd is aktiv
Origin commit data
------------------
Commit: 88c834221b
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-13 (Mon, 13 Feb 2017)
2017-02-13 12:51:14 +01:00
Michael Liebmann
c9958d4e6b CFbAccelCSHD2::setMode: Update for new framebuffer driver (full hd)
Origin commit data
------------------
Commit: 33125aed06
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-13 (Mon, 13 Feb 2017)
2017-02-13 12:51:14 +01:00
Michael Liebmann
c96eccb348 configure: Add macro ENABLE_CHANGE_OSD_RESOLUTION
- macro is default for hd2
 - macro can activated for other hardware by
 configure option --enable-reschange


Origin commit data
------------------
Commit: 9497a3c43a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-13 (Mon, 13 Feb 2017)

Origin message was:
------------------
configure: Add macro ENABLE_CHANGE_OSD_RESOLUTION

 - macro is default for hd2
 - macro can activated for other hardware by
  configure option --enable-reschange
2017-02-13 12:51:14 +01:00
vanhofen
39afdaa47e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 026247a40f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)
2017-02-13 11:43:13 +01:00
Thilo Graf
68b4639ac9 CMovieBrowser: vizualize progress for loading of youtube vidoes
Origin commit data
------------------
Commit: 690ac7c428
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)
2017-02-13 10:05:34 +01:00
Thilo Graf
e662a4fa4e cYTFeedParser: add signal OnLoadVideoInfo
Required for visualized progress display.


Origin commit data
------------------
Commit: 0aa261d911
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)
2017-02-13 10:03:38 +01:00
Thilo Graf
78e96b7b5a CImageInfo: fix y position of infotext
Minitv was not considered.
When font size very small, infotext could be overlapping
with minitv window. This should fix this.


Origin commit data
------------------
Commit: 2727e3f7f0
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)
2017-02-13 09:09:46 +01:00
Thilo Graf
edc6080ebf CMovieBrowser: visualize progress during load movies
TODO: youtube load


Origin commit data
------------------
Commit: a907afdc7c
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-10 (Fri, 10 Feb 2017)
2017-02-13 09:02:43 +01:00
Thilo Graf
14f4e34218 CProgressWindow: add documentation for Doxygen
Origin commit data
------------------
Commit: 45e77707f0
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-10 (Fri, 10 Feb 2017)
2017-02-13 09:02:43 +01:00
Thilo Graf
36958f4e7e CProgressWindow: use using namespace for std and sigc
Makes more clearly


Origin commit data
------------------
Commit: a3c93f4236
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-10 (Fri, 10 Feb 2017)
2017-02-13 09:02:43 +01:00
Thilo Graf
a1598cb703 CProgressWindow: add possibility to show progress via signal
Origin commit data
------------------
Commit: 842c8e79bb
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-10 (Fri, 10 Feb 2017)
2017-02-13 09:02:43 +01:00
Thilo Graf
ae97c4e398 CProgressWindow: allow variable max value, allow define dimensions
Origin commit data
------------------
Commit: 547238bfdd
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-10 (Fri, 10 Feb 2017)
2017-02-13 09:02:43 +01:00
Stefan Seyfried
0f3e4077a7 acinclude: only set default model to hd1 if boxtype=coolstream
Origin commit data
------------------
Commit: 80c961d5f4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)
2017-02-13 00:03:58 +01:00
vanhofen
6df51f5e7e fix last merge
Origin commit data
------------------
Commit: 4e3193a126
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)

Origin message was:
------------------
- fix last merge
2017-02-12 23:58:55 +01:00
vanhofen
bad03fe56c Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox
Conflicts:
	configure.ac
	src/driver/Makefile.am
	src/driver/fb_accel.h
	src/driver/fb_accel_glfb.cpp
	src/driver/fb_generic.cpp
	src/driver/fb_generic.h
	src/gui/bookmarkmanager.cpp
	src/gui/epgview.h
	src/gui/filebrowser.cpp
	src/gui/update.h
	src/gui/widget/buttons.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: 8f312e1d00
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
2017-02-12 23:50:14 +01:00
vanhofen
207c82fe2f Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: 7185b5b0da
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
2017-02-12 23:31:47 +01:00