mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-14 08:53:38 +02:00
Code Issues Packages Projects Releases Wiki Activity
8,337 Commits 2 Branches 9 Tags
37e8a954b9264e18bcefe41d07eb2efe70c93b00
Commit Graph

257 Commits

Author SHA1 Message Date
Jacek Jendrzej
d339fff93d neutrino use check empty() instead of length() or size() 
Origin commit data
------------------
Commit: 8023a6317b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-01-03 (Sat, 03 Jan 2015)
 2015-01-03 17:51:08 +01:00
Stefan Seyfried
fc4d99cf6b movieplayer: fix invalid casts for debug messages 
Origin commit data
------------------
Commit: bfdeda0983
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)
 2015-01-02 21:00:11 +01:00
Stefan Seyfried
d1e2143fd6 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
------------------
Commit: d37b3c0f9a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-28 (Sun, 28 Dec 2014)
 2014-12-28 12:32:12 +01:00
Stefan Seyfried
ee81883311 movieplayer: fix invalid casts for debug messages 
Origin commit data
------------------
Commit: 334eb8eb6d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)
 2014-12-25 18:18:56 +01:00
Stefan Seyfried
ec1a9fce17 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
------------------
Commit: 69c4dbbdba
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)
 2014-12-25 18:03:08 +01:00
vanhofen
9676483657 movieplayer: disable clock and mute while playlist_manager 
Origin commit data
------------------
Commit: dbd4f77332
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-26 (Wed, 26 Nov 2014)

Origin message was:
------------------
- movieplayer: disable clock and mute while playlist_manager
 2014-11-26 10:23:21 +01:00
TangoCash
b2884d8028 movieplayer: add playlist_manager 
NOTE: This is a merge of several patches by TangoCash
 for neutrino-mp aligned to neutrino-hd.
 We use 'play' key to open playlist_manager.


Origin commit data
------------------
Commit: dfc7a1d304
Author: TangoCash <eric@loxat.de>
Date: 2014-11-26 (Wed, 26 Nov 2014)

Origin message was:
------------------
- movieplayer: add playlist_manager

NOTE: This is a merge of several patches by TangoCash
   for neutrino-mp aligned to neutrino-hd.
   We use 'play' key to open playlist_manager.
 2014-11-26 10:23:21 +01:00
[CST] Focus
b1cc6b3202 gui/movieplayer.cpp: try to remove extra live start on movie stop 
Origin commit data
------------------
Commit: cb804f37cd
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-11-18 (Tue, 18 Nov 2014)
 2014-11-19 11:35:00 +03:00
[CST] Focus
cfeb0036dc neutrino: try to fix parental bypass by 
quit from audio player / picture viewer / movie player and starting channel in PiP


Origin commit data
------------------
Commit: 5bd14ea4b8
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-11-11 (Tue, 11 Nov 2014)
 2014-11-11 14:40:52 +03:00
[CST] Focus
4ebdce0041 gui/movieplayer.cpp: fix volume values in audio selection 
Origin commit data
------------------
Commit: 493098040d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-11-09 (Sun, 09 Nov 2014)
 2014-11-11 14:40:52 +03:00
[CST] Focus
4ec1243a30 gui/movieplayer.cpp: fix file info display, 
bug from commit 7bf0c37de4


Origin commit data
------------------
Commit: 6586588409
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-11-05 (Wed, 05 Nov 2014)
 2014-11-05 16:37:03 +03:00
Jacek Jendrzej
2975355d08 CMoviePlayerGui::selectAudioPid() add Analog Audio on/off option 
Origin commit data
------------------
Commit: 592e0ed631
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-11-04 (Tue, 04 Nov 2014)
 2014-11-05 09:20:02 +01:00
[CST] Focus
7bf0c37de4 gui/movieplayer.cpp: fix old file info display in infoviewer 
Origin commit data
------------------
Commit: 95ac729ff6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-17 (Fri, 17 Oct 2014)
 2014-10-17 15:45:15 +04:00
[CST] Focus
fbe1aadb8a Revert "- movieplayer: ask before stop temporary timeshift" 
This reverts commit 808d50120d.

Conflicts:
	src/gui/movieplayer.cpp


Origin commit data
------------------
Commit: ed6816068c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-01 (Wed, 01 Oct 2014)
 2014-10-01 16:09:46 +04:00
[CST] Focus
244521fb0a gui/movieplayer.cpp: try to fix 'always seek to 0' 
Origin commit data
------------------
Commit: 67db470798
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-01 (Wed, 01 Oct 2014)
 2014-10-01 16:06:52 +04:00
[CST] Focus
fb7456eb7e gui/movieplayer.cpp: check file name is not url before save screenshot 
Origin commit data
------------------
Commit: b852496603
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-01 (Wed, 01 Oct 2014)
 2014-10-01 12:56:12 +04:00
[CST] Focus
29717fb892 gui/movieplayer.cpp: do not quit or jump to unmarked item, in case ie empty dir added 
Origin commit data
------------------
Commit: c14ab10c2e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-30 (Tue, 30 Sep 2014)
 2014-09-30 14:07:29 +04:00
