Commit Graph

762 Commits

Author SHA1 Message Date
Stefan Seyfried
345a8a274d Merge branch 'uncool/dvbsi++' commit '890b4f2c0a3'
...needs buildfixing...

Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	lib/libtuxtxt/tuxtxt.h
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/record.cpp
	src/driver/volume.cpp
	src/gui/audio_setup.cpp
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/infoviewer.cpp
	src/gui/keybind_setup.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/system/Makefile.am
	src/system/configure_network.cpp
	src/system/httptool.cpp
	src/system/setting_helpers.cpp
	src/timerd/timermanager.cpp
	src/zapit/include/zapit/frontend_c.h
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: adb23b23ee
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-14 (Sun, 14 Oct 2012)
2012-10-14 12:51:07 +02:00
[CST] Bas
8965dc519f Merge branch 'neutrino-apollo' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo
Conflicts:
	src/timerd/timermanager.cpp


Origin commit data
------------------
Commit: a222240dbb
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-09-26 (Wed, 26 Sep 2012)
2012-09-26 17:52:47 +08:00
[CST] Focus
68c88f51fd lib/libcoolstream/record_cs.h: update header
Origin commit data
------------------
Commit: 70836baa48
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-09-25 (Tue, 25 Sep 2012)
2012-09-25 17:13:43 +04:00
[CST] Bas
8b523be32e Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo
Origin commit data
------------------
Commit: fbc512889f
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-09-24 (Mon, 24 Sep 2012)
2012-09-24 15:28:48 +08:00
Stefan Seyfried
0e99d7bb9b neutrino: start to use hardware_caps
Use hardware_caps instead of cs_get_revision() and #ifdef HAVE_FOO_HW
to distinguish between different boxtypes.


Origin commit data
------------------
Commit: 04ee2e87f3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-09-23 (Sun, 23 Sep 2012)
2012-09-23 21:34:47 +02:00
[CST] Focus
6b6d864e27 Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++
Origin commit data
------------------
Commit: 9fdbdbd343
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-09-13 (Thu, 13 Sep 2012)
2012-09-13 11:24:13 +04:00
Jacek Jendrzej
9868a4308b remove doubles include
Origin commit data
------------------
Commit: a3bfab0bcd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-09-11 (Tue, 11 Sep 2012)
2012-09-11 20:31:33 +02:00
[CST] Focus
fe9407b2f0 Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++
Origin commit data
------------------
Commit: 70e8c5d13a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-09-10 (Mon, 10 Sep 2012)
2012-09-10 15:25:20 +04:00
[CST] Bas
eedca08625 Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo
Origin commit data
------------------
Commit: 688f464bb6
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-09-10 (Mon, 10 Sep 2012)
2012-09-10 07:39:30 +08:00
vanhofen
df315c7b0f tuxtxt: fix creation of /var/tuxbox/config/tuxtxt/
Origin commit data
------------------
Commit: 1e1a3265e6
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-09-05 (Wed, 05 Sep 2012)

Origin message was:
------------------
- tuxtxt: fix creation of /var/tuxbox/config/tuxtxt/
2012-09-05 23:42:10 +02:00
[CST] Focus
8549fc8e32 lib/sectionsdclient/sectionsdclient.cpp,h: comment unused
Origin commit data
------------------
Commit: 6eaa28449b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-08-30 (Thu, 30 Aug 2012)
2012-08-30 15:55:32 +04:00
[CST] Focus
cd2a68aa90 lib/sectionsdclient/sectionsdMsg.h: cleanup commands, comment unused
Origin commit data
------------------
Commit: a391bf3237
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-08-30 (Thu, 30 Aug 2012)
2012-08-30 15:54:49 +04:00
Jacek Jendrzej
e8d09336e4 tuxtxt.h: remove unnecessary header
Origin commit data
------------------
Commit: 9a889e1496
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-08-21 (Tue, 21 Aug 2012)
2012-08-21 14:06:18 +02:00
[CST] Focus
179b0a02e1 lib/libnet/libnet.c: fix unused variable warning
Origin commit data
------------------
Commit: c5f4c53fb7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-08-04 (Sat, 04 Aug 2012)
2012-08-04 14:14:08 +04:00
Jacek Jendrzej
41e57ce7bc comment out never used
Origin commit data
------------------
Commit: 9124c20f31
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-08-04 (Sat, 04 Aug 2012)
2012-08-04 10:03:19 +02:00
[CST] Focus
68773d8e37 recording: testing support for multi-record of the same channel, new libs required
Origin commit data
------------------
Commit: f8aa4262cb
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-08-03 (Fri, 03 Aug 2012)
2012-08-03 20:00:04 +04:00
Stefan Seyfried
f8a42bcc53 Merge branch 'uncool/dvbsi++' commit '9578e5da35f'
This is the last commit before the "menu hints" started.
Needs buildfixing...

