Commit Graph

135 Commits

Author SHA1 Message Date
Stefan Seyfried
8c5267e9d5 helpers: add "backtick" function for shell-like command
Origin commit data
------------------
Branch: ni/coolstream
Commit: ce382cc2cb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-08 (Sun, 08 Feb 2015)


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

------------------
This commit was generated by Migit
2015-02-08 13:05:53 +01:00
Stefan Seyfried
552334b652 picview/png, my_popen: fix -Wclobbered warnings
Origin commit data
------------------
Branch: ni/coolstream
Commit: fe5a6ec111
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-26 (Mon, 26 Jan 2015)


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

------------------
This commit was generated by Migit
2015-02-04 12:35:51 +01:00
Stefan Seyfried
dd41d82ef5 picview/png, my_popen: fix -Wclobbered warnings
Origin commit data
------------------
Branch: ni/coolstream
Commit: 283a6c30eb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-26 (Mon, 26 Jan 2015)


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

------------------
This commit was generated by Migit
2015-01-26 19:30:23 +01:00
Stefan Seyfried
770e405c50 Merge remote-tracking branch 'check/cst-next'
Conflicts:
	src/daemonc/remotecontrol.cpp
	src/gui/luainstance.cpp
	src/gui/movieplayer.cpp
	src/gui/videosettings.cpp
	src/neutrino.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: d37b3c0f9a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-28 (Sun, 28 Dec 2014)



------------------
This commit was generated by Migit
2014-12-28 12:32:12 +01: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
Jacek Jendrzej
5293f9470a fix some possible errors
Origin commit data
------------------
Branch: ni/coolstream
Commit: d5d6c4de62
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-11-06 (Thu, 06 Nov 2014)


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

------------------
This commit was generated by Migit
2014-11-06 14:40:44 +01:00
martii
7470abe911 experimental yt cache (currently no gui integration)
Conflicts:
	src/gui/moviebrowser.cpp
	src/gui/movieinfo.cpp
	src/system/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: 70e5e66327
Author: martii <m4rtii@gmx.de>
Date: 2013-06-12 (Wed, 12 Jun 2013)



------------------
This commit was generated by Migit
2014-09-24 19:50:34 +04:00
martii
e06663874d system/helpers: add mkdirhier(); gui/themes: use mkdirhier()
Conflicts:
	src/system/helpers.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 431657e35d
Author: martii <m4rtii@gmx.de>
Date: 2014-01-06 (Mon, 06 Jan 2014)



------------------
This commit was generated by Migit
2014-09-12 15:59:21 +04:00
martii
fd5475886a gui/dboxinfo: localize (partially based on patch from Benny -- thanks!)
Conflicts:
	src/gui/dboxinfo.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 742760dbd3
Author: martii <m4rtii@gmx.de>
Date: 2014-05-24 (Sat, 24 May 2014)



------------------
This commit was generated by Migit
2014-09-11 18:12:06 +04:00
[CST] Focus
4eb5179286 neutrino: sync keybind and usermenu code with neutrino-mp, code (C) martii
Origin commit data
------------------
Branch: ni/coolstream
Commit: 420af7a4dc
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-05 (Fri, 05 Sep 2014)


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

------------------
This commit was generated by Migit
2014-09-05 17:49:11 +04:00
vanhofen
2e874500a6 helpers.cpp: add shortened strftime() function
taken from martiis neutrino-mp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 672257906e
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-05-29 (Thu, 29 May 2014)

Origin message was:
------------------
- helpers.cpp: add shortened strftime() function

 taken from martiis neutrino-mp


------------------
This commit was generated by Migit
2014-05-29 22:26:30 +02:00
Stefan Seyfried
8df9ff12cc Merge remote-tracking branch 'check/next-cc'
build-tested only, needs fixing

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/pluginlist.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/user_menue.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrinoMessages.h
	src/system/locals.h
	src/system/locals_intern.h
	src/zapit/include/zapit/scan.h
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 44ba8fafca
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)



