Commit Graph

131 Commits

Author SHA1 Message Date
[CST] Focus
12b7731368 gui/miscsettings_menu.cpp: add option to scan epg in standby or live or always
Origin commit data
------------------
Branch: ni/coolstream
Commit: a6bd2589dd
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-03-27 (Thu, 27 Mar 2014)


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

------------------
This commit was generated by Migit
2014-03-27 18:56:49 +04:00
[CST] Focus
f57e347a3f gui/miscsettings_menu.cpp: remove global rotor_swap option
Origin commit data
------------------
Branch: ni/coolstream
Commit: a3f4cbaa90
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-03-04 (Tue, 04 Mar 2014)


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

------------------
This commit was generated by Migit
2014-03-06 16:09:09 +04:00
vanhofen
ea1379e04a fix (and enable) one-key-plugin; fix movieplayer-plugin
Origin commit data
------------------
Branch: ni/coolstream
Commit: 580fcc97e5
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-03-01 (Sat, 01 Mar 2014)

Origin message was:
------------------
- fix (and enable) one-key-plugin; fix movieplayer-plugin

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

------------------
This commit was generated by Migit
2014-03-01 23:33:45 +01:00
Stefan Seyfried
fe96831ba6 Merge remote-tracking branch 'check/next-cc'
Origin commit data
------------------
Branch: ni/coolstream
Commit: e9bc524562
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-27 (Mon, 27 Jan 2014)


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

------------------
This commit was generated by Migit
2014-01-27 21:00:18 +01:00
Jacek Jendrzej
109dcc3143 fix CMenuDForwarder option change
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3dc41ac047
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-01-27 (Mon, 27 Jan 2014)

Origin message was:
------------------
-fix CMenuDForwarder option change

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

------------------
This commit was generated by Migit
2014-01-27 17:11:27 +01:00
Stefan Seyfried
b7c804fc22 Merge remote-tracking branch 'check/next-cc'
compiles, nothing else.

Conflicts:
	configure.ac
	src/Makefile.am
	src/gui/Makefile.am
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan_setup.cpp
	src/gui/start_wizard.cpp
	src/gui/test_menu.cpp
	src/gui/user_menue.cpp
	src/gui/widget/hintboxext.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/messagebox.cpp
	src/gui/widget/stringinput.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: b414474323
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-23 (Thu, 23 Jan 2014)



------------------
This commit was generated by Migit
2014-01-23 14:08:37 +01:00
vanhofen
35830797d6 adapt ShowMsg handling from martii's neutrino-mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 53f5801d6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-01-22 (Wed, 22 Jan 2014)

Origin message was:
------------------
- adapt ShowMsg handling from martii's neutrino-mp

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

------------------
This commit was generated by Migit
2014-01-22 12:37:21 +01:00
Michael Liebmann
7b4e3bc03b Preparing the menu classes for Lua Part #2
- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
 THX Martii


Origin commit data
------------------
Branch: ni/coolstream
Commit: b41819190d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-16 (Thu, 16 Jan 2014)

Origin message was:
------------------
Preparing the menu classes for Lua Part #2

- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
 THX Martii


------------------
This commit was generated by Migit
2014-01-19 20:57:37 +01:00
Stefan Seyfried
0c4ecc191a Merge remote-tracking branch 'check/next-cc'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7d379dcb30
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-29 (Sun, 29 Dec 2013)


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

------------------
This commit was generated by Migit
2013-12-29 22:12:09 +01:00
Jacek Jendrzej
53ff2f046f supplement to e558ba8025
Origin commit data
------------------
Branch: ni/coolstream
Commit: a7f68a519f
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-12-27 (Fri, 27 Dec 2013)


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

------------------
This commit was generated by Migit
2013-12-27 11:39:42 +01:00
Stefan Seyfried
464d5ab9b9 Merge remote-tracking branch 'check/next-cc'
Lightly tested only...


Origin commit data
------------------
Branch: ni/coolstream
Commit: cdd065fc2e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-25 (Wed, 25 Dec 2013)



------------------
This commit was generated by Migit
2013-12-25 22:51:23 +01:00
martii
e558ba8025 system/settings: store epg times in integers
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Branch: ni/coolstream
Commit: b45511b196
Author: martii <m4rtii@gmx.de>
Date: 2013-12-24 (Tue, 24 Dec 2013)



------------------
This commit was generated by Migit
2013-12-25 12:08:14 +01:00
martii
f870b2d240 system/settings: use integers for shutdown_count/_min
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Branch: ni/coolstream
Commit: d125301ede
Author: martii <m4rtii@gmx.de>
Date: 2013-12-24 (Tue, 24 Dec 2013)



