Commit Graph

479 Commits

Author SHA1 Message Date
Thilo Graf
142041acd2 CInfoViewer: allign vizualized record mode icon
Origin commit data
------------------
Branch: ni/coolstream
Commit: 163df1f149
Author: Thilo Graf <dbt@novatux.de>
Date: 2018-01-03 (Wed, 03 Jan 2018)


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

------------------
This commit was generated by Migit
2018-01-03 22:35:01 +01:00
vanhofen
cfa5aa6414 infoicons: avoid extern CInfoIcons; use getInstance() instead of this
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5a34b06137
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-03 (Wed, 03 Jan 2018)

Origin message was:
------------------
- infoicons: avoid extern CInfoIcons; use getInstance() instead of this

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

------------------
This commit was generated by Migit
2018-01-03 10:49:50 +01:00
Stefan Seyfried
db32ea5437 infoviewer: use all free space for epg title
this should also avoid display artifacts due to runtime
changes in size of running time display


Origin commit data
------------------
Branch: ni/coolstream
Commit: b4a3cf14c1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-12-26 (Tue, 26 Dec 2017)



------------------
This commit was generated by Migit
2017-12-26 22:58:36 +01:00
Stefan Seyfried
e016bd1e7f infoviewer: revert useless big box for running time
The box is two times too big, truncating long EPG titles.


Origin commit data
------------------
Branch: ni/coolstream
Commit: fe494a6814
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-12-26 (Tue, 26 Dec 2017)



------------------
This commit was generated by Migit
2017-12-26 22:58:36 +01:00
vanhofen
1e6e9e9e76 infoviewer_bb: small renamings to get more logic in function names
showOne_CAIcon() => showIcon_CA()
paint_ca_icons() => paint_ca_icon()
showIcon_CA_Status() => paint_ca_icons()


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9389e78318
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-13 (Wed, 13 Dec 2017)

Origin message was:
------------------
- infoviewer_bb: small renamings to get more logic in function names

showOne_CAIcon()   => showIcon_CA()
paint_ca_icons()   => paint_ca_icon()
showIcon_CA_Status() => paint_ca_icons()


------------------
This commit was generated by Migit
2017-12-13 09:39:12 +01:00
vanhofen
f7b1c91039 infoviewer: avoid display of radiotext icon in virtual zap mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: a38e827010
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-30 (Thu, 30 Nov 2017)

Origin message was:
------------------
- infoviewer: avoid display of radiotext icon in virtual zap mode

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

------------------
This commit was generated by Migit
2017-11-30 10:55:14 +01:00
vanhofen
d81844d8ee infoviewer: cleanup from some unused code
Origin commit data
------------------
Branch: ni/coolstream
Commit: d039017aa7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-30 (Thu, 30 Nov 2017)

Origin message was:
------------------
- infoviewer: cleanup from some unused code

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

------------------
This commit was generated by Migit
2017-11-30 10:55:14 +01:00
vanhofen
0c71cc489f infoviewer: rework radiotext element; ...
use OFFSET defines, larger font, fix header width


Origin commit data
------------------
Branch: ni/coolstream
Commit: 79fcd2154a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)

Origin message was:
------------------
- infoviewer: rework radiotext element; ...

use OFFSET defines, larger font, fix header width


------------------
This commit was generated by Migit
2017-11-27 23:18:14 +01:00
vanhofen
6dcd5baf4c radiotext: cleanup from tons of unused code; rass is dead
Origin commit data
------------------
Branch: ni/coolstream
Commit: e8bb447fcf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)

Origin message was:
------------------
- radiotext: cleanup from tons of unused code; rass is dead

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

------------------
This commit was generated by Migit
2017-11-27 16:47:50 +01:00
vanhofen
476ce63d99 neutrino: unify modes handling; ...
remove double enum from CNeutrinoApp and move mostly used enum from NeutrinoMessages to new NeutrinoModes


