Commit Graph

81 Commits

Author SHA1 Message Date
vanhofen
87d4837f59 fix compile
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8c44c161c2
Author: vanhofen <vanhofen@gmx.de>
Date: 2022-01-20 (Thu, 20 Jan 2022)

Origin message was:
------------------
- fix compile

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

------------------
This commit was generated by Migit
2022-01-20 22:19:20 +01:00
max_10
76ba82ad88 TRIPLEDRAGON: deleted
Origin commit data
------------------
Branch: ni/coolstream
Commit: b4bab59f38
Author: max_10 <max_10@gmx.de>
Date: 2020-10-03 (Sat, 03 Oct 2020)

Origin message was:
------------------
- TRIPLEDRAGON: deleted

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

------------------
This commit was generated by Migit
2020-10-03 22:47:34 +02:00
vanhofen
23b553a97e cosmetics: align epg_id notation to channel_id
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4343c2d5da
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-04-27 (Sat, 27 Apr 2019)

Origin message was:
------------------
- cosmetics: align epg_id notation to channel_id

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

------------------
This commit was generated by Migit
2019-04-27 16:26:21 +02:00
vanhofen
e837ad224c record: move TSHIFT defines into enumeration
Origin commit data
------------------
Branch: ni/coolstream
Commit: 019ff8e43a
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-01-15 (Tue, 15 Jan 2019)

Origin message was:
------------------
- record: move TSHIFT defines into enumeration

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

------------------
This commit was generated by Migit
2019-01-15 21:28:38 +01:00
vanhofen
4b2261abbe timeshift: allow to keep timeshift recordings after stop (need tests!)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7aef809716
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-01-13 (Sun, 13 Jan 2019)

Origin message was:
------------------
- timeshift: allow to keep timeshift recordings after stop (need tests!)

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

------------------
This commit was generated by Migit
2019-01-13 23:55:36 +01:00
vanhofen
9d7fbb44ac Revert "- infoviewer: allow to disable pip with RC_help if g_settings.show_ecm_pos is off (thx to mirz)"
This reverts commit 84387b2878
because many testing code was commited by mistake


Origin commit data
------------------
Branch: ni/coolstream
Commit: ed28f6d569
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-01-13 (Sun, 13 Jan 2019)



------------------
This commit was generated by Migit
2019-01-13 20:45:57 +01:00
vanhofen
84387b2878 infoviewer: allow to disable pip with RC_help if g_settings.show_ecm_pos is off (thx to mirz)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 24cac7b6a3
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-01-13 (Sun, 13 Jan 2019)

Origin message was:
------------------
- infoviewer: allow to disable pip with RC_help if g_settings.show_ecm_pos is off (thx to mirz)

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

------------------
This commit was generated by Migit
2019-01-13 16:09:20 +01:00
vanhofen
1e70a1fcc9 introduce record.h compatibility header file
Origin commit data
------------------
Branch: ni/coolstream
Commit: 53612d7225
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-12-22 (Sat, 22 Dec 2018)

Origin message was:
------------------
- introduce record.h compatibility header file

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

------------------
This commit was generated by Migit
2018-12-22 10:06:47 +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
eb010cdbd1 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/epgview.h
	src/neutrino_menue.cpp


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



------------------
This commit was generated by Migit
2017-03-20 14:34:45 +01:00
vanhofen
cb3b233e6c move movieinfo.cpp|h from src/gui to src/driver ...
because there are no gui-elements included anymore


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

Origin message was:
------------------
- move movieinfo.cpp|h from src/gui to src/driver ...

because there are no gui-elements included anymore


------------------
This commit was generated by Migit
2017-03-20 14:30:44 +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
vanhofen
54d7d92401 Merge branch 'pu/fb-modules' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/epgview.h


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



------------------
This commit was generated by Migit
2017-02-08 08:02:39 +01:00
Stefan Seyfried
b3fcfc287a reduce impact of zapit/frontend_c.h header
down from ~217 files to ~57...


Origin commit data
------------------
Branch: ni/coolstream
Commit: 98b2461da7
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-06 (Mon, 06 Feb 2017)