------------------
This commit was generated by Migit
2013-12-25 12:08:14 +01:00
Stefan Seyfried
b0077cafc5 Merge branch 'check/next-cc'
Compiles on most platforms, starts. Not really tested.


Origin commit data
------------------
Branch: ni/coolstream
Commit: b93a372b54
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-10 (Sun, 10 Nov 2013)



------------------
This commit was generated by Migit
2013-11-10 16:55:53 +01:00
[CST] Focus
82955c27ab gui/miscsettings_menu.cpp: add video.h header
Origin commit data
------------------
Branch: ni/coolstream
Commit: dd509ef0c2
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-25 (Fri, 25 Oct 2013)


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

------------------
This commit was generated by Migit
2013-10-25 16:41:03 +04:00
[CST] Focus
5123ca405f as requested, implement 'easy' menu mode for novice users;
default behavior should not be changed, easy mode forced by /var/etc/.easymenu file inside image;
at the moment switch between modes is done by main menu -> 'stop' button -> enter pin code,
restart needed after mode switch


Origin commit data
------------------
Branch: ni/coolstream
Commit: 606bd01878
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-25 (Fri, 25 Oct 2013)



------------------
This commit was generated by Migit
2013-10-25 13:03:26 +04:00
Stefan Seyfried
971d575b78 Merge branch 'check/next-cc'
Compiles on most platforms, starts. Not really tested.

Conflicts:
	acinclude.m4
	lib/libdvbsub/Makefile.am
	lib/libtriple/Makefile.am
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/create_rcsim_h.sh
	src/daemonc/Makefile.am
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/streaminfo2.h
	src/gui/update.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/rcsim.c
	src/system/Makefile.am
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: d244a5991a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-10-21 (Mon, 21 Oct 2013)



------------------
This commit was generated by Migit
2013-10-21 22:58:55 +02:00
vanhofen
3eccf03688 sleeptimer: add possibilty to preset with a fixed value
Origin commit data
------------------
Branch: ni/coolstream
Commit: 25e550e9e3
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-10-16 (Wed, 16 Oct 2013)

Origin message was:
------------------
- sleeptimer: add possibilty to preset with a fixed value

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

------------------
This commit was generated by Migit
2013-10-16 10:37:23 +02:00
[CST] Focus
769fb2a6d7 src/gui/miscsettings_menu.cpp: always enable epg scan item
Origin commit data
------------------
Branch: ni/coolstream
Commit: ebaa844494
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-10 (Thu, 10 Oct 2013)


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

------------------
This commit was generated by Migit
2013-10-10 19:01:46 +04:00
[CST] Focus
65f8705975 gui/miscsettings_menu.cpp: add epg scan modes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 41f6e03e3e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-02 (Wed, 02 Oct 2013)


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

------------------
This commit was generated by Migit
2013-10-02 15:30:44 +04:00
[CST] Focus
5f4222186d gui/miscsettings_menu.cpp: add 'info' action key in epg settings to show current eit event count
Origin commit data
------------------
Branch: ni/coolstream
Commit: 550ca1dedb
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-09-27 (Fri, 27 Sep 2013)


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

------------------
This commit was generated by Migit
2013-09-27 16:27:21 +04:00
Stefan Seyfried
4c3c21152b Merge branch 'check/next-cc'
it compiles, but is not really tested...

Conflicts:
	src/driver/netfile.cpp
	src/driver/volume.cpp
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bookmarkmanager.cpp
	src/gui/bouquetlist.cpp
	src/gui/eventlist.cpp
	src/gui/movieplayer.cpp
	src/gui/pictureviewer.cpp
	src/gui/scan.cpp
	src/gui/test_menu.h
	src/gui/timerlist.cpp
	src/gui/update.cpp
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/system/flashtool.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/femanager.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: d5d5a60261
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-16 (Sun, 16 Jun 2013)



------------------
This commit was generated by Migit
2013-06-16 21:22:14 +02:00
Michael Liebmann
1a507a05c6 scan epg: fix shadow warning
- fix display menuhint


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7833cd4dc6
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-12 (Wed, 12 Jun 2013)



------------------
This commit was generated by Migit
2013-06-12 17:50:10 +02:00
[CST] Focus
f0b7161769 gui/miscsettings_menu.cpp: add option to enable/disable epg scan
Origin commit data
------------------
Branch: ni/coolstream
Commit: 680f684ce4
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-06-12 (Wed, 12 Jun 2013)


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