Origin commit data
------------------
Branch: ni/coolstream
Commit: 028ec3cf3c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-20 (Mon, 20 Nov 2017)

Origin message was:
------------------
- neutrino: unify modes handling; ...

remove double enum from CNeutrinoApp and move mostly used enum from NeutrinoMessages to new NeutrinoModes


------------------
This commit was generated by Migit
2017-11-20 15:19:06 +01:00
vanhofen
5a0db3bfc0 infoviewer: fix radiotext icon for webradio
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7a5bce792e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-09 (Thu, 09 Nov 2017)

Origin message was:
------------------
- infoviewer: fix radiotext icon for webradio

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

------------------
This commit was generated by Migit
2017-11-09 23:00:37 +01:00
TangoCash
efa517c6f9 infoviewer: fix FIXME comment in c3415790b1
Origin commit data
------------------
Branch: ni/coolstream
Commit: 91a033dfb0
Author: TangoCash <eric@loxat.de>
Date: 2017-11-07 (Tue, 07 Nov 2017)

Origin message was:
------------------
- infoviewer: fix FIXME comment in c3415790b1

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

------------------
This commit was generated by Migit
2017-11-07 16:52:46 +01:00
vanhofen
c3415790b1 infoviewer: try to get meta data from stream when epg is empty
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9b34075224
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-05 (Sun, 05 Nov 2017)

Origin message was:
------------------
- infoviewer: try to get meta data from stream when epg is empty

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

------------------
This commit was generated by Migit
2017-11-05 01:30:16 +01:00
vanhofen
8ad941a51b infoviewer: try to fix showLivestreamInfo() for audiostreams
Origin commit data
------------------
Branch: ni/coolstream
Commit: c56753c8e8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-04 (Sat, 04 Nov 2017)

Origin message was:
------------------
- infoviewer: try to fix showLivestreamInfo() for audiostreams

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

------------------
This commit was generated by Migit
2017-11-04 13:54:45 +01:00
vanhofen
e2534c6ff7 infoviewer: fix timeout for new mode_webradio
Origin commit data
------------------
Branch: ni/coolstream
Commit: ec3400f37d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- infoviewer: fix timeout for new mode_webradio

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

------------------
This commit was generated by Migit
2017-11-03 09:36:20 +01:00
vanhofen
52a5d800a4 rename IS_WEBTV => IS_WEBCHAN
Origin commit data
------------------
Branch: ni/coolstream
Commit: ebcd15da41
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- rename IS_WEBTV => IS_WEBCHAN

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

------------------
This commit was generated by Migit
2017-11-03 09:36:19 +01:00
vanhofen
66784d42af add webradio; first steps
Origin commit data
------------------
Branch: ni/coolstream
Commit: a8b0fee599
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- add webradio; first steps

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

------------------
This commit was generated by Migit
2017-11-03 09:36:19 +01:00
vanhofen
05ca99601a movieplayer: align some variables names to tango's names
Origin commit data
------------------
Branch: ni/coolstream
Commit: 28fbb16cf9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-30 (Mon, 30 Oct 2017)

Origin message was:
------------------
- movieplayer: align some variables names to tango's names

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

------------------
This commit was generated by Migit
2017-10-30 01:44:01 +01:00
vanhofen
9a4871dea1 multiformat audioplayer: add separate timeout for infobar
Origin commit data
------------------
Branch: ni/coolstream
Commit: f945a9b127
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-28 (Sat, 28 Oct 2017)

Origin message was:
------------------
- multiformat audioplayer: add separate timeout for infobar

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

------------------
This commit was generated by Migit
2017-10-28 19:13:46 +02:00
vanhofen
a3487eb052 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1e8fde7b21
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-02 23:56:34 +02:00
vanhofen
14f45c39b2 fix build
Origin commit data
------------------
Branch: ni/coolstream
Commit: df6bc99337
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)

