Commit Graph

4361 Commits

Author SHA1 Message Date
Stefan Seyfried
cdcf9abf0f luainstance: export customcolor.h colors, too
Origin commit data
------------------
Branch: ni/coolstream
Commit: e2061907da
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-07 (Sun, 07 Apr 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-07 18:18:02 +02:00
Stefan Seyfried
92a2147efd fontrenderer: allow using customcolor.h colors for fonts
Origin commit data
------------------
Branch: ni/coolstream
Commit: 304c7e8daa
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-07 (Sun, 07 Apr 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-07 18:15:49 +02:00
Stefan Seyfried
cc70fcc214 audioplayer: don't free curl_handle too early
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4a1cb03e82
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-07 (Sun, 07 Apr 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-07 17:57:58 +02:00
Stefan Seyfried
f57ea583f1 remove obsoleted framebuffer_spark.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6605e928be
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-07 (Sun, 07 Apr 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-07 17:37:23 +02:00
Stefan Seyfried
786d671484 test_menu: fix path to demo picture
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6cabfb0a71
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-07 (Sun, 07 Apr 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-07 17:26:53 +02:00
Stefan Seyfried
a4256366ef mp3dec: recover from PCM write errors without crashing
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0b9156b309
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-07 (Sun, 07 Apr 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-07 17:20:42 +02:00
Stefan Seyfried
ab0df69c4c cc_frm: fix invalid cast
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8d8ce4c55a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-06 22:20:58 +02:00
Stefan Seyfried
17098886d4 nhttpd: fix streaming with non-standard port
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2ba024168d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-06 22:20:47 +02:00
Stefan Seyfried
16e7b8bb91 CChannelList: fix "prev bouquet" if empty bouquets are present
also do proper wrap-around when selecting previous / next bouquet


Origin commit data
------------------
Branch: ni/coolstream
Commit: 80e7f9753b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)



------------------
This commit was generated by Migit
2013-04-06 22:14:06 +02:00
Jacek Jendrzej
ee338d72e9 revert commit c4b67751af
Origin commit data
------------------
Branch: ni/coolstream
Commit: e0facfa2e0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-06 (Sat, 06 Apr 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-06 22:13:47 +02:00
Stefan Seyfried
96c33bdc8a luainstance: work around a signed/unsigned problem on ppc
Origin commit data
------------------
Branch: ni/coolstream
Commit: 28890886fc
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-06 19:06:46 +02:00
Stefan Seyfried
90b3e8afce fontrenderer: use background color of framebuffer
Origin commit data
------------------
Branch: ni/coolstream
Commit: 454a80f3ac
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-06 17:47:06 +02:00
Stefan Seyfried
a939819a74 CScanTs: silence valgrind
Origin commit data
------------------
Branch: ni/coolstream
Commit: 351f47c3a0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-06 16:59:39 +02:00
Stefan Seyfried
55c72869e3 CScanTs: add destructor to avoid leaks
Origin commit data
------------------
Branch: ni/coolstream
Commit: 14783a7581
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-06 16:59:13 +02:00
Stefan Seyfried
a045a6690c CScanTs: revert to pu/cc code
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2ed1f7eee2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-06 16:58:19 +02:00
Michael Liebmann
9c0586ffb7 Supplement to commit 81953e4...
- epgview: Fix colors in progress bar


Origin commit data
------------------
Branch: ni/coolstream
Commit: d4740238dd
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-04-06 (Sat, 06 Apr 2013)

Origin message was:
------------------
* Supplement to commit 81953e4...

- epgview: Fix colors in progress bar


------------------
This commit was generated by Migit
2013-04-06 15:18:12 +01:00
Stefan Seyfried
5c2edbab9a osd_setup: bring progressbar locales closer to mainline
Origin commit data
------------------
Branch: ni/coolstream
Commit: 899fcaf8ca
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-06 15:20:46 +02:00
Stefan Seyfried
2c192a4947 fix build / progressbar setup after pu/cc merge
* CProgressBar::PB_MONO is no longer available
* PB color setup is split over two configuration variables
Fix this while still keeping seamless update compatibility.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6a955ecef0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)



------------------
This commit was generated by Migit
2013-04-06 14:41:06 +02:00
Stefan Seyfried
ab5760e4de Merge branch 'check/pu-cc' into master
...needs some build- and logical fixing...

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/volume.cpp
	src/gui/eventlist.cpp
	src/gui/moviebrowser.cpp
	src/gui/scan.cpp
	src/gui/timeosd.cpp
	src/gui/widget/progressbar.cpp
	src/gui/widget/progressbar.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8b689f4b26
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)



------------------
This commit was generated by Migit
2013-04-06 14:28:16 +02:00
Stefan Seyfried
1589230f2e Revert "src/gui/channellist.cpp: fix to 06ac21d495 if more bouquets empty"
This reverts commit c4b67751af.

a better solution without duplicating code is available


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8ba673497e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)



------------------
This commit was generated by Migit
2013-04-06 13:33:29 +02:00
Stefan Seyfried
5bba845cac CChannelList: fix "prev bouquet" if empty bouquets are present
also do proper wrap-around when selecting previous / next bouquet


Origin commit data
------------------
Branch: ni/coolstream
Commit: 21cb7fc249
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)



------------------
This commit was generated by Migit
2013-04-06 13:15:40 +02:00
Stefan Seyfried
0e601477cb cc_frm: fix invalid cast
Origin commit data
------------------
Branch: ni/coolstream
Commit: 37d70cd345
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-06 12:28:18 +02:00
Stefan Seyfried
ad9e5c5d4f luainstance: allow any color for PaintBox, disable debug
Origin commit data
------------------
Branch: ni/coolstream
Commit: a6cf7313d5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-06 12:26:24 +02:00
Stefan Seyfried
501191309b glthread: add power button
Origin commit data
------------------
Branch: ni/coolstream
Commit: 237ab8f9c7
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-06 12:11:26 +02:00
Stefan Seyfried
bc4139514e glthread: blit OSD manually
to help debugging of framebuffer issues, only blit the openGL
framebuffer after an explicit blit() call


Origin commit data
------------------
Branch: ni/coolstream
Commit: 843e9f395a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)



------------------
This commit was generated by Migit
2013-04-06 12:06:18 +02:00
Stefan Seyfried
0b706c2b8d nhttpd: fix streaming with non-standard port
Origin commit data
------------------
Branch: ni/coolstream
Commit: 069bf46578
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-06 11:49:47 +02:00
Stefan Seyfried
8a72a5510e test_menu: disable
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7a9b744a22
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-06 11:47:08 +02:00
Stefan Seyfried
5e4ce9bfb5 test_menu: fix build
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4d2f580af0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-06 11:46:50 +02:00
Stefan Seyfried
4e6045f3a6 acinclude: workaround for packages with empty FOO_CFLAGS
should probably be fixed differently but works for now ;-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: b46a806cb9
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)



