Commit Graph

11482 Commits

Author SHA1 Message Date
vanhofen
faa10f0ed6 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/components/cc_frm_footer.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: c68ae57571
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)



------------------
This commit was generated by Migit
2017-06-15 11:07:32 +02:00
vanhofen
8b3c5e2fab cc_button_select.h: re-implement our color changes; ...
don't highlight frame of selected buttons


Origin commit data
------------------
Branch: ni/coolstream
Commit: bbdac94b32
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)

Origin message was:
------------------
- cc_button_select.h: re-implement our color changes; ...

don't highlight frame of selected buttons


------------------
This commit was generated by Migit
2017-06-15 11:01:45 +02:00
vanhofen
8e6aebc8d4 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/icons/headers/pictureviewer.png
	data/locale/english.locale
	src/global.h
	src/gui/components/cc_frm_footer.h
	src/gui/eventlist.cpp
	src/gui/pictureviewer.cpp
	src/gui/widget/icons.h
	src/gui/widget/menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: a8ef409ff6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)



------------------
This commit was generated by Migit
2017-06-15 10:37:41 +02:00
Thilo Graf
915d9f0676 CNeutrinoApp: add hook for neutrino start
Script will be executed on start of neutrino before. Handling is similar
like all other possible hooks, see global.h.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 78f1b294a9
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)



------------------
This commit was generated by Migit
2017-06-15 09:07:02 +02:00
Thilo Graf
ddee4406ca CCDraw: rework getScreen(), getScreenData(), add pixbuf checks
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5fda283a61
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-15 01:01:55 +02:00
Thilo Graf
b7aab60d37 CFileBrowser: add fallback for possible missing init directory
In some rare exceptional cases it is possible that wrong or missing
start directories could be defined.
Result: filebrowser window will be freezing, no key is helping.
With this fallback, filebrowser should jump into next existant upper
directory.


Origin commit data
------------------
Branch: ni/coolstream
Commit: ecc1f4860c
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)

Origin message was:
------------------
CFileBrowser: add fallback for possible missing init directory

In some rare exceptional cases it is possible that wrong or missing
start directories could be defined.
Result: filebrowser window will be freezing, no key is helping.
With this fallback, filebrowser should jump into next existant upper
directory.


------------------
This commit was generated by Migit
2017-06-15 01:01:55 +02:00
vanhofen
a287133576 epgplus: use getScrollBarData() function
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: aa4723173b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)

Origin message was:
------------------
- epgplus: use getScrollBarData() function

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


------------------
This commit was generated by Migit
2017-06-15 01:01:55 +02:00
vanhofen
7fdeb09671 pictureviewer: use getScrollBarData() function
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: cf44e1a974
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)

Origin message was:
------------------
- pictureviewer: use getScrollBarData() function

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


------------------
This commit was generated by Migit
2017-06-15 01:01:55 +02:00
vanhofen
995061d7f9 bouquetlist: use getScrollBarData() function
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4f32cf25e4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)

Origin message was:
------------------
- bouquetlist: use getScrollBarData() function

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


------------------
This commit was generated by Migit
2017-06-15 01:01:55 +02:00
vanhofen
59435af21a filebrowser: use getScrollBarData() function
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 28b3cc80df
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)

Origin message was:
------------------
- filebrowser: use getScrollBarData() function

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


------------------
This commit was generated by Migit
2017-06-15 01:01:55 +02:00
vanhofen
578791847e cc_frm_scrollbar: add getScrollBarData() function ...
to calculate total pages and current page for CComponentsScrollBar

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3e9e73cb3c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)

Origin message was:
------------------
- cc_frm_scrollbar: add getScrollBarData() function ...

to calculate total pages and current page for CComponentsScrollBar

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


------------------
This commit was generated by Migit
2017-06-15 01:01:55 +02:00
vanhofen
c7e763aa61 locale: minor changes in audioplayer's and pictureviewer's locales
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: ddb027a006
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)