Origin message was:
------------------
- fix build

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

------------------
This commit was generated by Migit
2017-10-02 23:55:51 +02:00
vanhofen
0a0c8a13bf Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/hdd_menu.cpp
	src/gui/hdd_menu.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 73418490bc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)



------------------
This commit was generated by Migit
2017-10-02 23:21:37 +02:00
vanhofen
463700033b Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/dboxinfo.cpp
	src/gui/infoviewer_bb.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9e8dd73320
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)



------------------
This commit was generated by Migit
2017-10-02 23:19:49 +02:00
Stefan Seyfried
ef71d00d7f remove "using namespace std" from header files
"using namespace std" in headers is considered bad practice, so move it
either into the respective cpp files or (for files which have lots of
other std::xxx usage anyway) just write it out explicitly.
Looking at the headers and the affected cpp files, one can actually see
why it is bad practice, as it's spreading very far ;-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0d9139054a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-10-01 (Sun, 01 Oct 2017)



------------------
This commit was generated by Migit
2017-10-02 13:43:57 +02:00
vanhofen
3df3b9eafe rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now
Origin commit data
------------------
Branch: ni/coolstream
Commit: 99cc7f850a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-29 (Fri, 29 Sep 2017)

Origin message was:
------------------
- rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now

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

------------------
This commit was generated by Migit
2017-09-29 10:34:23 +02:00
vanhofen
c75a12894f Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/driver/rcinput.cpp
	src/driver/volume.cpp
	src/gui/bookmarkmanager.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 537ea51fcf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-29 (Fri, 29 Sep 2017)



------------------
This commit was generated by Migit
2017-09-29 08:35:05 +02:00
vanhofen
369436124b rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now
Origin commit data
------------------
Branch: ni/coolstream
Commit: ebc621f3b2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-29 (Fri, 29 Sep 2017)

Origin message was:
------------------
- rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now

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

