Commit Graph

16 Commits

Author SHA1 Message Date
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
Jacek Jendrzej
f564a0adef pedantic fixes
Origin commit data
------------------
Branch: ni/coolstream
Commit: e14fc80ed5
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-05-08 (Tue, 08 May 2012)

Origin message was:
------------------
-pedantic fixes

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

------------------
This commit was generated by Migit
2012-05-08 18:59:11 +02:00
Stefan Seyfried
7485ed721b spark: fix build by using correct includes
Origin commit data
------------------
Branch: ni/coolstream
Commit: c3f8a7f530
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-02-11 (Sat, 11 Feb 2012)


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

------------------
This commit was generated by Migit
2012-04-17 19:33:52 +02:00
Stefan Seyfried
208c2a2b88 neutrino: Tripledragon can only record one TS at once
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7368fad7ba
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-10-02 (Sun, 02 Oct 2011)


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

------------------
This commit was generated by Migit
2012-04-17 19:33:49 +02:00
[CST] Focus
9ba79bc6b2 Merge remote-tracking branch 'origin/master' into dvbsi++
Origin commit data
------------------
Branch: ni/coolstream
Commit: e9430aec0d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-02-19 (Sun, 19 Feb 2012)


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

------------------
This commit was generated by Migit
2012-02-19 13:20:19 +04:00
Michael Liebmann
eadb8b51dd Moviebrowser: Deleting recordings
- Deleting of active recordings will be disabled.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2112 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: c85c353344
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-02-18 (Sat, 18 Feb 2012)

Origin message was:
------------------
* Moviebrowser: Deleting recordings

- Deleting of active recordings will be disabled.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2112 e54a6e83-5905-42d5-8d5c-058d10e6a962


------------------
This commit was generated by Migit
2012-02-17 23:31:36 +00:00
[CST] Focus
9a0bc1f713 record: add support to select recording demux; use CFEManager to allocate and lock frontend in use
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5930d09cb9
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-01-13 (Fri, 13 Jan 2012)


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

------------------
This commit was generated by Migit
2012-01-13 15:03:23 +04:00
gixxpunk
81d70d7631 recording: add timer logic to ensure recording messages are readable for all users
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1750 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 527c448068
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2011-10-05 (Wed, 05 Oct 2011)

Origin message was:
------------------
- recording: add timer logic to ensure recording messages are readable for all users

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1750 e54a6e83-5905-42d5-8d5c-058d10e6a962


------------------
This commit was generated by Migit
2011-10-05 17:03:38 +00:00
Thilo Graf
b27c59e767 neutrino record: fix missing id parameter
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1730 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: a7cc9a7e8d
Author: Thilo Graf <dbt@novatux.de>
Date: 2011-10-01 (Sat, 01 Oct 2011)

Origin message was:
------------------
*neutrino record: fix missing id parameter

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1730 e54a6e83-5905-42d5-8d5c-058d10e6a962


------------------
This commit was generated by Migit
2011-10-01 21:12:31 +00:00
Thilo Graf
ba5a77b061 neutrino record: reworked some code parts from last multirec commits
- avoids using of boolean structures for record modes calls, handling of
 enum calls from record manager class should be easier
- remove boolean structure from infoviewer
- use commonly member name for count of recordings,
 GetRecordCount should be more plausible than GetRecmapSize

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1693 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: f63e3a532f
Author: Thilo Graf <dbt@novatux.de>
Date: 2011-09-17 (Sat, 17 Sep 2011)

Origin message was:
------------------
*neutrino record: reworked some code parts from last multirec commits

- avoids using of boolean structures for record modes calls, handling of
 enum calls from record manager class should be easier
- remove boolean structure from infoviewer
- use commonly member name for count of recordings,
 GetRecordCount should be more plausible than GetRecmapSize

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1693 e54a6e83-5905-42d5-8d5c-058d10e6a962


------------------
This commit was generated by Migit
2011-09-17 19:32:34 +00:00
gixxpunk
38378ea206 fix detection of timeshifted channel
- trigger recording menu on first press of STOP button
- disable recording stop via REC button
- disable menu entry "record current channel" when current channel is already recorded
- disable menu entry "timeshift" when current channel is already recorded or timeshifted
- flag timeshifted channel with prefix "[TS]"

Big thanks to micha-bbg!

For reference: http://www.dbox2world.net/board293-coolstream-hd1/board314-coolstream-development/p133623-anzeige-f%C3%BCr-laufende-aufnahmen/#post133623

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1638 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: a645062f6d
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2011-08-30 (Tue, 30 Aug 2011)

Origin message was:
------------------
- fix detection of timeshifted channel
- trigger recording menu on first press of STOP button
- disable recording stop via REC button
- disable menu entry "record current channel" when current channel is already recorded
- disable menu entry "timeshift" when current channel is already recorded or timeshifted
- flag timeshifted channel with prefix "[TS]"

Big thanks to micha-bbg!

For reference: http://www.dbox2world.net/board293-coolstream-hd1/board314-coolstream-development/p133623-anzeige-f%C3%BCr-laufende-aufnahmen/#post133623

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1638 e54a6e83-5905-42d5-8d5c-058d10e6a962


------------------
This commit was generated by Migit
2011-08-30 18:00:37 +00:00
gixxpunk
1a96b6b4b0 infoviewer: when current channel is not recorded and/or timeshifted show gray recording and/or timeshift icon instead of red ones
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1637 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 26b675e4f1
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2011-08-28 (Sun, 28 Aug 2011)

Origin message was:
------------------
- infoviewer: when current channel is not recorded and/or timeshifted show gray recording and/or timeshift icon instead of red ones

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1637 e54a6e83-5905-42d5-8d5c-058d10e6a962


------------------
This commit was generated by Migit
2011-08-28 18:03:01 +00:00
gixxpunk
2a78687734 rework recording menu and infobar style of recording icon (patch by micha-bbg) -> todo: add proper localization
*add possibility to start recording of current channel via menu
*add timeshift to menu
*add stop all recordings to menu
*change infobar style (shows number of running recordings beside recording icon)

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1627 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 605cfe4c25
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2011-08-26 (Fri, 26 Aug 2011)

Origin message was:
------------------
- rework recording menu and infobar style of recording icon (patch by micha-bbg) -> todo: add proper localization

*add possibility to start recording of current channel via menu
*add timeshift to menu
*add stop all recordings to menu
*change infobar style (shows number of running recordings beside recording icon)

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1627 e54a6e83-5905-42d5-8d5c-058d10e6a962


------------------
This commit was generated by Migit
2011-08-26 17:55:25 +00:00
[CST] Focus
2f78705065 Force stop sectionsd on second recording; New function to check if we can zap
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1609 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 49f20f3915
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2011-08-01 (Mon, 01 Aug 2011)



------------------
This commit was generated by Migit
2011-08-01 15:26:20 +00:00
[CST] Focus
1a5c21f577 Attempt to fix compile
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1584 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: dbb22467ec
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2011-07-21 (Thu, 21 Jul 2011)



------------------
This commit was generated by Migit
2011-07-21 12:00:15 +00:00
[CST] Focus
ab7b510617 New record module
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1569 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 526d01ef66
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2011-07-21 (Thu, 21 Jul 2011)



------------------
This commit was generated by Migit
2011-07-21 10:37:47 +00:00