Origin message was:
------------------
- locale: minor changes in audioplayer's and pictureviewer's locales

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


------------------
This commit was generated by Migit
2017-06-15 01:01:55 +02:00
vanhofen
c708c24454 pictureviewer: small design reworks ...
* use OFFSET defines
* use CComponentsScrollbar
* rename some variables

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1a2143c68b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)

Origin message was:
------------------
- pictureviewer: small design reworks ...

* use OFFSET defines
* use CComponentsScrollbar
* rename some variables

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


------------------
This commit was generated by Migit
2017-06-15 01:01:55 +02:00
vanhofen
fd52e89afb menue: replace last fixed values ...
... with OFFSET defines and scale2Res()-calculations

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

- removed TODO for height of hint calculation


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5c783a5c50
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)

Origin message was:
------------------
- menue: replace last fixed values ...

... with OFFSET defines and scale2Res()-calculations

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

- removed TODO for height of hint calculation


------------------
This commit was generated by Migit
2017-06-15 01:01:55 +02:00
vanhofen
750211ec99 settings.h: use CORNER_RADIUS_NONE defines ...
to determinate RADIUS defines

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: d7ce3dbf4c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)

Origin message was:
------------------
- settings.h: use CORNER_RADIUS_NONE defines ...

to determinate RADIUS defines

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


------------------
This commit was generated by Migit
2017-06-15 01:01:55 +02:00
vanhofen
72fa2bc871 test_menu: avoid usage of CORNER_RADIUS defines; use RADIUS instead
... because the RADIUS defines depends on user's corner settings

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1525719472
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)

Origin message was:
------------------
- test_menu: avoid usage of CORNER_RADIUS defines; use RADIUS instead

... because the RADIUS defines depends on user's corner settings

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


------------------
This commit was generated by Migit
2017-06-15 01:01:55 +02:00
Thilo Graf
90af43f37f icon: add missing pictureviewer icon
Origin commit data
------------------
Branch: ni/coolstream
Commit: d78e132ba2
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-15 01:01:55 +02:00
vanhofen
48b11b6a85 volumebar: use OFFSET defines; fix height of progressbar
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4dffefcc21
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)

Origin message was:
------------------
- volumebar: use OFFSET defines; fix height of progressbar

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


------------------
This commit was generated by Migit
2017-06-15 01:01:55 +02:00
vanhofen
9d69ed31b0 vfd-setup: fix brightness setup for CST's boxmodel "Link" ...
and hide the brightness menu for all "Trinity" models. There's no display.

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4295839526
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)

Origin message was:
------------------
- vfd-setup: fix brightness setup for CST's boxmodel "Link" ...

and hide the brightness menu for all "Trinity" models. There's no display.

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


------------------
This commit was generated by Migit
2017-06-15 01:01:55 +02:00
Thilo Graf
afcb78a5c4 CLuaInstCCText: try to fix return value of CCTextGetLines()
Init was missing.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5b12952d8b
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)



------------------
This commit was generated by Migit
2017-06-15 01:01:55 +02:00
Thilo Graf
73a84ad4fa CtextBox: Precise function getLines()
Use refreshTextLineArray() for calculation of lines.
Note: 	count of lines will be only returned if CTextBox object
	is initialized with a valid CBox instance,
	otherwise count of 0 lines will be returned!

also remove inline declaration, not needed here


Origin commit data
------------------
Branch: ni/coolstream
Commit: ec83549e50
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)



------------------
This commit was generated by Migit
2017-06-15 01:01:54 +02:00
Thilo Graf
46c3f4d348 CComponentsText: make initCCText()
Is more useful


Origin commit data
------------------
Branch: ni/coolstream
Commit: cdafe580be
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)



------------------
This commit was generated by Migit
2017-06-15 01:01:54 +02:00
Thilo Graf
42d6c768fc CEventList: Move channel name to left side
Center place is reserved for logo


Origin commit data
------------------
Branch: ni/coolstream
Commit: 14ea1c3a31
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)