Conflicts:
	configure.ac
	src/daemonc/remotecontrol.cpp
	src/daemonc/remotecontrol.h
	src/driver/audiodec/basedec.cpp
	src/driver/fb_window.cpp
	src/driver/rcinput.cpp
	src/driver/volume.cpp
	src/global.h
	src/gui/channellist.cpp
	src/gui/eventlist.cpp
	src/gui/infoviewer.cpp
	src/gui/keybind_setup.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/plugins.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/neutrino.cpp
	src/sectionsd/dmx.cpp
	src/sectionsd/dmxapi.cpp
	src/sectionsd/sectionsd.cpp
	src/system/setting_helpers.cpp
	src/zapit/include/zapit/client/zapittypes.h
	src/zapit/include/zapit/frontend_c.h
	src/zapit/include/zapit/satconfig.h
	src/zapit/include/zapit/scan.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/pmt.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/sdt.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: ae1b98aa38
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-07-22 (Sun, 22 Jul 2012)
2012-07-23 01:02:29 +02:00
Stefan Seyfried
f3b8e37cbb tuxtxt: avoid spurious deadlocks on startup
Origin commit data
------------------
Commit: ad7c88379a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-07-15 (Sun, 15 Jul 2012)
2012-07-15 13:28:17 +02:00
Stefan Seyfried
fad861b271 tuxtxt: make sure that startpage is initialized
when enabling tuxtxt caching, saving settings and then
starting tuxtxt, the start page was not initialized


Origin commit data
------------------
Commit: cb36c6e712
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-07-15 (Sun, 15 Jul 2012)
2012-07-15 13:23:52 +02:00
Stefan Seyfried
b3577833ef tuxtxt: fix race condition in tuxtxt_clear_cache()
tuxtxt_cache_lock does not prevent from calling tuxtxt_clear_cache
while the cache thread is in the middle of inserting pages, thus
leading to a hard-to-reproduce crash when trying to start up tuxtxt.
The simplest fix is to use an additional "big hammer" lock arond
the whole critical area. Since tuxtxt_clear_cache is only called
very seldom, there should be no lock contention problem.


Origin commit data
------------------
Commit: 9af56e1852
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-07-15 (Sun, 15 Jul 2012)
2012-07-15 13:19:44 +02:00
Jacek Jendrzej
55216499fa fix gcc 4.7.x warnings
Origin commit data
------------------
Commit: df2ab71978
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-07-09 (Mon, 09 Jul 2012)
2012-07-09 09:26:37 +02:00
[CST] Bas
2ced7346c2 neutrino-apollo: changes for apollo uclibc.
Origin commit data
------------------
Commit: cf878686ba
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-07-09 (Mon, 09 Jul 2012)
2012-07-09 11:58:15 +08:00
Jacek Jendrzej
803674f9df fix gcc 4.7.x warnings
Origin commit data
------------------
Commit: 060c1c45b2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-07-07 (Sat, 07 Jul 2012)
2012-07-07 13:09:08 +02:00
Stefan Seyfried
99895f0f41 neutrino: first preliminary support for AZbox ME
this is very experimental and depends on more fixes in
libstb-hal, but audio / video / OSD are basically working


