Commit Graph

750 Commits

Author SHA1 Message Date
[CST] Focus
d0ccb2c97d 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
------------------
Branch: ni/coolstream
Commit: 026592e8fe
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-28 (Thu, 28 Feb 2013)



------------------
This commit was generated by Migit
2013-02-28 16:39:34 +04:00
[CST] Focus
25cfe121c6 Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++
Origin commit data
------------------
Branch: ni/coolstream
Commit: af5ead9f3f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-26 (Tue, 26 Feb 2013)


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

------------------
This commit was generated by Migit
2013-02-26 11:17:18 +04:00
Stefan Seyfried
66a4c73f2d configfile: don't do a full sync() after saving
Origin commit data
------------------
Branch: ni/coolstream
Commit: 804bed4e73
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-23 (Sat, 23 Feb 2013)


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

------------------
This commit was generated by Migit
2013-02-24 14:03:34 +01:00
Stefan Seyfried
6a10324417 configfile: reset modified flag after saving
Origin commit data
------------------
Branch: ni/coolstream
Commit: 809db6211e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-23 (Sat, 23 Feb 2013)


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

------------------
This commit was generated by Migit
2013-02-24 14:03:23 +01:00
Stefan Seyfried
c63da7e9a9 configfile: set the modified flag correctly on set*Vector methods
Origin commit data
------------------
Branch: ni/coolstream
Commit: 07a8027b4d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-23 (Sat, 23 Feb 2013)


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

------------------
This commit was generated by Migit
2013-02-24 14:03:11 +01:00
Stefan Seyfried
53db159ff4 configfile: don't do a full sync() after saving
Origin commit data
------------------
Branch: ni/coolstream
Commit: a5ccbbbd40
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-23 (Sat, 23 Feb 2013)


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

------------------
This commit was generated by Migit
2013-02-23 15:42:22 +01:00
Stefan Seyfried
776a300584 configfile: reset modified flag after saving
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5aca39874b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-23 (Sat, 23 Feb 2013)


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

------------------
This commit was generated by Migit
2013-02-23 15:36:02 +01:00
Stefan Seyfried
e7576360b9 configfile: set the modified flag correctly on set*Vector methods
Origin commit data
------------------
Branch: ni/coolstream
Commit: 593871bf0f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-23 (Sat, 23 Feb 2013)


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

------------------
This commit was generated by Migit
2013-02-23 15:34:47 +01:00
[CST] Focus
3b5e694bf7 libcoolstream2/dmx_cs.h: update header
Origin commit data
------------------
Branch: ni/coolstream
Commit: 81cf9c7afc
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-13 (Wed, 13 Feb 2013)


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

