Jacek Jendrzej
2c5bf73006
Merge branch 'master' into pu/mp
2017-09-13 13:40:40 +02:00
Jacek Jendrzej
6576729fd1
remove double includes
2017-09-08 21:21:32 +02:00
Stefan Seyfried
eeee5bacab
Merge remote-tracking branch 'uncool/cst-next'
...
This need buildfixes and some functional updates...
2015-12-13 17:41:55 +01:00
Thilo Graf
a58f1621b4
Merge branch 'cst-next.pre' into cst-next
2015-04-30 09:20:43 +02:00
svenhoefer
9041bff59c
- remove w_max()-calls to define menu-width, because ...
...
w-max() returns a pixel-value, but menus need a percentage-value.
2015-04-24 09:11:04 +02:00
Thilo Graf
3599a4246f
CNetworkServiceSetup: use widget id instead explicit select method
...
neutrino_menue.h: add ID for network service menue
2015-03-29 22:40:00 +02:00
Stefan Seyfried
69c4dbbdba
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
2014-12-25 18:03:08 +01:00
[CST] Focus
acee2b402e
gui/network_service.cpp: fix shortcut in case of inactive items
2014-10-11 15:48:32 +04:00
martii
81ca577fb8
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
2014-09-24 19:50:35 +04:00
[CST] Focus
cf91f2eccb
merge neutrino-mp menu/buttons/icons changes, (C) martii
2014-07-17 17:02:25 +04:00
[CST] Focus
fc3e9ebd62
gui/network_service.cpp: add dropbear
2014-07-02 11:10:27 +04:00
[CST] Focus
ba754ba61a
gui/network_service.cpp: change djmount charset option to UTF-8
2014-07-02 11:10:23 +04:00
Stefan Seyfried
d244a5991a
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
2013-10-21 22:58:55 +02:00
[CST] Focus
6527334a0e
gui/network_service.cpp: add xupnpd service
2013-09-03 18:23:20 +04:00
Stefan Seyfried
988a8ebec2
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 >
2013-03-05 11:58:49 +01:00
Stefan Seyfried
96650cdd45
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.
2013-03-03 19:18:13 +01:00
Stefan Seyfried
7e23ac7223
Merge branch 'uncool/dvbsi++' commit '7ea3a20a808'
...
...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
2012-11-03 10:45:33 +01:00
[CST] Focus
1c6b35795e
gui/network_service.cpp: use sh -c to start network service
2012-11-02 18:08:23 +04:00
Stefan Seyfried
adb23b23ee
Merge branch 'uncool/dvbsi++' commit 'dc95ffa37c6'
...
...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
2012-10-14 12:51:07 +02:00
Stefan Seyfried
4009fea6d8
fix compilation with gcc-4.7 by including unistd.h
2012-10-06 17:32:45 +02:00
satbaby
bb2efeb45b
use my_system instead of system
2012-10-02 12:42:31 +02:00
satbaby
a3bfab0bcd
remove doubles include
2012-09-11 20:31:33 +02:00
satbaby
40941dd949
network_service.cpp: acitve menu only if binary available (tiny fix)
2012-07-13 16:20:56 +02:00
satbaby
df8dce2078
network_service.cpp: acitve menu only if binary available (thx snafed)
2012-07-12 19:07:02 +02:00
[CST] Focus
0dc164bc8e
Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++
2012-07-08 21:44:41 +04:00
[CST] Focus
f0c75cabad
gui/network_service.cpp: add menu hints
2012-07-08 21:39:47 +04:00
satbaby
d8cdb87e83
menue.cpp:-fix OSD on corners switch
2012-07-08 18:30:03 +02:00
[CST] Focus
c16ba5f32f
gui/network_service.cpp: simple network service menu
2012-06-26 16:48:29 +04:00