------------------
This commit was generated by Migit
2014-04-27 19:14:06 +02:00
[CST] Focus
fee715d7d9 system/helpers.cpp: add split_config_string helper
Origin commit data
------------------
Branch: ni/coolstream
Commit: bef1b79bed
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-04-23 (Wed, 23 Apr 2014)


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

------------------
This commit was generated by Migit
2014-04-23 17:44:16 +04:00
Michael Liebmann
45c6c54fb7 src/system/helpers.cpp - htmlEntityDecode(): Add various html codes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 409df1b809
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-03-02 (Sun, 02 Mar 2014)


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

------------------
This commit was generated by Migit
2014-03-03 20:20:57 +01:00
Stefan Seyfried
7032385fd7 my_popen: fix indentation
Origin commit data
------------------
Branch: ni/coolstream
Commit: 04fd8c277c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-03-01 (Sat, 01 Mar 2014)


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

------------------
This commit was generated by Migit
2014-03-01 21:17:56 +01:00
Michael Liebmann
04530b5968 src/system/helpers.cpp: Add htmlEntityDecode() for decode html string
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0028ad0d9b
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-02-26 (Wed, 26 Feb 2014)


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

------------------
This commit was generated by Migit
2014-02-26 10:11:40 +01:00
Michael Liebmann
710f57bc83 src/system/helpers.cpp: Add str_replace() function
Origin commit data
------------------
Branch: ni/coolstream
Commit: 21f7c930ae
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-02-26 (Wed, 26 Feb 2014)


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

------------------
This commit was generated by Migit
2014-02-26 10:11:40 +01:00
Stefan Seyfried
ed5fac7d36 my_popen: fix indentation
Origin commit data
------------------
Branch: ni/coolstream
Commit: 76b0c36a28
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-23 (Sun, 23 Feb 2014)


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

------------------
This commit was generated by Migit
2014-02-23 17:24:19 +01:00
Stefan Seyfried
a3d104a600 Merge remote-tracking branch 'check/next-cc'
Origin commit data
------------------
Branch: ni/coolstream
Commit: f6d8c02313
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-19 (Wed, 19 Feb 2014)


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

------------------
This commit was generated by Migit
2014-02-19 11:29:29 +01:00
Jacek Jendrzej
be4bf0d96b wakeup_hdd: -fix warning -add mode to open
Origin commit data
------------------
Branch: ni/coolstream
Commit: f1c7e9002e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-02-18 (Tue, 18 Feb 2014)


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

------------------
This commit was generated by Migit
2014-02-18 14:59:11 +01:00
Stefan Seyfried
59b887d87a Merge remote-tracking branch 'check/next-cc'
...only build-tested, needs fixes


Origin commit data
------------------
Branch: ni/coolstream
Commit: ecd62d81d1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-15 (Sat, 15 Feb 2014)



------------------
This commit was generated by Migit
2014-02-15 20:22:07 +01:00
[CST] Focus
98748d9f51 system/helpers.cpp: change wakeup_hdd function to use hdd_get_standby/hdd_flush
Origin commit data
------------------
Branch: ni/coolstream
Commit: 10eb8869d6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-02-12 (Wed, 12 Feb 2014)


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

------------------
This commit was generated by Migit
2014-02-12 16:47:28 +04:00
[CST] Focus
9a9cac4674 system/helpers.cpp: add code to get hdd standby/active status and flush hdd buffers
Origin commit data
------------------
Branch: ni/coolstream
Commit: 097e05c083
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-02-05 (Wed, 05 Feb 2014)


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

------------------
This commit was generated by Migit
2014-02-05 14:02:46 +04:00
Stefan Seyfried
fe96831ba6 Merge remote-tracking branch 'check/next-cc'
Origin commit data
------------------
Branch: ni/coolstream
Commit: e9bc524562
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-27 (Mon, 27 Jan 2014)


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