------------------
This commit was generated by Migit
2017-02-07 18:38:45 +01:00
vanhofen
e30d9b012a Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 87fe81b890
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-02 (Fri, 02 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-02 23:39:21 +01:00
vanhofen
fb4695897b Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 84381644ce
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-24 (Thu, 24 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-24 00:04:21 +01:00
Thilo Graf
418f8ad5e3 CRecordManager: add methode to get internal rec map
Useful for access to current record data.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8ba357fcb2
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-23 (Wed, 23 Nov 2016)



------------------
This commit was generated by Migit
2016-11-23 09:07:05 +01:00
vanhofen
59c83b2c70 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	configure.ac
	lib/Makefile.am
	src/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3ed2ebe75b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)



------------------
This commit was generated by Migit
2016-10-25 12:30:10 +02:00
vanhofen
f23c56ed95 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a7e4be231c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-24 (Mon, 24 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-24 10:06:31 +02:00
Stefan Seyfried
74b278d191 driver/record: make CStreamRec non-public
CStreamRec is only used inside CRecordManager::Record, so it
can be implemented completely inside record.cpp. The positive
side effect is that avformat.h is not included everywhere (e.g.
from moviebrowser/mb.h) and thus AVFORMAT_CFLAGS does not need
to be added everywhere to fix build failures.


Origin commit data
------------------
Branch: ni/coolstream
Commit: b5cb683048
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)



------------------
This commit was generated by Migit
2016-10-24 09:45:46 +02:00
vanhofen
af8fe3ebc6 Merge branch 'ni/mp' into ni/cst-next
Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/Makefile.am
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libdvbsub/dvbsub.cpp
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/gui/dboxinfo.cpp
	src/gui/movieplayer.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/Makefile.am
	src/system/flashtool.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 161347db29
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)



------------------
This commit was generated by Migit
2016-08-26 19:13:47 +02:00
Michael Liebmann
2c4ccf9555 Merge branch 'cst-next' into nmp-cst-next
- Fix merge conflicts


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)



------------------
This commit was generated by Migit
2016-08-19 17:40:48 +02:00
FlatTV
fbab44c8c6 channellist: set CI channel inactive if recording with CI
Origin commit data
------------------
Branch: ni/coolstream
Commit: 570d1b10f2
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-06-25 (Sat, 25 Jun 2016)


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

------------------
This commit was generated by Migit
2016-06-25 13:06:12 +02:00
vanhofen
a86bc779b4 NI \o/
Origin commit data
------------------
Branch: ni/coolstream
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)


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

------------------
This commit was generated by Migit
2016-05-19 22:59:54 +02:00
[CST] Focus
1c9c19133d driver/record.cpp, driver/streamts.cpp: add more formats, for testing
Origin commit data
------------------
Branch: ni/coolstream
Commit: f3a2657c9e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-12 (Sat, 12 Mar 2016)


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

------------------
This commit was generated by Migit
2016-03-12 14:53:11 +03:00
Stefan Seyfried
5f89c9a312 Merge remote-tracking branch 'uncool/cst-next'
This need buildfixes and some functional updates...


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



------------------
This commit was generated by Migit
2015-12-13 17:41:55 +01:00
[CST] Focus
75dfd624b0 driver/record.cpp: add expetimental support for webtv recording,
allowed formats hls and mpegts, ffmpeg must have mpegts muxer support


Origin commit data
------------------
Branch: ni/coolstream
Commit: f0eac5d3e0
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-10-07 (Wed, 07 Oct 2015)



------------------
This commit was generated by Migit
2015-10-07 13:48:46 +03:00
Jacek Jendrzej
71e8037a22 src/gui/eventlist.cpp fix timeshif_record timer handling
Origin commit data
------------------
Branch: ni/coolstream
Commit: 65a237c991
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-08-20 (Thu, 20 Aug 2015)


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

------------------
This commit was generated by Migit
2015-08-20 15:51:57 +02:00
vanhofen
098e322feb record.h: remove include of vfd.h; use display.h instead
Origin commit data
------------------
Branch: ni/coolstream
Commit: 09adc177d8
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-04-16 (Thu, 16 Apr 2015)

Origin message was:
------------------
- record.h: remove include of vfd.h; use display.h instead

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