------------------
This commit was generated by Migit
2013-06-12 18:46:34 +04:00
Stefan Seyfried
083bc55347 Merge remote-tracking branch 'check/next-cc'
needs some build-fixing and merge errors are likely :-(

Conflicts:
	configure.ac
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/unmaintained/dutch.locale
	lib/libdvbsub/Makefile.am
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/daemonc/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/framebuffer.h
	src/driver/pictureviewer/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/driver/volume.cpp
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/audioplayer.cpp
	src/gui/bedit/Makefile.am
	src/gui/bedit/bouqueteditor_chanselect.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/keybind_setup.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/test_menu.cpp
	src/gui/test_menu.h
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/buttons.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am
	src/system/setting_helpers.cpp
	src/system/settings.h
	src/zapit/include/zapit/client/zapitclient.h
	src/zapit/include/zapit/femanager.h
	src/zapit/include/zapit/getservices.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8253c4d67c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-10 (Fri, 10 May 2013)



------------------
This commit was generated by Migit
2013-05-10 10:06:47 +02:00
[CST] Focus
419732355d gui/miscsettings_menu.cpp: add option to adjust channel list
on numeric zap to first fav/provider/sat mode where channel exist


Origin commit data
------------------
Branch: ni/coolstream
Commit: 56eb53ec78
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-01 (Mon, 01 Apr 2013)



------------------
This commit was generated by Migit
2013-04-01 14:14:47 +04:00
Stefan Seyfried
77c08c4c15 Merge branch 'check/dvbsi++' commit c16f636011
Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/components/cc.h
	src/gui/components/components.cpp
	src/gui/moviebrowser.cpp
	src/gui/scan.cpp
	src/neutrino.cpp
	src/zapit/src/bouquets.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0cf191822a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-21 (Thu, 21 Feb 2013)



------------------
This commit was generated by Migit
2013-02-21 17:07:18 +01:00
vanhofen
119f0c82f6 Revert "Revert '- channellist.cpp: enable to lock new_zap_mode'"
This reverts commit 72fd77bb5f.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 505c4ba80d
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-17 (Sun, 17 Feb 2013)



------------------
This commit was generated by Migit
2013-02-17 22:55:28 +01:00
vanhofen
72fd77bb5f Revert "- channellist.cpp: enable to lock new_zap_mode"
This reverts commit 8b1b3b1418
because the display of infobar while zapping is broken with
this commit.


Origin commit data
------------------
Branch: ni/coolstream
Commit: fb892d18ff
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-15 (Fri, 15 Feb 2013)



------------------
This commit was generated by Migit
2013-02-15 22:55:45 +01:00
[CST] Focus
071bfdeedd merge dvbsi++
Origin commit data
------------------
Branch: ni/coolstream
Commit: 46657a1c6b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-11 (Mon, 11 Feb 2013)


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

------------------
This commit was generated by Migit
2013-02-11 13:29:09 +04:00
vanhofen
8b1b3b1418 channellist.cpp: enable to lock new_zap_mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 15d787f79b
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-10 (Sun, 10 Feb 2013)

Origin message was:
------------------
- channellist.cpp: enable to lock new_zap_mode

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

------------------
This commit was generated by Migit
2013-02-10 21:03:43 +01:00
[CST] Focus
96e4a55dcd gui/miscsettings_menu.cpp: use CFEManager::haveSat in place of glocal delivery system
Origin commit data
------------------
Branch: ni/coolstream
Commit: dd3bc579a0
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-16 (Wed, 16 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-16 15:49:24 +04:00
Stefan Seyfried
a07b5d6289 Merge branch 'uncool/dvbsi++' commit c6136d612f
Conflicts:
	src/gui/widget/hintboxext.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: f8f5467fdb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-12-30 (Sun, 30 Dec 2012)



------------------
This commit was generated by Migit
2012-12-30 21:35:20 +01:00
[CST] Focus
0650c7dc7d gui/miscsettings_menu.cpp: always enable EPG options,
which not depend on save epg on/off


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5749f86323
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-12-19 (Wed, 19 Dec 2012)



------------------
This commit was generated by Migit
2012-12-19 16:45:40 +04:00
Stefan Seyfried
d504691cf5 miscsettings: use correct scope for sleeptimer menuwidget
Origin commit data
------------------
Branch: ni/coolstream
Commit: 10e359e43b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-14 (Wed, 14 Nov 2012)


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

------------------
This commit was generated by Migit
2012-11-14 21:32:35 +01:00
Stefan Seyfried
fbee2df820 Merge branch 'uncool/dvbsi++'
Conflicts:
	src/driver/Makefile.am
	src/driver/streamts.cpp
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/widget/textbox.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: c480e36746
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-11 (Sun, 11 Nov 2012)



------------------
This commit was generated by Migit
2012-11-11 01:45:22 +01:00
Jacek Jendrzej
f1a62f638f src/gui/miscsettings_menu.cpp: -add COnOffNotifier for EPG menu
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0acc943a4f
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-11-08 (Thu, 08 Nov 2012)


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

------------------
This commit was generated by Migit
2012-11-08 17:24:10 +01:00
Jacek Jendrzej
07ac341c28 neutrino: -add save epg on stadbyOn/Off option
Origin commit data
------------------
Branch: ni/coolstream
Commit: a47c6593dc
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-11-08 (Thu, 08 Nov 2012)


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

------------------
This commit was generated by Migit
2012-11-08 13:35:00 +01:00
Stefan Seyfried
58ca3266e7 Merge branch 'uncool/dvbsi++' commit '9d1444a8df5'
...needs buildfixing...

Conflicts:
	data/Makefile.am
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7e23ac7223
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-03 (Sat, 03 Nov 2012)



------------------
This commit was generated by Migit
2012-11-03 10:45:33 +01:00
[CST] Focus
d4cadb5e19 gui/miscsettings_menu.cpp: remove unneeded fanNotifier->changeNotify
Origin commit data
------------------
Branch: ni/coolstream
Commit: dc58416597
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-11-02 (Fri, 02 Nov 2012)


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

------------------
This commit was generated by Migit
2012-11-02 12:56:08 +04:00
Stefan Seyfried
44a3ee0131 miscsettings: prevent segfault on hardware that can't shutdown
Origin commit data
------------------
Branch: ni/coolstream
Commit: d30b97afa9
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-16 (Tue, 16 Oct 2012)


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

------------------
This commit was generated by Migit
2012-10-16 09:13:21 +02:00
Jacek Jendrzej
122e3fade5 miscsettings_menu.cpp: fix segfault on ZEE/HD1
Origin commit data
------------------
Branch: ni/coolstream
Commit: f85251128c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-10-15 (Mon, 15 Oct 2012)


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

------------------
This commit was generated by Migit
2012-10-15 12:10:28 +02:00
Stefan Seyfried
a603ec74af Merge branch 'uncool/dvbsi++' commit 'd493b1155c4'
...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
------------------
Branch: ni/coolstream
Commit: adb23b23ee
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-14 (Sun, 14 Oct 2012)



------------------
This commit was generated by Migit
2012-10-14 12:51:07 +02:00
Jacek Jendrzej
4c8475e5ba Neutrino: rework COnOffNotifier and use it if possible, ported from tuxbox cvs
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7b06b3fd38
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-10-11 (Thu, 11 Oct 2012)


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

------------------
This commit was generated by Migit
2012-10-11 14:11:05 +02:00
Stefan Seyfried
60e77c7e43 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
------------------
Branch: ni/coolstream
Commit: 04ee2e87f3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-09-23 (Sun, 23 Sep 2012)



------------------
This commit was generated by Migit
2012-09-23 21:34:47 +02:00
Jacek Jendrzej
67c5d7c91e remove doubles include
Origin commit data
------------------
Branch: ni/coolstream
Commit: a3bfab0bcd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-09-11 (Tue, 11 Sep 2012)


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

------------------
This commit was generated by Migit
2012-09-11 20:31:33 +02:00
Stefan Seyfried
3df9a6f7f5 Merge branch 'uncool/dvbsi++' commit '9d968280bac'
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
------------------
Branch: ni/coolstream
Commit: ae1b98aa38
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-07-22 (Sun, 22 Jul 2012)



------------------
This commit was generated by Migit
2012-07-23 01:02:29 +02:00
Michael Liebmann
40ba98a0af Menu hints: Update loclale
- english.locale sorted
- deutsch.locale sorted and translated some new entries (THX Tomworld)
- locals.h/locals_intern.h rebuild
- Corrected typo in the locale/source


Origin commit data
------------------
Branch: ni/coolstream
Commit: c542cb3360
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-07-10 (Tue, 10 Jul 2012)

Origin message was:
------------------
* Menu hints: Update loclale

- english.locale sorted
- deutsch.locale sorted and translated some new entries (THX Tomworld)
- locals.h/locals_intern.h rebuild
- Corrected typo in the locale/source


------------------
This commit was generated by Migit
2012-07-11 23:41:08 +01:00
[CST] Focus
6e78c2bdcd gui/miscsettings_menu.cpp: add menu hints
Origin commit data
------------------
Branch: ni/coolstream
Commit: ec1cccf571
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-07-08 (Sun, 08 Jul 2012)


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

------------------
This commit was generated by Migit
2012-07-08 21:36:42 +04:00
Stefan Seyfried
bd7c2a5a04 implement shutdown handling for azbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2be328ade2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-06-23 (Sat, 23 Jun 2012)


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

------------------
This commit was generated by Migit
2012-06-27 21:18:19 +02:00