------------------
This commit was generated by Migit
2013-04-06 11:38:17 +02:00
Stefan Seyfried
4eeb5586dc imageinfo: remove reference to removed frameBuffer pointer
Origin commit data
------------------
Branch: ni/coolstream
Commit: d88ba86e90
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-06 11:32:30 +02:00
Stefan Seyfried
a844812b8b framebuffer_ng: add getScreen*Rel() functions
Origin commit data
------------------
Branch: ni/coolstream
Commit: 575c7c1da3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-06 11:29:27 +02:00
Stefan Seyfried
7254e280e3 Merge branch 'check/pu-cc' into master
needs buildfixing...

Conflicts:
	data/Makefile.am
	src/driver/framebuffer.h
	src/driver/volume.cpp
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/filebrowser.cpp
	src/gui/imageinfo.cpp
	src/gui/infoviewer.cpp
	src/gui/streaminfo2.cpp
	src/gui/widget/textbox.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ad0b6b6dc
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)



------------------
This commit was generated by Migit
2013-04-06 11:21:55 +02:00
Thilo Graf
293b756560 CChannellist: add missig frame for timscale
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6fa592323b
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-06 10:21:22 +02:00
Thilo Graf
e32f62315e CComponentsInfoBox: move statement for check of image name
Ensure empty pic object otherwise it can be retained on exit
of paintPicture(), if an instance of Infobox already exists.

supplement to e575e91329


Origin commit data
------------------
Branch: ni/coolstream
Commit: d7ce847471
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)



------------------
This commit was generated by Migit
2013-04-06 08:49:16 +02:00
Thilo Graf
307a8675b6 Progressbars: use default frame thickness
It's unnecessary overhead to set the value everywhere, except it's needed.


Origin commit data
------------------
Branch: ni/coolstream
Commit: f70a30defa
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-05 (Fri, 05 Apr 2013)



------------------
This commit was generated by Migit
2013-04-06 08:33:51 +02:00
Thilo Graf
e6a024d11e CProgressBar: remove wrong intital value for frame thickness
Default value is 0, and should remain as specified in the base class.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 210ae1491d
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-05 (Fri, 05 Apr 2013)



------------------
This commit was generated by Migit
2013-04-06 08:33:51 +02:00
Michael Liebmann
81953e4bb6 Fix order of colors for some progress bars
Origin commit data
------------------
Branch: ni/coolstream
Commit: adfbfe079c
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-04-05 (Fri, 05 Apr 2013)

