Commit Graph

1533 Commits

Author SHA1 Message Date
vanhofen
1a928cce60 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


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



------------------
This commit was generated by Migit
2017-03-29 08:05:10 +02:00
Michael Liebmann
3a34afe94e Fix videosystem auto mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: b612c1f620
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-28 (Tue, 28 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-28 23:56:57 +02:00
vanhofen
4a4762935b Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	acinclude.m4


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



------------------
This commit was generated by Migit
2017-03-26 23:25:43 +02:00
vanhofen
ad129ee746 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: b435c29e1d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-26 (Sun, 26 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-26 23:24:10 +02:00
Michael Liebmann
c2d87de865 CFbAccelCSHD2::setMode: Fix if ENABLE_CHANGE_OSD_RESOLUTION is not defined
Origin commit data
------------------
Branch: ni/coolstream
Commit: 515ab1fe59
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-23 (Thu, 23 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-23 21:32:48 +01:00
Michael Liebmann
968e1ce9c0 src/neutrino.cpp: Simplification EVT_AUTO_SET_VIDEOSYSTEM handling
Origin commit data
------------------
Branch: ni/coolstream
Commit: ea18657562
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-23 (Thu, 23 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-23 21:32:48 +01:00
vanhofen
4ce21cbc1d Merge branch 'master' into pu/mp
Conflicts:
	acinclude.m4


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



------------------
This commit was generated by Migit
2017-03-22 12:16:01 +01:00
vanhofen
515913eecd Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 107a8a1b5f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-21 (Tue, 21 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-21 14:50:23 +01:00
vanhofen
ba30b3009a neutrino: grab whole ExitRun() from neutrino-mp ...
This fixes my last merge commit, small typos and alignes indentation.


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

Origin message was:
------------------
- neutrino: grab whole ExitRun() from neutrino-mp ...

This fixes my last merge commit, small typos and alignes indentation.


------------------
This commit was generated by Migit
2017-03-21 10:29:35 +01:00
Stefan Seyfried
fa27428fc3 Merge remote-tracking branch 'tuxbox/master'
probably needs some additional tweaks


Origin commit data
------------------
Branch: ni/coolstream
Commit: d4efbc0c9b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-21 (Tue, 21 Mar 2017)



------------------
This commit was generated by Migit
2017-03-21 06:50:08 +01:00
Michael Liebmann
5b871d8901 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8212746cf1
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-20 (Mon, 20 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-20 23:11:33 +01:00
vanhofen
7bc3fd6cfe Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: e43defd2a0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-20 (Mon, 20 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-20 21:23:44 +01:00
Jacek Jendrzej
3f6c2e83a2 fix segfault aufter unbreak msgbox 56ddedaa39
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8516b1662d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-20 (Mon, 20 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-20 17:40:26 +01:00
vanhofen
3dc42dfe3c Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/miscsettings_menu.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp


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



------------------
This commit was generated by Migit
2017-03-20 15:53:10 +01:00
vanhofen
d404deb1d2 Merge branch 'master' into pu/mp
Conflicts:
	src/gui/miscsettings_menu.cpp
	src/neutrino.cpp
	src/system/settings.h


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



------------------
This commit was generated by Migit
2017-03-20 01:31:51 +01:00
vanhofen
6a75ab2706 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/neutrino.cpp
	src/neutrino.h
	src/neutrino_menue.cpp


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



------------------
This commit was generated by Migit
2017-03-20 00:07:18 +01:00
Michael Liebmann
bbf628bf89 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: be49686432
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-20 (Mon, 20 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-20 00:00:35 +01:00
vanhofen
304b71b6dc neutrino: just code cosmetics in ExitRun()
Origin commit data
------------------
Branch: ni/coolstream
Commit: b8a97a97ca
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
- neutrino: just code cosmetics in ExitRun()

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

------------------
This commit was generated by Migit
2017-03-19 23:50:52 +01:00
vanhofen
f24af0df57 neutrino: remove unused write_si from ExitRun() function ...
and rename retcode to can_shutdown for a better readability


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

Origin message was:
------------------
- neutrino: remove unused write_si from ExitRun() function ...

and rename retcode to can_shutdown for a better readability


------------------
This commit was generated by Migit
2017-03-19 23:50:52 +01:00
vanhofen
514707f0c8 use g_info.hw_caps->can_shutdown; mostly ported from neutrino-mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: de1ee8b73a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
- use g_info.hw_caps->can_shutdown; mostly ported from neutrino-mp

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

------------------
This commit was generated by Migit
2017-03-19 23:50:52 +01:00
vanhofen
09f897e34d neutrino-cpp: fix build
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7ddea13746
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
- neutrino-cpp: fix build

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

------------------
This commit was generated by Migit
2017-03-19 20:39:59 +01:00
Michael Liebmann
0afee77c57 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2ca9d9c4f9
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-19 (Sun, 19 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-19 08:38:15 +01:00
vanhofen
2aa18cd5e1 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/system/settings.h


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



------------------
This commit was generated by Migit
2017-03-19 01:07:17 +01:00
vanhofen
a833003150 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8a75efa81a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-19 01:05:31 +01:00
vanhofen
9d2ce8caf1 use g_info.hw_caps->has_fan; remove old g_info.has_fan
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4f202b19d6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
- use g_info.hw_caps->has_fan; remove old g_info.has_fan

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

------------------
This commit was generated by Migit
2017-03-19 01:04:48 +01:00
vanhofen
45f0ad7d7e Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/scan_setup.cpp
	src/zapit/src/frontend.cpp


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



------------------
This commit was generated by Migit
2017-03-15 23:39:43 +01:00
TangoCash
8073cfc4d6 Merge branch 'pu/mp' of github.com:tuxbox-neutrino/gui-neutrino into pu/mp
Conflicts:
	src/gui/scan_setup.cpp
	src/zapit/src/frontend.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 81fb3b42fa
Author: TangoCash <eric@loxat.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)



------------------
This commit was generated by Migit
2017-03-15 22:47:42 +01:00
vanhofen
9713a31d6a Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4cab22024f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-15 22:47:35 +01:00
Michael Liebmann
c636bf6234 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: b190e0c4ff
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-15 (Wed, 15 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-15 21:19:08 +01:00
Jacek Jendrzej
2a2238f53a src/neutrino.cpp fix possible memleak
Origin commit data
------------------
Branch: ni/coolstream
Commit: f18ec050c7
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-15 (Wed, 15 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-15 15:56:23 +01:00
vanhofen
ae3ecfdcfb Merge remote-tracking branch 'neutrino-mp/master' into pu/mp
Conflicts:
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/neutrinoyparser.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8bdb16cec6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)



------------------
This commit was generated by Migit
2017-03-13 16:14:33 +01:00
vanhofen
ca99393430 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	lib/libdvbsub/dvbsubtitle.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/neutrinoyparser.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 69d8616a91
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-12 (Sun, 12 Mar 2017)



------------------
This commit was generated by Migit
2017-03-12 22:03:03 +01:00
vanhofen
c3245e8661 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/system/locals.h
	src/system/locals_intern.h


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



------------------
This commit was generated by Migit
2017-03-12 21:59:40 +01:00
Michael Liebmann
e7d1a44693 Revert "- allow to force given osd resolution in "videosystem = auto" mode"
This reverts commit f3fe4a116f.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ce34d5cf9
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-12 (Sun, 12 Mar 2017)



------------------
This commit was generated by Migit
2017-03-12 06:32:52 +01:00
vanhofen
b67a4fc3b3 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2e4d5a0d28
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-09 (Thu, 09 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-09 10:08:13 +01:00
Michael Liebmann
ef3d478f81 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6a531d4304
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-08 (Wed, 08 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-08 12:35:39 +01:00
Michael Liebmann
3d5b84fb78 Add src/compatibility.h to include software-dependency macros
Origin commit data
------------------
Branch: ni/coolstream
Commit: 87b7260c48
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-08 (Wed, 08 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-08 12:35:20 +01:00
Michael Liebmann
d5b808b0b9 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7ad59776d1
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-08 (Wed, 08 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-08 00:35:16 +01:00
Michael Liebmann
5891499504 Fix malloc_stats() call for newer uClibc-ng versions
Origin commit data
------------------
Branch: ni/coolstream
Commit: b58aa9ad6f
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-08 (Wed, 08 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-08 00:34:48 +01:00
vanhofen
73014e6c83 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/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 66cbc06b01
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)



------------------
This commit was generated by Migit
2017-03-06 23:54:02 +01:00
vanhofen
f3fe4a116f allow to force given osd resolution in "videosystem = auto" mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6fc24e990b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)

Origin message was:
------------------
- allow to force given osd resolution in "videosystem = auto" mode

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

------------------
This commit was generated by Migit
2017-03-06 23:50:15 +01:00
vanhofen
47ce01c2b5 Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox
Conflicts:
	src/gui/movieplayer.cpp
	src/neutrino.cpp


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



------------------
This commit was generated by Migit
2017-03-06 22:43:51 +01:00
vanhofen
6d8078cf73 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/Makefile.am


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



------------------
This commit was generated by Migit
2017-03-06 22:07:52 +01:00
Michael Liebmann
875905608d Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: bab10ee438
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-06 (Mon, 06 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-06 22:06:38 +01:00
vanhofen
c8efd4141c port hardware_caps from Neutrino-MP
Origin commit data
------------------
Branch: ni/coolstream
Commit: 29fd05002f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)

Origin message was:
------------------
- port hardware_caps from Neutrino-MP

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

------------------
This commit was generated by Migit
2017-03-06 21:49:32 +01:00
vanhofen
6c8156c80c Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: e24708f93c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-05 (Sun, 05 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-05 20:44:04 +01:00
vanhofen
440f72d606 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 13c7e927b7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-05 (Sun, 05 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-05 20:43:50 +01:00
Michael Liebmann
b548b66607 COsdHelpers: Remove no longer required function resetOsdResolution()
Origin commit data
------------------
Branch: ni/coolstream
Commit: b1dcce0ad3
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-05 (Sun, 05 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-05 19:54:09 +01:00
Michael Liebmann
24176ae699 COsdHelpers: Add function setVideoSystem()
Origin commit data
------------------
Branch: ni/coolstream
Commit: fa08347ef4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-05 (Sun, 05 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-05 19:54:09 +01:00
Stefan Seyfried
a5cbcf84af Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: abec1c311b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-04 (Sat, 04 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-04 19:32:30 +01:00