------------------
This commit was generated by Migit
2013-02-13 14:09:47 +04:00
[CST] Focus
b8f8b97318 lib/libcoolstream2: sync control headers
Origin commit data
------------------
Branch: ni/coolstream
Commit: ca3ac51881
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-18 (Fri, 18 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-18 16:53:40 +04:00
[CST] Focus
879a0f02e3 lib/libcoolstream2/video_cs.h: update apollo header
Origin commit data
------------------
Branch: ni/coolstream
Commit: 60b5c40d14
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 16:35:38 +04:00
Stefan Seyfried
b32ccc925c neutrino: enable screenshots
Origin commit data
------------------
Branch: ni/coolstream
Commit: a5ed005ff8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-01-13 (Sun, 13 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-13 18:49:37 +01:00
Stefan Seyfried
f7ff66caa1 tuxtxt: fix topmenu for small OSD borders
Origin commit data
------------------
Branch: ni/coolstream
Commit: dbf7f9719b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-01-13 (Sun, 13 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-13 17:36:41 +01:00
[CST] Focus
9fdd866a08 add libcoolstream/cs_frontpanel.h copy
Origin commit data
------------------
Branch: ni/coolstream
Commit: d3e2a2bdd0
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-11 (Fri, 11 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-11 15:14:12 +04:00
[CST] Focus
7a71072722 Merge branch 'dvbsi++' into next
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1db9531bdc
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-11 (Fri, 11 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-11 14:21:44 +04:00
[CST] Focus
46f1deca39 Makefiles.am: add conditional include for libcoolstream
Origin commit data
------------------
Branch: ni/coolstream
Commit: d3d2efe475
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-11 (Fri, 11 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-11 14:17:16 +04:00
[CST] Focus
64adae91d2 lib/libcoolstream: restore nevis headers
Origin commit data
------------------
Branch: ni/coolstream
Commit: 94c7e6854c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-11 (Fri, 11 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-11 14:00:49 +04:00
[CST] Focus
a4a26fdf55 lib/libcoolstream2: directory for apollo headers
Origin commit data
------------------
Branch: ni/coolstream
Commit: 58c1650b72
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-11 (Fri, 11 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-11 13:59:17 +04:00
[CST] Focus
90bddb9029 lib/libcoolstream: sync headers
Origin commit data
------------------
Branch: ni/coolstream
Commit: f92d9e6e57
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-11 (Fri, 11 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-11 11:10:58 +04:00
[CST] Focus
f71ed87e12 sync libcoolstream headers
Origin commit data
------------------
Branch: ni/coolstream
Commit: 311274b87c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-11 (Fri, 11 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-11 10:48:14 +04:00
[CST] Focus
0afd2ce386 merge public git changes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6e41c65fad
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-09 (Wed, 09 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-09 19:30:07 +04:00
Stefan Seyfried
99f4494aeb tuxtxt: fix width of topmenu box
Origin commit data
------------------
Branch: ni/coolstream
Commit: 09e0efb01e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-01-01 (Tue, 01 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-01 22:29:17 +01:00
Stefan Seyfried
8092abe045 fix nevis_ir.h check and libcoolstream/hwcaps
Origin commit data
------------------
Branch: ni/coolstream
Commit: acfd623d02
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-12-30 (Sun, 30 Dec 2012)


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

------------------
This commit was generated by Migit
2012-12-30 21:36:44 +01: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
Michael Liebmann
17acd0c414 Fix include path for moved header files
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2012-12-13 18:09:09 +01:00
vanhofen
ff6f6712df Merge remote-tracking branch 'svn_CROSSENVIRONMENT_coolstream/master' into dvbsi++
Origin commit data
------------------
Branch: ni/coolstream
Commit: da716f865e
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-12-13 (Thu, 13 Dec 2012)


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

------------------
This commit was generated by Migit
2012-12-13 10:50:49 +01:00
vanhofen
83736ed12e svn_CROSSENVIRONMENT_coolstream: move files to new right place
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2012-12-13 10:49:06 +01:00
[CST] Focus
e6c54be23b lib/libcoolstream/cnxtfb.h: header update
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5a3e41ff5d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-12-12 (Wed, 12 Dec 2012)


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

------------------
This commit was generated by Migit
2012-12-12 11:33:14 +04:00
[CST] Bas
8bf199565c neutrino: add TANK video modes (we only support RGB / YPBPR on both cinch and scart at the same time).
Origin commit data
------------------
Branch: ni/coolstream
Commit: b018c08cce
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-12-03 (Mon, 03 Dec 2012)


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

------------------
This commit was generated by Migit
2012-12-04 00:28:34 +08:00
[CST] Bas
e8ec24243f neutrino: add data and updated cnxtfb.h.
Origin commit data
------------------
Branch: ni/coolstream
Commit: b9478659dd
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-11-21 (Wed, 21 Nov 2012)


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

------------------
This commit was generated by Migit
2012-11-22 01:38:08 +08:00
[CST] Bas
89ee212755 neutrino: add new power manager header which adds destructor for cpu freq class.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1fa9244f91
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-11-13 (Tue, 13 Nov 2012)


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

------------------
This commit was generated by Migit
2012-11-13 12:41:18 +08:00
Stefan Seyfried
19000c33bd hw_caps: fix compile on coolstream
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1ae305953c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-10 (Sat, 10 Nov 2012)


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

------------------
This commit was generated by Migit
2012-11-10 22:53:48 +01:00
Stefan Seyfried
e9520a8b0e tuxtxt: fix build on generic pc, don't open framebuffer
Origin commit data
------------------
Branch: ni/coolstream
Commit: 475608c594
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
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 20:06:53 +01:00
Stefan Seyfried
1edd93f22b tuxtxt: use neutrino rcinput
Origin commit data
------------------
Branch: ni/coolstream
Commit: af6881a53c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
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 19:11:38 +01:00
Stefan Seyfried
a9bc076b45 sectionsdclient: correctly initialize CurrentNextInfo with c'tor
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9dc4b03248
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-31 (Wed, 31 Oct 2012)


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

------------------
This commit was generated by Migit
2012-10-31 22:58:58 +01:00
Stefan Seyfried
2d7685ca2c dvbsubtitle: free avcodec context in destructor
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5394321ea8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-31 (Wed, 31 Oct 2012)


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

------------------
This commit was generated by Migit
2012-10-31 22:57:51 +01:00
Stefan Seyfried
fcc5c347c3 suppress some basicclient valgrind warnings
To enable these paranoia memsets for testing, compile with
-DPEDANTIC_VALGRIND_SETUP. Probably more of not completely
initialized structs are present in other parts of the code.
This is probably not useful for productive builds.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8e46250c7c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-31 (Wed, 31 Oct 2012)



------------------
This commit was generated by Migit
2012-10-31 18:31:04 +01:00
Stefan Seyfried
0a7ec205c4 tuxtxt: fix direct access keys in menu
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1b5d92ca8a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-31 (Wed, 31 Oct 2012)


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

------------------
This commit was generated by Migit
2012-10-31 15:40:40 +01: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
[CST] Bas
89dd15ca8f Merge branch 'neutrino-apollo' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo
Conflicts:
	src/timerd/timermanager.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: a222240dbb
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-09-26 (Wed, 26 Sep 2012)



------------------
This commit was generated by Migit
2012-09-26 17:52:47 +08:00
[CST] Focus
06efdd2138 lib/libcoolstream/record_cs.h: update header
Origin commit data
------------------
Branch: ni/coolstream
Commit: 70836baa48
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-09-25 (Tue, 25 Sep 2012)


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

------------------
This commit was generated by Migit
2012-09-25 17:13:43 +04:00
[CST] Bas
52e2829082 Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo
Origin commit data
------------------
Branch: ni/coolstream
Commit: fbc512889f
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-09-24 (Mon, 24 Sep 2012)


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

------------------
This commit was generated by Migit
2012-09-24 15:28:48 +08: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
[CST] Focus
e44ee11353 Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9fdbdbd343
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-09-13 (Thu, 13 Sep 2012)


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

------------------
This commit was generated by Migit
2012-09-13 11:24:13 +04: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
[CST] Focus
b1f1858572 Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++
Origin commit data
------------------
Branch: ni/coolstream
Commit: 70e8c5d13a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-09-10 (Mon, 10 Sep 2012)


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

------------------
This commit was generated by Migit
2012-09-10 15:25:20 +04:00
[CST] Bas
e8de0b37ef Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo
Origin commit data
------------------
Branch: ni/coolstream
Commit: 688f464bb6
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-09-10 (Mon, 10 Sep 2012)


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

------------------
This commit was generated by Migit
2012-09-10 07:39:30 +08:00
vanhofen
f7e19eabc2 tuxtxt: fix creation of /var/tuxbox/config/tuxtxt/
Origin commit data
------------------
Branch: ni/coolstream
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/

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

------------------
This commit was generated by Migit
2012-09-05 23:42:10 +02:00
[CST] Focus
f33f31e1a4 lib/sectionsdclient/sectionsdclient.cpp,h: comment unused
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6eaa28449b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-08-30 (Thu, 30 Aug 2012)


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

------------------
This commit was generated by Migit
2012-08-30 15:55:32 +04:00
[CST] Focus
8058118ffd lib/sectionsdclient/sectionsdMsg.h: cleanup commands, comment unused
Origin commit data
------------------
Branch: ni/coolstream
Commit: a391bf3237
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-08-30 (Thu, 30 Aug 2012)


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

------------------
This commit was generated by Migit
2012-08-30 15:54:49 +04:00