Origin message was:
------------------
* Fix order of colors for some progress bars

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-05 19:43:50 +01:00
Michael Liebmann
bfab2c1259 CComponentsPicture: initVarPicture() not execute if pic_name is blank
Origin commit data
------------------
Branch: ni/coolstream
Commit: bd47ef2060
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-04-04 (Thu, 04 Apr 2013)

Origin message was:
------------------
* CComponentsPicture: initVarPicture() not execute if pic_name is blank

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-04 16:10:15 +01:00
Michael Liebmann
e575e91329 CComponentsInfoBox: CComponentsPicture not create when no image to draw
Origin commit data
------------------
Branch: ni/coolstream
Commit: 095c0e1b04
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-04-04 (Thu, 04 Apr 2013)

Origin message was:
------------------
* CComponentsInfoBox: CComponentsPicture not create when no image to draw

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-04 16:10:15 +01:00
vanhofen
647363ca60 infoviewer: remove frame from timescale inside infoviewer
Origin commit data
------------------
Branch: ni/coolstream
Commit: 85ab392a09
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-04-04 (Thu, 04 Apr 2013)

Origin message was:
------------------
- infoviewer: remove frame from timescale inside infoviewer

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-04 14:41:13 +02:00
Jacek Jendrzej
db0b328b0d CComponents: don't paint the same box with different colors as background
Origin commit data
------------------
Branch: ni/coolstream
Commit: d18217effb
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-04 (Thu, 04 Apr 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-04 12:19:31 +02:00
Michael Liebmann
c8f7b45b26 CNeutrinoEventList: Fix flicker when page is changed
Origin commit data
------------------
Branch: ni/coolstream
Commit: a841aa3790
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-04-03 (Wed, 03 Apr 2013)

Origin message was:
------------------
* CNeutrinoEventList: Fix flicker when page is changed

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-04 10:11:49 +01:00
Thilo Graf
2a5b1a990c CComponentsInfoBox: prevent background paint in infobox
Background for text is not needed here


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4e7f81a126
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-04 (Thu, 04 Apr 2013)



------------------
This commit was generated by Migit
2013-04-04 09:56:53 +02:00
Thilo Graf
8611d5da33 CComponentsText: add member to control background paint on textbox objects
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3a4543b8d2
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-04 (Thu, 04 Apr 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-04 09:56:53 +02:00
Thilo Graf
44a252bd16 CNeutrinoEventList: use CComponentsText instead CComponentsInfoBox
add doPaintBg(false), causes no paint or repaint and save of item
background.

CC-Items comes with its own hide(), but it's not very sensefull
to store or paint background here.

NOTE: CComponentsText is more of appropriate for embedded text items
than CComponentsInfoBox. CComponentsInfoBox is more made for hint or
messageboxes.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 399dbad350
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-03 (Wed, 03 Apr 2013)



------------------
This commit was generated by Migit
2013-04-04 09:56:52 +02:00
Thilo Graf
e3bbb74793 CComponentsText: paint always background before painting text
Ensures erase of old text, usefully to avoid often
repaints of embedded textbox objects or text items


Origin commit data
------------------
Branch: ni/coolstream
Commit: e23b03fde9
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-03 (Wed, 03 Apr 2013)



------------------
This commit was generated by Migit
2013-04-04 09:56:52 +02:00
Thilo Graf
4ef600f654 CComponents: disable debug spam
Origin commit data
------------------
Branch: ni/coolstream
Commit: bdbea07e71
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-01 (Mon, 01 Apr 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-04 09:56:52 +02:00
Thilo Graf
908070b1b9 CNeutrinoEventList: remove include of textbox.h
Is already included by cc.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5cd01b8cc8
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-01 (Mon, 01 Apr 2013)



------------------
This commit was generated by Migit
2013-04-04 09:56:51 +02:00
Thilo Graf
f7f29b6c45 CTimeOsd: remove unused var timescale
Origin commit data
------------------
Branch: ni/coolstream
Commit: c4d9f76b6b
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-01 (Mon, 01 Apr 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-04 09:56:51 +02:00
Thilo Graf
71248e0dc7 CComponents: add progressbar class to cc-items
CProgressbar moved into components sub directory and adapt includes.
Progressbar objects are now usable as cc-item

TODO:
-some color and size corrections
-found some dub codes for sig and snr-bars, needs rework


Origin commit data
------------------
Branch: ni/coolstream
Commit: 860be9a412
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-01 (Mon, 01 Apr 2013)



------------------
This commit was generated by Migit
2013-04-02 09:31:05 +02:00