Commit Graph

257 Commits

Author SHA1 Message Date
[CST] Focus
a848a5b8a4 libcoolstream/ca_cs.h: sync header
Origin commit data
------------------
Commit: 138160ae4f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-08 (Fri, 08 Mar 2013)
2013-03-08 17:56:03 +04:00
[CST] Focus
6aab5eae1b lib/libcoolstream/video_cs.h: sync header
Origin commit data
------------------
Commit: 30d650999d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-08 (Fri, 08 Mar 2013)
2013-03-08 17:33:28 +04:00
[CST] Focus
1febf10efb libconfigfile/configfile.cpp: fix typo while merging
Origin commit data
------------------
Commit: 9dcf32cdd2
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-07 (Thu, 07 Mar 2013)
2013-03-07 17:20:53 +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
Stefan Seyfried
94b1023952 libconfigfile: fix strange problem in last commit
for unexplained reasons, tmpfile was sometimes empty :-(
to work around that, use std::string instead of const char *

Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Commit: ec58530ae4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-03 (Sun, 03 Mar 2013)
2013-03-05 11:05:47 +01:00
Stefan Seyfried
08506822e2 libconfigfile: update config file atomically when saving
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Commit: 2afc06a793
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-03 (Sun, 03 Mar 2013)
2013-03-05 11:05:38 +01:00
[CST] Focus
0bd81ebb9a lib/libconfigfile/configfile.cpp:
fix efc75aa987 - at least with uclibc it refuse to save
conf file which not exist


Origin commit data
------------------
Commit: a0aeffb5ad
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-01 (Fri, 01 Mar 2013)
2013-03-01 08:31:21 +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
ee6a37fd2c Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++
Origin commit data
------------------
Commit: af5ead9f3f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-26 (Tue, 26 Feb 2013)
2013-02-26 11:17:18 +04:00
Stefan Seyfried
efc75aa987 configfile: don't do a full sync() after saving
Origin commit data
------------------
Commit: 804bed4e73
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-23 (Sat, 23 Feb 2013)
2013-02-24 14:03:34 +01:00
Stefan Seyfried
5ec3568ad7 configfile: reset modified flag after saving
Origin commit data
------------------
Commit: 809db6211e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-23 (Sat, 23 Feb 2013)
2013-02-24 14:03:23 +01:00
Stefan Seyfried
84a1f6d72b configfile: set the modified flag correctly on set*Vector methods
Origin commit data
------------------
Commit: 07a8027b4d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-23 (Sat, 23 Feb 2013)
2013-02-24 14:03:11 +01:00
[CST] Focus
729d75819e libcoolstream2/dmx_cs.h: update header
Origin commit data
------------------
Commit: 81cf9c7afc
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-13 (Wed, 13 Feb 2013)
2013-02-13 14:09:47 +04:00
[CST] Focus
c9907de31c lib/libcoolstream2: sync control headers
Origin commit data
------------------
Commit: ca3ac51881
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-18 (Fri, 18 Jan 2013)
2013-01-18 16:53:40 +04:00
[CST] Focus
cdfd17715e lib/libcoolstream2/video_cs.h: update apollo header
Origin commit data
------------------
Commit: 60b5c40d14
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-16 (Wed, 16 Jan 2013)
2013-01-16 16:35:38 +04:00
[CST] Focus
d7e8f0ae5c add libcoolstream/cs_frontpanel.h copy
Origin commit data
------------------
Commit: d3e2a2bdd0
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-11 (Fri, 11 Jan 2013)
2013-01-11 15:14:12 +04:00
[CST] Focus
86d47aff81 Merge branch 'dvbsi++' into next
Origin commit data
------------------
Commit: 1db9531bdc
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-11 (Fri, 11 Jan 2013)
2013-01-11 14:21:44 +04:00
[CST] Focus
542ce7e399 Makefiles.am: add conditional include for libcoolstream
Origin commit data
------------------
Commit: d3d2efe475
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-11 (Fri, 11 Jan 2013)
2013-01-11 14:17:16 +04:00
[CST] Focus
146f595ba1 lib/libcoolstream: restore nevis headers
Origin commit data
------------------
Commit: 94c7e6854c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-11 (Fri, 11 Jan 2013)
2013-01-11 14:00:49 +04:00
[CST] Focus
32a07c2189 lib/libcoolstream2: directory for apollo headers
Origin commit data
------------------
Commit: 58c1650b72
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-11 (Fri, 11 Jan 2013)
2013-01-11 13:59:17 +04:00
[CST] Focus
1132007058 lib/libcoolstream: sync headers
Origin commit data
------------------
Commit: f92d9e6e57
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-11 (Fri, 11 Jan 2013)
2013-01-11 11:10:58 +04:00
[CST] Focus
4e5e5edd63 sync libcoolstream headers
Origin commit data
------------------
Commit: 311274b87c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-11 (Fri, 11 Jan 2013)
2013-01-11 10:48:14 +04:00
[CST] Focus
d3a71db0b1 merge public git changes
Origin commit data
------------------
Commit: 6e41c65fad
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-09 (Wed, 09 Jan 2013)
2013-01-09 19:30:07 +04:00
Michael Liebmann
7332aea363 Fix include path for moved header files
Origin commit data
------------------
Commit: b1138e16b0
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-12-13 (Thu, 13 Dec 2012)

Origin message was:
------------------
* Fix include path for moved header files
2012-12-13 18:09:09 +01:00
vanhofen
e56bfda536 Merge remote-tracking branch 'svn_CROSSENVIRONMENT_coolstream/master' into dvbsi++
Origin commit data
------------------
Commit: da716f865e
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-12-13 (Thu, 13 Dec 2012)
2012-12-13 10:50:49 +01:00
vanhofen
cefc77b6ed svn_CROSSENVIRONMENT_coolstream: move files to new right place
Origin commit data
------------------
Commit: 998ae6d81d
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-12-13 (Thu, 13 Dec 2012)

Origin message was:
------------------
- svn_CROSSENVIRONMENT_coolstream: move files to new right place
2012-12-13 10:49:06 +01:00
[CST] Focus
949c82ec33 lib/libcoolstream/cnxtfb.h: header update
Origin commit data
------------------
Commit: 5a3e41ff5d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-12-12 (Wed, 12 Dec 2012)
2012-12-12 11:33:14 +04:00
[CST] Bas
2da2954b72 neutrino: add TANK video modes (we only support RGB / YPBPR on both cinch and scart at the same time).
Origin commit data
------------------
Commit: b018c08cce
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-12-03 (Mon, 03 Dec 2012)
2012-12-04 00:28:34 +08:00
[CST] Bas
08cc9eb85f neutrino: add data and updated cnxtfb.h.
Origin commit data
------------------
Commit: b9478659dd
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-11-21 (Wed, 21 Nov 2012)
2012-11-22 01:38:08 +08:00
[CST] Bas
22cf2d5e09 neutrino: add new power manager header which adds destructor for cpu freq class.
Origin commit data
------------------
Commit: 1fa9244f91
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-11-13 (Tue, 13 Nov 2012)
2012-11-13 12:41:18 +08:00
[CST] Bas
8965dc519f Merge branch 'neutrino-apollo' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo
Conflicts:
	src/timerd/timermanager.cpp


Origin commit data
------------------
Commit: a222240dbb
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-09-26 (Wed, 26 Sep 2012)
2012-09-26 17:52:47 +08:00
[CST] Focus
68c88f51fd lib/libcoolstream/record_cs.h: update header
Origin commit data
------------------
Commit: 70836baa48
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-09-25 (Tue, 25 Sep 2012)
2012-09-25 17:13:43 +04:00
[CST] Bas
8b523be32e Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo
Origin commit data
------------------
Commit: fbc512889f
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-09-24 (Mon, 24 Sep 2012)
2012-09-24 15:28:48 +08:00
[CST] Focus
6b6d864e27 Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++
Origin commit data
------------------
Commit: 9fdbdbd343
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-09-13 (Thu, 13 Sep 2012)
2012-09-13 11:24:13 +04:00
Jacek Jendrzej
9868a4308b remove doubles include
Origin commit data
------------------
Commit: a3bfab0bcd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-09-11 (Tue, 11 Sep 2012)
2012-09-11 20:31:33 +02:00
[CST] Focus
fe9407b2f0 Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++
Origin commit data
------------------
Commit: 70e8c5d13a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-09-10 (Mon, 10 Sep 2012)
2012-09-10 15:25:20 +04:00
[CST] Bas
eedca08625 Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo
Origin commit data
------------------
Commit: 688f464bb6
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-09-10 (Mon, 10 Sep 2012)
2012-09-10 07:39:30 +08:00
vanhofen
df315c7b0f tuxtxt: fix creation of /var/tuxbox/config/tuxtxt/
Origin commit data
------------------
Commit: 1e1a3265e6
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-09-05 (Wed, 05 Sep 2012)

Origin message was:
------------------
- tuxtxt: fix creation of /var/tuxbox/config/tuxtxt/
2012-09-05 23:42:10 +02:00
[CST] Focus
8549fc8e32 lib/sectionsdclient/sectionsdclient.cpp,h: comment unused
Origin commit data
------------------
Commit: 6eaa28449b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-08-30 (Thu, 30 Aug 2012)
2012-08-30 15:55:32 +04:00
[CST] Focus
cd2a68aa90 lib/sectionsdclient/sectionsdMsg.h: cleanup commands, comment unused
Origin commit data
------------------
Commit: a391bf3237
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-08-30 (Thu, 30 Aug 2012)
2012-08-30 15:54:49 +04:00
Jacek Jendrzej
e8d09336e4 tuxtxt.h: remove unnecessary header
Origin commit data
------------------
Commit: 9a889e1496
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-08-21 (Tue, 21 Aug 2012)
2012-08-21 14:06:18 +02:00
[CST] Focus
179b0a02e1 lib/libnet/libnet.c: fix unused variable warning
Origin commit data
------------------
Commit: c5f4c53fb7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-08-04 (Sat, 04 Aug 2012)
2012-08-04 14:14:08 +04:00
Jacek Jendrzej
41e57ce7bc comment out never used
Origin commit data
------------------
Commit: 9124c20f31
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-08-04 (Sat, 04 Aug 2012)
2012-08-04 10:03:19 +02:00
[CST] Focus
68773d8e37 recording: testing support for multi-record of the same channel, new libs required
Origin commit data
------------------
Commit: f8aa4262cb
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-08-03 (Fri, 03 Aug 2012)
2012-08-03 20:00:04 +04:00
Jacek Jendrzej
55216499fa fix gcc 4.7.x warnings
Origin commit data
------------------
Commit: df2ab71978
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-07-09 (Mon, 09 Jul 2012)
2012-07-09 09:26:37 +02:00
[CST] Bas
2ced7346c2 neutrino-apollo: changes for apollo uclibc.
Origin commit data
------------------
Commit: cf878686ba
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-07-09 (Mon, 09 Jul 2012)
2012-07-09 11:58:15 +08:00
Jacek Jendrzej
803674f9df fix gcc 4.7.x warnings
Origin commit data
------------------
Commit: 060c1c45b2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-07-07 (Sat, 07 Jul 2012)
2012-07-07 13:09:08 +02:00
[CST] Focus
453fa4459b Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++
Origin commit data
------------------
Commit: b15a335144
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-06-18 (Mon, 18 Jun 2012)
2012-06-18 20:04:58 +04:00
Jacek Jendrzej
62163fa4e5 use empty() instead of size()
Origin commit data
------------------
Commit: 7d8d995046
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-06-18 (Mon, 18 Jun 2012)

Origin message was:
------------------
 use empty() instead of size()
2012-06-18 16:57:44 +02:00
[CST] Focus
28bb3bbea1 remove obsolete lib/controldclient/
Origin commit data
------------------
Commit: 954dc274b4
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-06-14 (Thu, 14 Jun 2012)
2012-06-14 18:00:33 +04:00