------------------
This commit was generated by Migit
2017-09-29 08:27:42 +02:00
vanhofen
3aa6bf25d9 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2b7afc5b38
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-21 (Thu, 21 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-21 10:33:00 +02:00
vanhofen
bdbe2f5ab8 add and use FRAME_WIDTH defines; ...
replace other fixed frame widths with OFFSET defines

Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6ee3e54741
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-20 (Wed, 20 Sep 2017)

Origin message was:
------------------
- add and use FRAME_WIDTH defines; ...

replace other fixed frame widths with OFFSET defines

Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2017-09-20 21:29:53 +02:00
vanhofen
daf4480f61 add and use FRAME_WIDTH defines; ...
replace other fixed frame widths with OFFSET defines


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6d58a3b1c9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-20 (Wed, 20 Sep 2017)

Origin message was:
------------------
- add and use FRAME_WIDTH defines; ...

replace other fixed frame widths with OFFSET defines


------------------
This commit was generated by Migit
2017-09-20 13:46:31 +02:00
vanhofen
4198cb9a35 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3c35e98212
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-25 (Fri, 25 Aug 2017)



------------------
This commit was generated by Migit
2017-08-25 14:15:22 +02:00
vanhofen
79c24b3173 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 470a8b62dd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-23 (Wed, 23 Aug 2017)



------------------
This commit was generated by Migit
2017-08-23 15:24:38 +02:00
Jacek Jendrzej
d7856dc0ce some inits and never read var
Origin commit data
------------------
Branch: ni/coolstream
Commit: ba600f0e5c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-23 (Wed, 23 Aug 2017)


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

------------------
This commit was generated by Migit
2017-08-23 12:58:26 +02:00
Jacek Jendrzej
c592fe60d6 some inits warnings
Origin commit data
------------------
Branch: ni/coolstream
Commit: c99486520e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-21 (Mon, 21 Aug 2017)


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

------------------
This commit was generated by Migit
2017-08-21 14:42:24 +02:00
vanhofen
e739f3746e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 27252ecee5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-12 (Sat, 12 Aug 2017)


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

------------------
This commit was generated by Migit
2017-08-12 12:47:19 +02:00
Thilo Graf
cc78c40678 Revert "infoviewer.cpp: handle timeout of mode upnp like mode ts"
This reverts commit 6f7b583b59.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 40fee47523
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-12 (Sat, 12 Aug 2017)



------------------
This commit was generated by Migit
2017-08-12 11:27:55 +02:00
gixxpunk
360b6e9ec8 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3cb9902e7d
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-08-11 (Fri, 11 Aug 2017)


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

------------------
This commit was generated by Migit
2017-08-11 21:24:04 +02:00
GetAway
6f7b583b59 infoviewer.cpp: handle timeout of mode upnp like mode ts
Signed-off-by: Thilo Graf <dbt@novatux.de>

Infobar timeout in the upnp mode is fixed to 6 sec.
Because it's acting about streams, so we should use the same timeout
such as with playing a movie file.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0225b043db
Author: GetAway <get-away@t-online.de>
Date: 2017-08-11 (Fri, 11 Aug 2017)



------------------
This commit was generated by Migit
2017-08-11 20:14:49 +02:00
vanhofen
6755871162 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: e78936e478
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-30 (Tue, 30 May 2017)


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

------------------
This commit was generated by Migit
2017-05-30 01:27:37 +02:00
vanhofen
425817151d infoviewer: use frameBuffer->getIconPath() to find clock_face icon
Origin commit data
------------------
Branch: ni/coolstream
Commit: f2ad0eac60
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-29 (Mon, 29 May 2017)

Origin message was:
------------------
- infoviewer: use frameBuffer->getIconPath() to find clock_face icon

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

------------------
This commit was generated by Migit
2017-05-29 16:30:39 +02:00
vanhofen
788e238750 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a14dfd8edd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-11 (Tue, 11 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-11 23:28:30 +02:00
vanhofen
6e6ffe3fce add missing //NI tags
Origin commit data
------------------
Branch: ni/coolstream
Commit: 880020cb54
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-11 (Tue, 11 Apr 2017)

Origin message was:
------------------
- add missing //NI tags

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

------------------
This commit was generated by Migit
2017-04-11 15:55:23 +02:00
vanhofen
3d3e8163b8 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6673ffd4ea
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-03 10:38:14 +01:00
Michael Liebmann
264bdc3a86 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6c3b5dcd93
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-02 (Thu, 02 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-02 23:38:19 +01:00
vanhofen
6fb38c77a5 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/update.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: cd96638c45
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)



------------------
This commit was generated by Migit
2017-03-01 18:18:07 +01:00
TangoCash
d10dda73e1 fix blinking clock in some modes (thx dbo)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 16537620a6
Author: TangoCash <eric@loxat.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-01 18:16:09 +01:00
vanhofen
5e5451332e Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/Makefile.am
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4a07c24174
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-28 (Tue, 28 Feb 2017)



------------------
This commit was generated by Migit
2017-02-28 16:55:39 +01:00
vanhofen
bf56f9f0bc Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/neutrino.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7829247fe8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-28 (Tue, 28 Feb 2017)



------------------
This commit was generated by Migit
2017-02-28 15:36:23 +01:00
Michael Liebmann
7329fb6294 CInfoViewer::showTitle: Add parameter forcePaintButtonBar
Origin commit data
------------------
Branch: ni/coolstream
Commit: cc05d272f2
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-28 (Tue, 28 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-28 15:04:09 +01:00
vanhofen
c80102a917 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	configure.ac
	src/driver/Makefile.am
	src/driver/framebuffer.h
	src/gui/bookmarkmanager.cpp
	src/gui/filebrowser.cpp
	src/gui/widget/buttons.cpp
	src/system/httptool.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: dd6244f33e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)



------------------
This commit was generated by Migit
2017-02-09 13:19:03 +01:00