Origin commit data
------------------
Commit: 2541edc918
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-06-18 (Mon, 18 Jun 2012)
2012-06-27 21:18:19 +02:00
[CST] Focus
453fa4459b Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++
Origin commit data
------------------
Commit: b15a335144
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-06-18 (Mon, 18 Jun 2012)
2012-06-18 20:04:58 +04:00
Jacek Jendrzej
62163fa4e5 use empty() instead of size()
Origin commit data
------------------
Commit: 7d8d995046
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-06-18 (Mon, 18 Jun 2012)

Origin message was:
------------------
 use empty() instead of size()
2012-06-18 16:57:44 +02:00
[CST] Focus
28bb3bbea1 remove obsolete lib/controldclient/
Origin commit data
------------------
Commit: 954dc274b4
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-06-14 (Thu, 14 Jun 2012)
2012-06-14 18:00:33 +04:00
[CST] Focus
2b88bb3b76 lib/xmltree/xmlparse.cpp: fix (workaround?) for crash while parsing invalid saved xml
Origin commit data
------------------
Commit: c8b4d271f9
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-05-14 (Mon, 14 May 2012)
2012-05-14 18:30:55 +04:00
Jacek Jendrzej
2ad1c141c6 initialize volues
Origin commit data
------------------
Commit: 489d88a9a2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-05-09 (Wed, 09 May 2012)
2012-05-09 17:33:34 +02:00
Jacek Jendrzej
e5c8bc86fc pedantic fixes
Origin commit data
------------------
Commit: e14fc80ed5
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-05-08 (Tue, 08 May 2012)

Origin message was:
------------------
-pedantic fixes
2012-05-08 18:59:11 +02:00
Jacek Jendrzej
04be37cf14 performance Prefer prefix ++/-- operators for non-primitive types.
Origin commit data
------------------
Commit: bb347b3a44
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-04-28 (Sat, 28 Apr 2012)
2012-04-28 10:56:27 +02:00
Michael Liebmann
c179cc8762 Add missing $(top_builddir) to Makefile.am
Origin commit data
------------------
Commit: f36ee26d87
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-04-22 (Sun, 22 Apr 2012)

Origin message was:
------------------
* Add missing $(top_builddir) to Makefile.am
2012-04-27 16:54:01 +01:00
[CST] Focus
7506dd067b lib/libcoolstream/ca_cs.h: sync header
Origin commit data
------------------
Commit: 20aaec4e1c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-04-26 (Thu, 26 Apr 2012)
2012-04-26 21:44:21 +04:00
[CST] Focus
9f20a20ebd lib/sectionsdclient/sectionsdcontrol.cpp: add --freemem command
Origin commit data
------------------
Commit: 92a12e408f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-04-25 (Wed, 25 Apr 2012)
2012-04-25 11:26:35 +04:00
Stefan Seyfried
82319bb253 spark: fix transparent icon blitting
no, the CFrameBuffer::blit2FB() API is *not* intuitive
(transp == true means: no transparency...)


Origin commit data
------------------
Commit: 20f20c8511
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-04-04 (Wed, 04 Apr 2012)
2012-04-17 19:33:59 +02:00
Stefan Seyfried
ddcd3618e0 dvbsub: fix unused-var compiler warnings
Origin commit data
------------------
Commit: 269cbbe512
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-04-01 (Sun, 01 Apr 2012)
2012-04-17 19:33:58 +02:00
Stefan Seyfried
feb418a9d1 tuxtxt: adapt to framebuffer blitting changes
Origin commit data
------------------
Commit: 33c5da3515
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-04-01 (Sun, 01 Apr 2012)
2012-04-17 19:33:58 +02:00
Stefan Seyfried
3dda6ee00f neutrino: adapt to the framebuffer_spark blitter change
basically add fb->blit() in every widget where necessary to
make sure the framebuffer is updated with current content