[CST] Focus
c4dd7f8a45 gui/movieplayer.cpp: fix stop and EOF, if suddenly we get position == duration 
Origin commit data
------------------
Commit: 178582afb0
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-29 (Mon, 29 Sep 2014)
 2014-09-29 18:08:58 +04:00
[CST] Focus
74bdcf5097 gui/moviebrowser.cpp: add support for non-TS/xml files, idea (c) martii 
Origin commit data
------------------
Commit: b8d398a69a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-27 (Sat, 27 Sep 2014)
 2014-09-27 16:21:43 +04:00
[CST] Focus
97218af803 gui/movieplayer.cpp: lower delay at the EOF for list play or repeat mode enabled 
Origin commit data
------------------
Commit: fa780d6086
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-26 (Fri, 26 Sep 2014)
 2014-09-26 14:22:58 +04:00
[CST] Focus
8004abc63f gui/movieplayer.cpp: fix timeshift mode flags 
Origin commit data
------------------
Commit: 34d642a631
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-25 (Thu, 25 Sep 2014)
 2014-09-25 15:42:57 +04:00
martii
dde5034234 movieplayer: use #defines from record.h for timeshift 
Conflicts:
	src/gui/movieplayer.cpp


Origin commit data
------------------
Commit: 540a060ba9
Author: martii <m4rtii@gmx.de>
Date: 2014-04-17 (Thu, 17 Apr 2014)
 2014-09-25 15:29:56 +04:00
[CST] Focus
ea3897e6bd gui/movieplayer.cpp: add jump to MB last stop position to bookmarks menu 
Origin commit data
------------------
Commit: 824b6facb1
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-23 (Tue, 23 Sep 2014)
 2014-09-24 13:19:18 +04:00
[CST] Focus
004c2295d2 gui/moviebrowser.cpp: change marked list to pointers; honor sort order 
Origin commit data
------------------
Commit: 2003ed670d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-22 (Mon, 22 Sep 2014)
 2014-09-22 17:03:02 +04:00
[CST] Focus
d1a409cb0c gui/movieplayer.cpp: fix crash, always copy movie info, pointer invalidated on milist.clear() 
Origin commit data
------------------
Commit: 857b9ade83
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-22 (Mon, 22 Sep 2014)
 2014-09-22 15:42:53 +04:00
[CST] Focus
5221dd9040 gui/moviebrowser.cpp: fix copy-paste that breaks uPNP/http playback 
Origin commit data
------------------
Commit: df6a8c8bd3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-21 (Sun, 21 Sep 2014)
 2014-09-21 16:24:59 +04:00
[CST] Focus
9258fa99da gui/moviebrowser.cpp: add support for marked file list to play 
Origin commit data
------------------
Commit: 7d966e8363
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-18 (Thu, 18 Sep 2014)
 2014-09-18 18:43:55 +04:00
[CST] Focus
3292ab7a9f gui/movieplayer.cpp: add support for marked file list to play (file playback) and repeat modes, 
original code (C) martii <m4rtii@gmx.de>


Origin commit data
------------------
Commit: d83d519c86
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-17 (Wed, 17 Sep 2014)
 2014-09-17 20:13:49 +04:00
martii
69f917f16d drop explicit CMenuForwarder icon assignments 
Conflicts:
	src/gui/3dsetup.cpp
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/keybind_setup.cpp
	src/gui/mediaplayer.cpp
	src/gui/mediaplayer_setup.cpp
	src/gui/moviebrowser.cpp
	src/gui/network_setup.cpp
	src/gui/nfs.cpp
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/parentallock_setup.cpp
	src/gui/personalize.cpp
	src/gui/proxyserver_setup.cpp
	src/gui/record_setup.cpp
	src/gui/scan_setup.cpp
	src/gui/screensetup.cpp
	src/gui/settings_manager.cpp
	src/gui/timerlist.cpp
	src/gui/update_menue.cpp
	src/gui/vfd_setup.cpp
	src/gui/videosettings.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Commit: e84782bc4c
Author: martii <m4rtii@gmx.de>
Date: 2014-02-22 (Sat, 22 Feb 2014)
 2014-09-15 11:44:08 +04:00
Michael Liebmann
1230b1c411 CLuaInstance: Add parameter info1/info2 to PlayFile() 
- This parameter display in info viewer instead of epg data


Origin commit data
------------------
Commit: b6f1963f2c
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-09-10 (Wed, 10 Sep 2014)
 2014-09-11 12:14:24 +02:00
[CST] Focus
34d2776109 neutrino: sync keybind and usermenu code with neutrino-mp, code (C) martii 
Origin commit data
------------------
Commit: 420af7a4dc
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-05 (Fri, 05 Sep 2014)
 2014-09-05 17:49:11 +04:00
[CST] Focus
8f7f3f9e4d webtv channels integration port, 
initial code (C) martii,
initial patch from jacek


Origin commit data
------------------
Commit: a473fe8194
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-08-27 (Wed, 27 Aug 2014)
 2014-08-27 17:32:26 +04:00