------------------
This commit was generated by Migit
2017-06-15 01:01:54 +02:00
Thilo Graf
1e49b4ab61 FBFontRenderClass/CNeutrinoFonts: ensure reset of some instances
Only for safety.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 71d0c42a47
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)



------------------
This commit was generated by Migit
2017-06-15 01:01:54 +02:00
Thilo Graf
e3bd6e917d CProgressBarCache: ensure clean iterator inside pbcClear()
For safety only.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5573d17cce
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)



------------------
This commit was generated by Migit
2017-06-15 01:01:54 +02:00
Thilo Graf
a652c229aa CComponentsFrmClock: ensure clean timer instance
For safety only.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 08e610859f
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)



------------------
This commit was generated by Migit
2017-06-15 01:01:54 +02:00
Thilo Graf
038b4e36e4 CProgressBar/CComponentsInfoBox: add missing value inits
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0a7f7ab5a6
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-15 01:01:54 +02:00
Thilo Graf
2aeab995a7 CComponentsForm: remove extra item declaration
Remove instances from vector only for sure.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0066430b77
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)



------------------
This commit was generated by Migit
2017-06-15 01:01:54 +02:00
Thilo Graf
48e82d6dac CComponentsHeader: remove virtual declararion from getClockObject()
Not required.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 86af640fae
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)

Origin message was:
------------------
CComponentsHeader: remove virtual declararion from getClockObject()

Not required.


------------------
This commit was generated by Migit
2017-06-15 01:01:54 +02:00
Thilo Graf
e87854a95f CChannelList: add instance check for header clock object
Only for sure.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 340a6992a1
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)



------------------
This commit was generated by Migit
2017-06-15 01:01:54 +02:00
Thilo Graf
37a15282dc CCButtonSelect: select button objects only
Other types are not required.


Origin commit data
------------------
Branch: ni/coolstream
Commit: c4976bb132
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)



------------------
This commit was generated by Migit
2017-06-15 01:01:54 +02:00
Thilo Graf
f9d5aa4ee6 CCButtonSelect: rename chain to btn_container
more plausible name


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4146a461c1
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)



------------------
This commit was generated by Migit
2017-06-15 01:01:54 +02:00
Thilo Graf
7e3920a42e CCButtonSelect: outsource button select handling into own class
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4d753d7437
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-15 01:01:54 +02:00
Thilo Graf
2e738f0803 CComponentsInfoBox: fix image y pos
Image was not centered, because of frame was not considered.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9e2c5cb939
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)



------------------
This commit was generated by Migit
2017-06-15 01:01:54 +02:00
vanhofen
386786c4a2 epgplus: use getScrollBarData() function
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1e0378a877
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-14 (Wed, 14 Jun 2017)

Origin message was:
------------------
- epgplus: use getScrollBarData() function

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

------------------
This commit was generated by Migit
2017-06-14 14:57:09 +02:00
vanhofen
166258a54f pictureviewer: use getScrollBarData() function
Origin commit data
------------------
Branch: ni/coolstream
Commit: 126d60527b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-14 (Wed, 14 Jun 2017)

Origin message was:
------------------
- pictureviewer: use getScrollBarData() function

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

------------------
This commit was generated by Migit
2017-06-14 14:57:09 +02:00
vanhofen
ba50008ddf bouquetlist: use getScrollBarData() function
Origin commit data
------------------
Branch: ni/coolstream
Commit: b0c630607f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-14 (Wed, 14 Jun 2017)

Origin message was:
------------------
- bouquetlist: use getScrollBarData() function

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

------------------
This commit was generated by Migit
2017-06-14 14:57:09 +02:00
vanhofen
3d4dc22d50 filebrowser: use getScrollBarData() function
Origin commit data
------------------
Branch: ni/coolstream
Commit: 33bf19278d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-14 (Wed, 14 Jun 2017)

Origin message was:
------------------
- filebrowser: use getScrollBarData() function

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

