Stefan Seyfried
13ac3b81eb
Merge remote-tracking branch 'check/next-cc'
...
Conflicts:
src/neutrino.cpp
Origin commit data
------------------
Commit: eca8f5459b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2014-01-19 (Sun, 19 Jan 2014)
2014-01-19 13:37:24 +01:00
Jacek Jendrzej
d7e91e68f6
CRecordInstance::FillMovieInfo supplement to 74310d137a
, check current epg before we take title from timer
...
Origin commit data
------------------
Commit: 14580b1dd1
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2014-01-18 (Sat, 18 Jan 2014)
2014-01-18 19:58:40 +01:00
Jacek Jendrzej
74310d137a
CRecordInstance::FillMovieInfo: -fix epg title if epgid removed http://www.dbox2world.net/board293-cst-coolstream/board314-cst-coolstream-development/12026-probleme-mit-timeraufnahme/
...
Origin commit data
------------------
Commit: 9455b0eeda
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2014-01-16 (Thu, 16 Jan 2014)
2014-01-16 20:58:14 +01:00
Stefan Seyfried
607f56ae80
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
------------------
Commit: 1d0a23dbf3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2014-01-13 (Mon, 13 Jan 2014)
2014-01-13 21:01:26 +01:00
Michael Liebmann
b3ef258294
CRecordInstance: Turns message when recording start/end on or off
...
Origin commit data
------------------
Commit: ae2a01a37a
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2014-01-13 (Mon, 13 Jan 2014)
2014-01-13 19:42:46 +01:00
Stefan Seyfried
a7b2bd7faf
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
------------------
Commit: ed818c7c14
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2014-01-12 (Sun, 12 Jan 2014)
2014-01-12 16:55:31 +01:00
Stefan Seyfried
ccc691278c
Merge remote-tracking branch 'check/next-cc'
...
Lightly tested only...
Origin commit data
------------------
Commit: cdd065fc2e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-12-25 (Wed, 25 Dec 2013)
2013-12-25 22:51:23 +01:00
martii
ce44d1641a
convert most char[...] configuration values to std::string
...
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com >
Origin commit data
------------------
Commit: cbc9299df8
Author: martii <m4rtii@gmx.de >
Date: 2013-06-11 (Tue, 11 Jun 2013)
2013-12-25 12:08:14 +01:00
vanhofen
d6c1108d7e
Revert "global.h: Use forward-declarations to reduce number of dependencies"
...
This reverts commit f2a2e699c2
.
Origin commit data
------------------
Commit: 3c8d47fa49
Author: vanhofen <vanhofen@gmx.de >
Date: 2013-11-13 (Wed, 13 Nov 2013)
2013-11-13 23:40:16 +01:00
Stefan Seyfried
261ea85af6
Merge branch 'check/next-cc'
...
Only compile-tested.
Origin commit data
------------------
Commit: 548448456a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-11-13 (Wed, 13 Nov 2013)
2013-11-13 14:04:15 +01:00
Stefan Seyfried
f2a2e699c2
global.h: Use forward-declarations to reduce number of dependencies
...
Origin commit data
------------------
Commit: 4bc6e43ad4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-11-13 (Wed, 13 Nov 2013)
2013-11-13 10:40:03 +01:00
[CST] Focus
d46cfee72d
driver/record.cpp: save added pids from pmt update;
...
add safe-check for max pids recorded
Origin commit data
------------------
Commit: 545f1dee6a
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2013-11-11 (Mon, 11 Nov 2013)
2013-11-11 14:07:03 +04:00
martii
1000ab9237
global.h: Use forward-declarations to reduce number of dependencies
...
[seife: amended to fix build]
Signed-off-by: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Origin commit data
------------------
Commit: 4eb66ba4b2
Author: martii <m4rtii@gmx.de >
Date: 2013-11-09 (Sat, 09 Nov 2013)
2013-11-09 17:03:03 +01:00
Stefan Seyfried
e6cbfe61bc
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
------------------
Commit: d244a5991a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-10-21 (Mon, 21 Oct 2013)
2013-10-21 22:58:55 +02:00
Jacek Jendrzej
ed7b7b4c5c
CGenPsi:: add EAC3 audio support, revork genpsi
...
Origin commit data
------------------
Commit: d92ad1de0d
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2013-10-09 (Wed, 09 Oct 2013)
2013-10-09 21:51:18 +02:00
[CST] Focus
74fd8f361f
neutrino: add EAC3 audio support
...
Origin commit data
------------------
Commit: 2e6276def7
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2013-10-08 (Tue, 08 Oct 2013)
2013-10-08 17:18:35 +04:00
defans
8ef7b3b117
show record icon for normale records
...
Origin commit data
------------------
Commit: 1af88c922b
Author: defans <defans@bluepeercrew.us >
Date: 2013-10-04 (Fri, 04 Oct 2013)
2013-10-04 23:22:37 +02:00
Stefan Seyfried
2c76238007
Merge remote-tracking branch 'check/next-cc'
...
needs buildfixing...
Conflicts:
src/eitd/sectionsd.cpp
src/gui/audioplayer.cpp
src/gui/bedit/bouqueteditor_channels.cpp
src/gui/infoclock.cpp
src/gui/infoviewer.cpp
src/gui/motorcontrol.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/widget/progresswindow.cpp
src/gui/widget/textbox.cpp
src/neutrino.cpp
src/zapit/include/zapit/femanager.h
Origin commit data
------------------
Commit: 32de6beef0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-09-01 (Sun, 01 Sep 2013)
2013-09-01 19:46:10 +02:00
[CST] Focus
762c3ba8b6
driver/record.cpp: check if pcr pid is not 0 before adding to record
...
Origin commit data
------------------
Commit: ad1a626844
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2013-08-12 (Mon, 12 Aug 2013)
2013-08-13 20:13:26 +04:00
[CST] Focus
913afc0293
driver/record.cpp, driver/scanepg.cpp, zapit/src/zapit.cpp: try to prevent race
...
while lock/allocate frontend in case of possible concurrent usage in neutrino and zapit threads
Origin commit data
------------------
Commit: cdb0e0ef21
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2013-08-12 (Mon, 12 Aug 2013)
2013-08-13 20:10:02 +04:00
Stefan Seyfried
fb1746543b
zapit,record: fix some really useless uses of float
...
Origin commit data
------------------
Commit: 9ef0db10d8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-08-11 (Sun, 11 Aug 2013)
2013-08-11 15:53:25 +02:00
Jacek Jendrzej
0daa94bfd7
streamts: add dvbsub and teletext pid to stream
...
Origin commit data
------------------
Commit: ada1ec3e60
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2013-08-08 (Thu, 08 Aug 2013)
2013-08-08 15:09:30 +02:00
Jacek Jendrzej
4746f01252
genpsi: add pcr pid handling
...
Origin commit data
------------------
Commit: 7a3b584920
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2013-08-01 (Thu, 01 Aug 2013)
2013-08-01 17:54:51 +02:00
Stefan Seyfried
6830b68cac
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
------------------
Commit: 7cfe54dc2f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-07-06 (Sat, 06 Jul 2013)
2013-07-06 19:01:15 +02:00
Michael Liebmann
06b4137634
CRecordManager::ShowMenu: Fix display durations
...
- Save Option for CMenuForwarderNonLocalized in vector<std::string>
Origin commit data
------------------
Commit: 84ab2cb555
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2013-07-04 (Thu, 04 Jul 2013)
2013-07-04 07:45:52 +02:00
Michael Liebmann
5712ef356f
CRecordInstance::GetRecordString(): Fix calculation of duration
...
- Use locales for time string
- Show recording duration right aligned in stop menu
Origin commit data
------------------
Commit: 0ce25a86d5
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2013-07-03 (Wed, 03 Jul 2013)
2013-07-04 02:05:34 +02:00
Stefan Seyfried
fce4dbbe72
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
------------------
Commit: d5d5a60261
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-06-16 (Sun, 16 Jun 2013)
2013-06-16 21:22:14 +02:00
[CST] Focus
3b93cec32b
driver/record.cpp: show record duration in xx hour yy min format
...
Origin commit data
------------------
Commit: df1fa6a6bf
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2013-05-15 (Wed, 15 May 2013)
2013-05-15 16:00:09 +04:00
Stefan Seyfried
f6c0718366
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
------------------
Commit: 8253c4d67c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-05-10 (Fri, 10 May 2013)
2013-05-10 10:06:47 +02:00
[CST] Focus
c54a1188b7
neutrino GUI: more places to disable anything record-related, if recording_type is RECORDING_OFF
...
Origin commit data
------------------
Commit: e14043dbfb
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2013-04-09 (Tue, 09 Apr 2013)
2013-04-09 18:37:25 +04:00
Stefan Seyfried
f1e664b75e
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
------------------
Commit: 5ad0b6b6dc
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-06 11:21:55 +02:00
[CST] Focus
297c368291
driver/record.cpp: add record duration to stop menu
...
Origin commit data
------------------
Commit: 1c2f2a5750
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2013-04-04 (Thu, 04 Apr 2013)
2013-04-05 14:54:22 +04:00
Jacek Jendrzej
4838903eb9
add record option for teletext & dvbsub pids
...
Origin commit data
------------------
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
2013-04-01 15:07:05 +04:00
[CST] Focus
07d13426d3
driver/record.cpp: use zapit client to stop Pip
...
Origin commit data
------------------
Commit: 84ce9f8880
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2013-03-27 (Wed, 27 Mar 2013)
2013-03-27 18:35:42 +04:00
[CST] Focus
28ee302d13
driver/record.cpp: dont show record starting/stopping window and stop menu,
...
if auto timeshift enabled
Origin commit data
------------------
Commit: 52cebc426e
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2013-03-26 (Tue, 26 Mar 2013)
2013-03-26 12:37:47 +04:00
Jacek Jendrzej
1caa128727
add record option for teletext & dvbsub pids
...
Origin commit data
------------------
Commit: d9c7739aa6
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2013-03-19 (Tue, 19 Mar 2013)
Origin message was:
------------------
-add record option for teletext & dvbsub pids
2013-03-19 17:14:04 +01:00
[CST] Focus
414a9a32b8
driver/record.cpp: change condition to stop PiP
...
Origin commit data
------------------
Commit: 76f50de569
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2013-03-13 (Wed, 13 Mar 2013)
2013-03-13 16:19:30 +04:00
[CST] Focus
a3aba8fba3
Merge branch 'next' of coolstreamtech.de:cst-public-gui-neutrino into next
...
Conflicts:
lib/libconfigfile/configfile.cpp
src/system/setting_helpers.cpp
src/zapit/src/femanager.cpp
Origin commit data
------------------
Commit: aa60c85768
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2013-03-07 (Thu, 07 Mar 2013)
2013-03-07 17:10:57 +04:00
[CST] Focus
ae4cae153a
use ENABLE_PIP for pip code
...
Origin commit data
------------------
Commit: cbfa6f88c5
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2013-03-05 (Tue, 05 Mar 2013)
2013-03-05 18:34:47 +04:00
Stefan Seyfried
9c0fbe8943
helpers: improve my_system function
...
Instead of hardcoding the maximum number of arguments to the
my_system helper, pass a variable argument list.
The function is deliberately source-incompatible with the old
implementation (as opposed to a variant with a sentinel NULL
argument, which would be compatible) to find all users and to
make sure that new future users of this function are not
overlooked during merges with other branches.
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com >
Origin commit data
------------------
Commit: 988a8ebec2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-03-03 (Sun, 03 Mar 2013)
2013-03-05 11:58:49 +01:00
Stefan Seyfried
811e75380e
helpers: improve my_system function
...
Instead of hardcoding the maximum number of arguments to the
my_system helper, pass a variable argument list.
The function is deliberately source-incompatible with the old
implementation (as opposed to a variant with a sentinel NULL
argument, which would be compatible) to find all users and to
make sure that new future users of this function are not
overlooked during merges with other branches.
Origin commit data
------------------
Commit: 96650cdd45
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-03-03 (Sun, 03 Mar 2013)
2013-03-03 19:18:13 +01:00
[CST] Focus
ddc00bba81
Merge branch 'pip' into next
...
Conflicts:
src/gui/channellist.cpp
Origin commit data
------------------
Commit: 69b4d366af
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2013-02-28 (Thu, 28 Feb 2013)
2013-02-28 16:45:41 +04:00
[CST] Focus
e15f1c4c72
Merge branch 'dvbsi++' into next
...
Conflicts:
src/neutrino.cpp
src/zapit/src/femanager.cpp
src/zapit/src/getservices.cpp
src/zapit/src/transponder.cpp
Origin commit data
------------------
Commit: 026592e8fe
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2013-02-28 (Thu, 28 Feb 2013)
2013-02-28 16:39:34 +04:00
[CST] Focus
868506726f
driver/record.cpp: stop PiP before starting record of current PiP channel
...
Origin commit data
------------------
Commit: a59d45bba2
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2013-02-27 (Wed, 27 Feb 2013)
2013-02-27 11:02:53 +04:00
Stefan Seyfried
80a87017f3
neutrino: fix 32<->64bit format string warnings
...
use portable C99 format string macros for 64bit types to
fix many warnings when compiling for 64bit architectures,
add some (int) casts for size_t
Origin commit data
------------------
Commit: 4dbeb3a31e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2012-11-03 (Sat, 03 Nov 2012)
2013-02-21 15:47:18 +01:00
[CST] Focus
e3046b34dd
driver/record.cpp: adapt to new frontend management
...
Origin commit data
------------------
Commit: bea14518a5
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2013-01-09 (Wed, 09 Jan 2013)
2013-01-09 15:41:43 +04:00
Stefan Seyfried
6e17b3f254
Merge branch 'uncool/dvbsi++' commit 610ce926f5
...
Conflicts:
src/gui/widget/hintboxext.cpp
src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
Origin commit data
------------------
Commit: f8f5467fdb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2012-12-30 (Sun, 30 Dec 2012)
2012-12-30 21:35:20 +01:00
Michael Liebmann
4fc47b65b0
Moviebrowser: Ask if the file of a running recording to be deleted.
...
Origin commit data
------------------
Commit: fefa483469
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2012-11-26 (Mon, 26 Nov 2012)
Origin message was:
------------------
* Moviebrowser: Ask if the file of a running recording to be deleted.
2012-11-26 15:03:58 +01:00
Stefan Seyfried
857402e3d4
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
------------------
Commit: c480e36746
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2012-11-11 (Sun, 11 Nov 2012)
2012-11-11 01:45:22 +01:00
[CST] Focus
9baad55796
driver/record.cpp: stop streaming before record start
...
Origin commit data
------------------
Commit: a2a6a7d5c8
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2012-11-08 (Thu, 08 Nov 2012)
2012-11-08 19:14:20 +04:00