Origin commit data
------------------
Commit: a029333c1a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-04-01 (Sun, 01 Apr 2012)
2012-04-17 19:33:57 +02:00
Stefan Seyfried
d60586fded dvbsub: use the FB backbuffer on spark
Origin commit data
------------------
Commit: 40532a9d67
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-03-19 (Mon, 19 Mar 2012)
2012-04-17 19:33:56 +02:00
Stefan Seyfried
661290be0c dvbsub: ratelimit 'bad start code' messages
Origin commit data
------------------
Commit: 33a24a25f0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-03-17 (Sat, 17 Mar 2012)
2012-04-17 19:33:56 +02:00
Stefan Seyfried
26aa05084e dvbsub: use blitter to scale subtitles on spark
Origin commit data
------------------
Commit: 9509da25a7
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-03-14 (Wed, 14 Mar 2012)
2012-04-17 19:33:56 +02:00
Stefan Seyfried
63f4a7ebff dvbsub: fix scaling
Scale subtitles to full FB size, disregard OSD setup area. Reason: the
video decoder plane also does not consider OSD setup and subtitles
should align with video. Additionally, subtitles were too narrow.
TODO: what about letterboxed formats? Not handled yet.

Code is experimental, thus the original is #if 0'ed out only.


Origin commit data
------------------
Commit: b6eb045c9b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-03-14 (Wed, 14 Mar 2012)
2012-04-17 19:33:55 +02:00
Stefan Seyfried
2a88adef61 dvbsub: do not clear subtitles more than once
Origin commit data
------------------
Commit: 7f10c6673e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-03-14 (Wed, 14 Mar 2012)
2012-04-17 19:33:55 +02:00
Stefan Seyfried
72ab1186f1 tuxtxt: fix display with scaling FB, use hw accel if available
* Use a separate framebuffer and backbuffer on SPARK (the framebuffer
 is not big enough to have both buffers in it).
* make tuxtxt work correctly with scaling FB (1080 full-HD modes)
* improve performance by using the blitter to copy from back- to frame
 buffer if available (spark)


Origin commit data
------------------
Commit: 99952cb9d7
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-03-11 (Sun, 11 Mar 2012)

Origin message was:
------------------
tuxtxt: fix display with scaling FB, use hw accel if available

* Use a separate framebuffer and backbuffer on SPARK (the framebuffer
 is not big enough to have both buffers in it).
* make tuxtxt work correctly with scaling FB (1080 full-HD modes)
* improve performance by using the blitter to copy from back- to frame
 buffer if available (spark)
2012-04-17 19:33:55 +02:00
Stefan Seyfried
f4ca017923 libneutrino-hal is now libstb-hal
Origin commit data
------------------
Commit: 6f5e4238cc
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-02-11 (Sat, 11 Feb 2012)
2012-04-17 19:33:52 +02:00
Stefan Seyfried
9dc131a232 enable usage of a separately built replacement of libtriple
In order to improve portability, libtriple will be split off and
built separately as "libneutrino-hal" (for hardware abstraction layer)
Enable the makefiles to deal with that.


Origin commit data
------------------
Commit: c8a561244e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-02-03 (Fri, 03 Feb 2012)
2012-04-17 19:33:52 +02:00
Stefan Seyfried
ac9549bf68 libtriple: improve and shorten cDemux debug messages
Origin commit data
------------------
Commit: 8e7fc69a0b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-01-22 (Sun, 22 Jan 2012)
2012-04-17 19:33:52 +02:00
Stefan Seyfried
0b44b23d12 libtriple: use AVS mute to avoid audio pop during boot
Origin commit data
------------------
Commit: 74ad2edc8c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-01-22 (Sun, 22 Jan 2012)
2012-04-17 19:33:52 +02:00
Stefan Seyfried
061ff99bf9 libtriple: improve cPlayback performance
avoid unnecessary memcpy in read_mpeg(), significantly improving performance


Origin commit data
------------------
Commit: 35b07cd355
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-01-15 (Sun, 15 Jan 2012)
2012-04-17 19:33:51 +02:00
Stefan Seyfried
e6e6a19405 libtriple: add video parameter watchdog
Add the video parameter watchdog to the (already existing) input
thread, so we can remove it from zapit.
Unfortunately, we need an ugly hack in cDemux for making sure we
do not crash on exit... :-(


Origin commit data
------------------
Commit: a18737ffde
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-01-14 (Sat, 14 Jan 2012)
2012-04-17 19:33:51 +02:00