------------------
This commit was generated by Migit
2017-06-14 14:57:09 +02:00
vanhofen
541ca6a515 cc_frm_scrollbar: add getScrollBarData() function ...
to calculate total pages and current page for CComponentsScrollBar


Origin commit data
------------------
Branch: ni/coolstream
Commit: adb71c756c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-14 (Wed, 14 Jun 2017)

Origin message was:
------------------
- cc_frm_scrollbar: add getScrollBarData() function ...

to calculate total pages and current page for CComponentsScrollBar


------------------
This commit was generated by Migit
2017-06-14 14:57:09 +02:00
vanhofen
c20952dba2 locale: minor changes in audioplayer's and pictureviewer's locales
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2a63c3f58b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-14 (Wed, 14 Jun 2017)

Origin message was:
------------------
- locale: minor changes in audioplayer's and pictureviewer's locales

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

------------------
This commit was generated by Migit
2017-06-14 14:57:09 +02:00
vanhofen
c7dfb21970 pictureviewer: small design reworks ...
* use OFFSET defines
* use CComponentsScrollbar
* rename some variables


Origin commit data
------------------
Branch: ni/coolstream
Commit: cc19ae565c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-14 (Wed, 14 Jun 2017)

Origin message was:
------------------
- pictureviewer: small design reworks ...

* use OFFSET defines
* use CComponentsScrollbar
* rename some variables


------------------
This commit was generated by Migit
2017-06-14 14:57:09 +02:00
gixxpunk
7200069ef7 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 39559213cd
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-06-13 (Tue, 13 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-13 18:32:25 +02:00
Jacek Jendrzej
b31221c209 2 supplement to cb942044f3
Origin commit data
------------------
Branch: ni/coolstream
Commit: 85cff28f07
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-13 (Tue, 13 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-13 14:30:37 +02:00
Jacek Jendrzej
b740521d7f supplement to cb942044f3
Origin commit data
------------------
Branch: ni/coolstream
Commit: 30b1c3f286
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-13 (Tue, 13 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-13 14:23:56 +02:00
Jacek Jendrzej
cb942044f3 src/driver/pictureviewer/pictureviewer.cpp add bufferram and cached to calc freemem
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1f0a1bfdf2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-13 (Tue, 13 Jun 2017)

Origin message was:
------------------
src/driver/pictureviewer/pictureviewer.cpp add bufferram and cached to calc freemem

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

------------------
This commit was generated by Migit
2017-06-13 13:34:17 +02:00
vanhofen
28762e931a volumebar: use OFFSET defines; fix height of progressbar
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1c4fb116db
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-13 (Tue, 13 Jun 2017)

Origin message was:
------------------
- volumebar: use OFFSET defines; fix height of progressbar

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

------------------
This commit was generated by Migit
2017-06-13 12:44:26 +02:00
vanhofen
e4f4307eb6 vfd-setup: fix brightness setup for CST's boxmodel "Link" ...
and hide the brightness menu for all "Trinity" models. There's no display.


Origin commit data
------------------
Branch: ni/coolstream
Commit: c0d367dca9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-12 (Mon, 12 Jun 2017)

Origin message was:
------------------
- vfd-setup: fix brightness setup for CST's boxmodel "Link" ...

and hide the brightness menu for all "Trinity" models. There's no display.


------------------
This commit was generated by Migit
2017-06-12 13:14:32 +02:00
vanhofen
9147358eef Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5cd48bf48b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-12 (Mon, 12 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-12 10:45:25 +02:00
Jacek Jendrzej
d9224e1050 src/gui/movieplayer.cpp fix possible segfault
Origin commit data
------------------
Branch: ni/coolstream
Commit: cca6526b2f
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-11 (Sun, 11 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-11 20:00:33 +02:00
vanhofen
5a43934c6b Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 17546e7ba1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-10 (Sat, 10 Jun 2017)



------------------
This commit was generated by Migit
2017-06-10 11:43:50 +02:00