Commit Graph

28 Commits

Author SHA1 Message Date
vanhofen
88d02d6b60 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4bc4a80094
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-09 (Sat, 09 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-09 08:44:18 +02:00
Jacek Jendrzej
a67cecd575 remove double includes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6576729fd1
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-08 (Fri, 08 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-08 21:21:32 +02: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
Thilo Graf
946c0e8bc4 Merge branch 'cst-next.pre' into cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: a58f1621b4
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-04-30 (Thu, 30 Apr 2015)


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

------------------
This commit was generated by Migit
2015-04-30 09:20:43 +02:00
vanhofen
32365276ef remove w_max()-calls to define menu-width, because ...
w-max() returns a pixel-value, but menus need a percentage-value.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9041bff59c
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-04-24 (Fri, 24 Apr 2015)

Origin message was:
------------------
- remove w_max()-calls to define menu-width, because ...

 w-max() returns a pixel-value, but menus need a percentage-value.


------------------
This commit was generated by Migit
2015-04-24 09:11:04 +02:00
Thilo Graf
c483018bf6 CNetworkServiceSetup: use widget id instead explicit select method
neutrino_menue.h: add ID for network service menue


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3599a4246f
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-12-08 (Mon, 08 Dec 2014)



------------------
This commit was generated by Migit
2015-03-29 22:40:00 +02: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
e4f74753ee gui/network_service.cpp: fix shortcut in case of inactive items
Origin commit data
------------------
Branch: ni/coolstream
Commit: acee2b402e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-11 (Sat, 11 Oct 2014)


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

------------------
This commit was generated by Migit
2014-10-11 15:48:32 +04:00
martii
070b342de4 overload access(2)
Conflicts:
	src/driver/pictureviewer/pictureviewer.cpp
	src/gui/components/cc_item_picture.cpp
	src/gui/movieplayer.cpp
	src/gui/osdlang_setup.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/neutrinoapi.cpp
	src/nhttpd/yhttpd.cpp
	src/system/helpers.h
	src/system/setting_helpers.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 81ca577fb8
Author: martii <m4rtii@gmx.de>
Date: 2013-06-30 (Sun, 30 Jun 2013)



------------------
This commit was generated by Migit
2014-09-24 19:50:35 +04:00
[CST] Focus
5ee14dabdd merge neutrino-mp menu/buttons/icons changes, (C) martii
Origin commit data
------------------
Branch: ni/coolstream
Commit: cf91f2eccb
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-07-17 (Thu, 17 Jul 2014)


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

------------------
This commit was generated by Migit
2014-07-17 17:02:25 +04:00
[CST] Focus
7a88703a8b gui/network_service.cpp: add dropbear
Origin commit data
------------------
Branch: ni/coolstream
Commit: fc3e9ebd62
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-06-19 (Thu, 19 Jun 2014)


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

------------------
This commit was generated by Migit
2014-07-02 11:10:27 +04:00
[CST] Focus
0157f1d448 gui/network_service.cpp: change djmount charset option to UTF-8
Origin commit data
------------------
Branch: ni/coolstream
Commit: ba754ba61a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-06-18 (Wed, 18 Jun 2014)


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

------------------
This commit was generated by Migit
2014-07-02 11:10:23 +04:00
Stefan Seyfried
971d575b78 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
------------------
Branch: ni/coolstream
Commit: d244a5991a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-10-21 (Mon, 21 Oct 2013)



------------------
This commit was generated by Migit
2013-10-21 22:58:55 +02:00
[CST] Focus
32959b159b gui/network_service.cpp: add xupnpd service
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6527334a0e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-09-03 (Tue, 03 Sep 2013)


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

------------------
This commit was generated by Migit
2013-09-03 18:23:20 +04:00
Stefan Seyfried
767be83e22 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
------------------
Branch: ni/coolstream
Commit: 988a8ebec2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-03 (Sun, 03 Mar 2013)



------------------
This commit was generated by Migit
2013-03-05 11:58:49 +01:00
Stefan Seyfried
4324865fb6 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
------------------
Branch: ni/coolstream
Commit: 96650cdd45
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-03 (Sun, 03 Mar 2013)



------------------
This commit was generated by Migit
2013-03-03 19:18:13 +01:00
Stefan Seyfried
58ca3266e7 Merge branch 'uncool/dvbsi++' commit '9d1444a8df5'
...needs buildfixing...

Conflicts:
	data/Makefile.am
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7e23ac7223
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-03 (Sat, 03 Nov 2012)



------------------
This commit was generated by Migit
2012-11-03 10:45:33 +01:00
[CST] Focus
3ac4295286 gui/network_service.cpp: use sh -c to start network service
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1c6b35795e
Author: [CST] Focus <focus.cst@gmail.com>
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 18:08:23 +04: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
Stefan Seyfried
d26c759aa9 fix compilation with gcc-4.7 by including unistd.h
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4009fea6d8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-06 (Sat, 06 Oct 2012)


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

------------------
This commit was generated by Migit
2012-10-06 17:32:45 +02:00
Jacek Jendrzej
47adab931b use my_system instead of system
Origin commit data
------------------
Branch: ni/coolstream
Commit: bb2efeb45b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-10-02 (Tue, 02 Oct 2012)


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

------------------
This commit was generated by Migit
2012-10-02 12:42:31 +02: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
Jacek Jendrzej
6e64d5e2ed network_service.cpp: acitve menu only if binary available (tiny fix)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 40941dd949
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-07-13 (Fri, 13 Jul 2012)


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

------------------
This commit was generated by Migit
2012-07-13 16:20:56 +02:00
Jacek Jendrzej
4747aa4a2d network_service.cpp: acitve menu only if binary available (thx snafed)
Origin commit data
------------------
Branch: ni/coolstream
Commit: df8dce2078
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)


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

------------------
This commit was generated by Migit
2012-07-12 19:07:02 +02:00
[CST] Focus
2053ef1fdc Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0dc164bc8e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-07-08 (Sun, 08 Jul 2012)


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

------------------
This commit was generated by Migit
2012-07-08 21:44:41 +04:00
[CST] Focus
e1a223a2d7 gui/network_service.cpp: add menu hints
Origin commit data
------------------
Branch: ni/coolstream
Commit: f0c75cabad
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-07-08 (Sun, 08 Jul 2012)


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

------------------
This commit was generated by Migit
2012-07-08 21:39:47 +04:00
Jacek Jendrzej
90c718c305 menue.cpp:-fix OSD on corners switch
Origin commit data
------------------
Branch: ni/coolstream
Commit: d8cdb87e83
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-07-08 (Sun, 08 Jul 2012)


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

------------------
This commit was generated by Migit
2012-07-08 18:30:03 +02:00
[CST] Focus
a1b84f92ad gui/network_service.cpp: simple network service menu
Origin commit data
------------------
Branch: ni/coolstream
Commit: c16ba5f32f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)


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

------------------
This commit was generated by Migit
2012-06-26 16:48:29 +04:00