------------------
This commit was generated by Migit
2015-04-16 13:39:35 +02:00
Stefan Seyfried
a5e790af41 record.h: replace includes with forward declaration
Origin commit data
------------------
Branch: ni/coolstream
Commit: baf6bcdb97
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-11 (Wed, 11 Feb 2015)


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

------------------
This commit was generated by Migit
2015-02-14 14:31:12 +01:00
Stefan Seyfried
6e2a3106b0 record.h: replace includes with forward declaration
Origin commit data
------------------
Branch: ni/coolstream
Commit: 07b34e50f7
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-11 (Wed, 11 Feb 2015)


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

------------------
This commit was generated by Migit
2015-02-11 08:32:52 +01:00
Stefan Seyfried
346dd72a3e use *_hal.h headers instead of *_td.h
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1bc874ddb5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-06 (Fri, 06 Feb 2015)


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

------------------
This commit was generated by Migit
2015-02-06 20:31:03 +01:00
Stefan Seyfried
2263c8bd2e Merge remote-tracking branch 'check/cst-next'
*needs buildfixing*

Conflicts:
	src/daemonc/Makefile.am
	src/daemonc/remotecontrol.cpp
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/driver/vfd.cpp
	src/gui/bedit/Makefile.am
	src/gui/components/Makefile.am
	src/gui/luainstance.cpp
	src/gui/widget/Makefile.am
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: b5a64e6887
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-26 (Mon, 26 Jan 2015)



------------------
This commit was generated by Migit
2015-01-26 17:26:26 +01:00
[CST] Focus
d8b0c41947 neutrino.cpp: try to fix timeshift stop/restart,
after quit from playback audioplayer, picture viewer and so on


Origin commit data
------------------
Branch: ni/coolstream
Commit: ecff984432
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-01-21 (Wed, 21 Jan 2015)



------------------
This commit was generated by Migit
2015-01-21 18:00:25 +03:00
Stefan Seyfried
c8e3ec41a9 Merge remote-tracking branch 'check/cst-next'
needs build- and functional fixes

Conflicts:
	configure.ac
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libmd5sum/md5.c
	src/driver/scanepg.cpp
	src/driver/streamts.cpp
	src/driver/vfd.cpp
	src/driver/vfd.h
	src/driver/volume.cpp
	src/eitd/dmx.cpp
	src/eitd/xmlutil.cpp
	src/gui/Makefile.am
	src/gui/audiomute.cpp
	src/gui/channellist.cpp
	src/gui/dboxinfo.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/hdd_menu.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/infoviewer_bb.h
	src/gui/keybind_setup.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/miscsettings_menu.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_progressbar_setup.cpp
	src/gui/osd_progressbar_setup.h
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/personalize.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/update_settings.cpp
	src/gui/user_menue.cpp
	src/gui/user_menue_setup.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/menue.h
	src/gui/widget/progresswindow.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/yhttpd.cpp
	src/system/helpers.cpp
	src/system/locals.h
	src/system/locals_intern.h
	src/system/setting_helpers.cpp
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/fastscan.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/scannit.cpp
	src/zapit/src/scanpmt.cpp
	src/zapit/src/transponder.cpp
	src/zapit/src/zapit.cpp


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



------------------
This commit was generated by Migit
2014-12-25 18:03:08 +01:00
[CST] Focus
db24abaa42 gui/movieplayer.cpp: fix timeshift mode flags
Origin commit data
------------------
Branch: ni/coolstream
Commit: 34d642a631
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-25 (Thu, 25 Sep 2014)


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

------------------
This commit was generated by Migit
2014-09-25 15:42:57 +04:00
martii
c3a494579d movieplayer: use #defines from record.h for timeshift
Conflicts:
	src/gui/movieplayer.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 540a060ba9
Author: martii <m4rtii@gmx.de>
Date: 2014-04-17 (Thu, 17 Apr 2014)



------------------
This commit was generated by Migit
2014-09-25 15:29:56 +04:00
Stefan Seyfried
8df9ff12cc Merge remote-tracking branch 'check/next-cc'
build-tested only, needs fixing

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/pluginlist.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/user_menue.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrinoMessages.h
	src/system/locals.h
	src/system/locals_intern.h
	src/zapit/include/zapit/scan.h
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 44ba8fafca
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)