------------------
This commit was generated by Migit
2014-01-27 21:00:18 +01:00
Michael Liebmann
af60d821cc helpers.cpp: fix find_executable
- function made the environment variable PATH broken


Origin commit data
------------------
Branch: ni/coolstream
Commit: 356feceb9c
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-27 (Mon, 27 Jan 2014)



------------------
This commit was generated by Migit
2014-01-27 13:37:32 +01:00
Stefan Seyfried
bc9ea621ff CFileHelpers::copyFile: remove duplicated code
there is no reason I can imagine to distinguish between
large and small files


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2c5e5c8a3f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-27 (Mon, 27 Jan 2014)



------------------
This commit was generated by Migit
2014-01-27 11:58:49 +01:00
Stefan Seyfried
648bd000a6 CFileHelpers: remove 'doCopyFlag' -- it's always true anyway
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7625d7782c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-27 (Mon, 27 Jan 2014)


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

------------------
This commit was generated by Migit
2014-01-27 11:33:55 +01:00
Stefan Seyfried
40f236846a helpers: add a function to find an executable in $PATH
Origin commit data
------------------
Branch: ni/coolstream
Commit: e37e425674
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-26 (Sun, 26 Jan 2014)


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

------------------
This commit was generated by Migit
2014-01-26 21:43:08 +01:00
Stefan Seyfried
9b1a44ccc2 helpers: add a function to find an executable in $PATH
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1867f687b8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-26 (Sun, 26 Jan 2014)


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

------------------
This commit was generated by Migit
2014-01-26 16:09:48 +01:00
Stefan Seyfried
003773490b Merge remote-tracking branch 'check/next-cc'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 56a7262d5d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-05 (Sun, 05 Jan 2014)


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

------------------
This commit was generated by Migit
2014-01-05 18:31:31 +01:00
Jacek Jendrzej
14cdfd14f7 move toEpoch to helpers.cpp, use strptime
Origin commit data
------------------
Branch: ni/coolstream
Commit: 52741fb1e4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-01-04 (Sat, 04 Jan 2014)


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

------------------
This commit was generated by Migit
2014-01-04 20:48:13 +01:00
Stefan Seyfried
464d5ab9b9 Merge remote-tracking branch 'check/next-cc'
Lightly tested only...


Origin commit data
------------------
Branch: ni/coolstream
Commit: cdd065fc2e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-25 (Wed, 25 Dec 2013)



------------------
This commit was generated by Migit
2013-12-25 22:51:23 +01:00
martii
a1eaaca64c more char* -> std::string conversions
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2cee6929d6
Author: martii <m4rtii@gmx.de>
Date: 2013-06-27 (Thu, 27 Jun 2013)



------------------
This commit was generated by Migit
2013-12-25 12:08:14 +01:00
Stefan Seyfried
6fae9a0db4 Merge remote-tracking branch 'check/next-cc'
untested, probably needs some buildfixing


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7d87ce9c54
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-22 (Sun, 22 Dec 2013)