vanhofen
e67cc7f9bf movieplayer: fix 'ask before stop temporary timeshift' 
Origin commit data
------------------
Commit: 06bda609cf
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-08-25 (Mon, 25 Aug 2014)

Origin message was:
------------------
- movieplayer: fix 'ask before stop temporary timeshift'
 2014-08-26 17:33:23 +04:00
vanhofen
808d50120d movieplayer: ask before stop temporary timeshift 
Origin commit data
------------------
Commit: f9c7662c73
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-08-19 (Tue, 19 Aug 2014)

Origin message was:
------------------
- movieplayer: ask before stop temporary timeshift
 2014-08-26 17:32:39 +04:00
[CST] Focus
e4f4b242f8 gui/movieplayer.cpp: add 'http' action key, with cut/restore neutrino 
Origin commit data
------------------
Commit: 81735f5e53
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-06-12 (Thu, 12 Jun 2014)
 2014-06-12 18:58:16 +04:00
vanhofen
98c0a441d8 change RenderString() default to UTF8 
Origin commit data
------------------
Commit: 649d1b1f9d
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-06-11 (Wed, 11 Jun 2014)

Origin message was:
------------------
- change RenderString() default to UTF8
 2014-06-11 23:07:13 +02:00
vanhofen
3bba3094e2 change getRenderWidth() default to UTF8 
Origin commit data
------------------
Commit: 8b91cda918
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-06-11 (Wed, 11 Jun 2014)

Origin message was:
------------------
- change getRenderWidth() default to UTF8
 2014-06-11 23:07:00 +02:00
Stefan Seyfried
2b29cf34ef movieplayer: memset() with zero length is useless 
Origin commit data
------------------
Commit: 7dac1e7ad9
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)
 2014-05-23 17:50:34 +02:00
Stefan Seyfried
0c7c443608 movieplayer: memset() with zero length is useless 
Origin commit data
------------------
Commit: af3245b47e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)
 2014-04-27 19:31:37 +02:00
Stefan Seyfried
3f36062fe7 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
------------------
Commit: 44ba8fafca
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)
 2014-04-27 19:14:06 +02:00
[CST] Focus
e205626ae4 gui/movieplayer.cpp: while starting file play, process neutrino events 
Origin commit data
------------------
Commit: 4fffe08d4b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-04-25 (Fri, 25 Apr 2014)
 2014-04-25 18:29:17 +04:00
Jacek Jendrzej
ebd436ed7a make auto ScreenShot with short video 
Origin commit data
------------------
Commit: 42c61b319e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-04-22 (Tue, 22 Apr 2014)
 2014-04-22 18:59:59 +02:00
martii
8ac01b736e gui/movieplayer: compare timeshift to TSHIFT_MODE_* 
Origin commit data
------------------
Commit: 61f19b0eed
Author: martii <m4rtii@gmx.de>
Date: 2014-04-21 (Mon, 21 Apr 2014)
 2014-04-21 17:49:33 +02:00
[CST] Focus
b321169027 gui/movieplayer.cpp: auto-create movie thumbnail, if enabled, 
at playback when position more than 5 min from start,
or on stop if position more than 10 minutes before end;
create movie thumbnail with RC_favorites key


Origin commit data
------------------
Commit: ebf37fd192
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-04-21 (Mon, 21 Apr 2014)
 2014-04-21 14:07:38 +04:00
Michael Liebmann
005a9cca09 MoviePlayer: Fix display 'info clock' and 'file time' when show movie infos 
Origin commit data
------------------
Commit: 92cc47f383
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-04-21 (Mon, 21 Apr 2014)
 2014-04-21 12:01:03 +02:00
martii
35bef72351 gui/movieplayer: show epg info in non-movieplayer modes, too 
Origin commit data
------------------
Commit: 8e5ef986fa
Author: martii <m4rtii@gmx.de>
Date: 2014-04-19 (Sat, 19 Apr 2014)
 2014-04-20 21:42:48 +02:00
Jacek Jendrzej
4f228f6519 make info copy only in timeshift mode 
Origin commit data
------------------
Commit: 1bbf65c2d3
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-04-20 (Sun, 20 Apr 2014)

Origin message was:
------------------
 make info copy only in timeshift mode
 2014-04-20 21:03:21 +02:00
Gaucho316
7dabb08ac9 movieplayer: add possibility to show movie infos 
Origin commit data
------------------
Commit: 81d457c614
Author: Gaucho316 <Gaucho316@hotmail.com>
Date: 2014-04-18 (Fri, 18 Apr 2014)
 2014-04-18 20:18:05 +02:00
Jacek Jendrzej
767d3d5a7e use auto lang only with more as 1 audio pid 
Origin commit data
------------------
Commit: 3d71258d31
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-04-18 (Fri, 18 Apr 2014)
 2014-04-18 19:27:08 +02:00
[CST] Focus
16ae616097 gui/movieplayer.cpp: change playback instance number 
Origin commit data
------------------
Commit: 6fe3bcb50f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-03-28 (Fri, 28 Mar 2014)
 2014-03-28 16:12:31 +04:00