------------------
This commit was generated by Migit
2014-04-27 19:14:06 +02:00
FlatTV
6997e249a8 record menu: add filename template
Origin commit data
------------------
Branch: ni/coolstream
Commit: e0055b5339
Author: FlatTV <FlatTV@gmx.de>
Date: 2014-03-13 (Thu, 13 Mar 2014)


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

------------------
This commit was generated by Migit
2014-03-14 09:39:57 +01:00
[CST] Focus
05d460b1cd driver/record.cpp: always use configured hours to record for temporary timeshift;
cleanup unused code


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8074000b23
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-03-11 (Tue, 11 Mar 2014)



------------------
This commit was generated by Migit
2014-03-11 16:22:50 +04:00
Stefan Seyfried
8fd167433a reduce direct dependencies on timerdclient.h
Include timerdtypes.h instead of timerdclient.h where feasible, add direct instead of indirect includes of timerdclient.h where necessary. This reduces the number of files which depend on timerdclient.h from 134 to 16. Add/update copyright notices in the affected files.


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



------------------
This commit was generated by Migit
2014-01-13 21:01:26 +01:00
Stefan Seyfried
f9a3dffb60 reduce direct dependencies on timerdclient.h
Include timerdtypes.h instead of timerdclient.h where feasible,
add direct instead of indirect includes of timerdclient.h where
necessary. This reduces the number of files which depend on
timerdclient.h from 134 to 16.
Add/update copyright notices in the affected files.


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



------------------
This commit was generated by Migit
2014-01-12 16:55:31 +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
7ebfe9959d convert most char[...] configuration values to std::string
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Branch: ni/coolstream
Commit: cbc9299df8
Author: martii <m4rtii@gmx.de>
Date: 2013-06-11 (Tue, 11 Jun 2013)



------------------
This commit was generated by Migit
2013-12-25 12:08:14 +01:00
Stefan Seyfried
7e692549d3 Merge branch 'check/next-cc'
again: it compiles, but is not really tested...

Conflicts:
	acinclude.m4
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/osd_setup.cpp
	src/gui/start_wizard.cpp
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7cfe54dc2f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-07-06 (Sat, 06 Jul 2013)



------------------
This commit was generated by Migit
2013-07-06 19:01:15 +02:00
Michael Liebmann
8c24f815a6 CRecordManager::ShowMenu: Fix display durations
- Save Option for CMenuForwarderNonLocalized in vector<std::string>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 84ab2cb555
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-07-04 (Thu, 04 Jul 2013)



------------------
This commit was generated by Migit
2013-07-04 07:45:52 +02:00
Michael Liebmann
c037349ef8 CRecordInstance::GetRecordString(): Fix calculation of duration
- Use locales for time string
- Show recording duration right aligned in stop menu


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0ce25a86d5
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-07-03 (Wed, 03 Jul 2013)



------------------
This commit was generated by Migit
2013-07-04 02:05:34 +02:00
Stefan Seyfried
00cfd31e82 neutrino: explicitly include vfd/lcd header
Instead of including it everywhere through global.h, just include
the lcd/vfd header where needed. Add a tiny helper header "display.h"
to divert between vfd.h (coolstream) and lcdd.h (everything else).


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6b72095f5a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-11 (Sat, 11 May 2013)



------------------
This commit was generated by Migit
2013-05-11 17:17:33 +02:00
Stefan Seyfried
7254e280e3 Merge branch 'check/pu-cc' into master
needs buildfixing...

Conflicts:
	data/Makefile.am
	src/driver/framebuffer.h
	src/driver/volume.cpp
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/filebrowser.cpp
	src/gui/imageinfo.cpp
	src/gui/infoviewer.cpp
	src/gui/streaminfo2.cpp
	src/gui/widget/textbox.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ad0b6b6dc
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)



------------------
This commit was generated by Migit
2013-04-06 11:21:55 +02:00
Jacek Jendrzej
33d542bbeb add record option for teletext & dvbsub pids
Origin commit data
------------------
Branch: ni/coolstream
Commit: b2241df43d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-03-19 (Tue, 19 Mar 2013)

Origin message was:
------------------
-add record option for teletext & dvbsub pids

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

------------------
This commit was generated by Migit
2013-04-01 15:07:05 +04:00