------------------
This commit was generated by Migit
2013-12-22 21:25:05 +01:00
Jacek Jendrzej
528c96dca0 use mySleep in CComponentsFrmClock::initClockThread(
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Branch: ni/coolstream
Commit: ececd844fa
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-12-15 (Sun, 15 Dec 2013)



------------------
This commit was generated by Migit
2013-12-15 17:40:32 +01:00
Stefan Seyfried
ea50f5f7bc Merge branch 'check/next-cc'
Only compile-tested.


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



------------------
This commit was generated by Migit
2013-11-30 20:17:31 +01:00
vanhofen
32bde2f841 helpers.cpp: port safe_mkdir() from martii
Origin commit data
------------------
Branch: ni/coolstream
Commit: 57267a28aa
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-22 (Fri, 22 Nov 2013)

Origin message was:
------------------
- helpers.cpp: port safe_mkdir() from martii

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

------------------
This commit was generated by Migit
2013-11-22 12:35:20 +01:00
vanhofen
2b6a6c4898 helpers.cpp: simplify check_dir(); ported from martii
Origin commit data
------------------
Branch: ni/coolstream
Commit: 44cddc05d9
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-22 (Fri, 22 Nov 2013)

Origin message was:
------------------
- helpers.cpp: simplify check_dir(); ported from martii

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

------------------
This commit was generated by Migit
2013-11-22 12:10:26 +01: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
Michael Liebmann
9221700b3d Fix compiler warnings (-Wconversion)
Origin commit data
------------------
Branch: ni/coolstream
Commit: b645b644b0
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-10-08 (Tue, 08 Oct 2013)


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

------------------
This commit was generated by Migit
2013-10-10 01:58:37 +02:00
Michael Liebmann
981702930d src/system/helpers.cpp: Replace wrong data types in get_fs_usage()
- Change from 'long' to 'uint64_t'
- src/Makefile.am: Add -D_FILE_OFFSET_BITS=64 to AM_CPPFLAGS


Origin commit data
------------------
Branch: ni/coolstream
Commit: 36f3579df6
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-10-07 (Mon, 07 Oct 2013)



------------------
This commit was generated by Migit
2013-10-10 01:58:37 +02:00
Jacek Jendrzej
07ccabf7c3 CUpdateSettings:: allow choose tmp(ramfs,TMPFS_MAGIC) as update dir
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6f07cbe3dd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-10-08 (Tue, 08 Oct 2013)

Origin message was:
------------------
CUpdateSettings:: allow choose tmp(ramfs,TMPFS_MAGIC) as update dir

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

------------------
This commit was generated by Migit
2013-10-08 10:10:10 +02:00
Stefan Seyfried
8edaa32e4f system/helpers: add missing include
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0c939250c2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-01 (Sun, 01 Sep 2013)


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

------------------
This commit was generated by Migit
2013-09-01 20:09:54 +02:00
Stefan Seyfried
2dcc32acd2 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
------------------
Branch: ni/coolstream
Commit: 32de6beef0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-01 (Sun, 01 Sep 2013)



------------------
This commit was generated by Migit
2013-09-01 19:46:10 +02:00
Michael Liebmann
26a05097b5 helpers.cpp: Add getFileName(), getFileExt(), getNowTimeStr()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5d77f01b5d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-08-07 (Wed, 07 Aug 2013)


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

------------------
This commit was generated by Migit
2013-08-08 14:09:47 +02:00
Stefan Seyfried
7e692549d3 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
------------------
Branch: ni/coolstream
Commit: 7cfe54dc2f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-07-06 (Sat, 06 Jul 2013)



------------------
This commit was generated by Migit
2013-07-06 19:01:15 +02:00
Michael Liebmann
9e36a9e529 src/system/helpers.cpp: Add getBaseName() and getPathName()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 767ff03d98
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-07-03 (Wed, 03 Jul 2013)


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

------------------
This commit was generated by Migit
2013-07-03 07:30:09 +02:00
Stefan Seyfried
07ccb9a351 Merge remote-tracking branch 'check/next-cc'
needs buildfixing in framebuffer class...

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/fontrenderer.cpp
	src/driver/volume.cpp
	src/gui/audiomute.cpp
	src/gui/audioplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: a7f1e0e25e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-24 (Fri, 24 May 2013)



------------------
This commit was generated by Migit
2013-05-24 20:24:39 +02:00
Jacek Jendrzej
2fbf843d79 CFileHelpers::copyFile - prevent possible compile error
Origin commit data
------------------
Branch: ni/coolstream
Commit: 476b896972
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-05-20 (Mon, 20 May 2013)

Origin message was:
------------------
CFileHelpers::copyFile - prevent possible compile error

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

------------------
This commit was generated by Migit
2013-05-20 12:07:04 +02:00
Stefan Seyfried
083bc55347 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
------------------
Branch: ni/coolstream
Commit: 8253c4d67c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-10 (Fri, 10 May 2013)



------------------
This commit was generated by Migit
2013-05-10 10:06:47 +02:00