mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-17 10:23:37 +02:00
Code Issues Packages Projects Releases Wiki Activity
9,670 Commits 2 Branches 9 Tags
d35c5a76c9b5258f9f9f2d15e646d7e86d85efe5
Commit Graph

9670 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vanhofen
d35c5a76c9 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 66a3a40db2
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-14 (Mon, 14 Nov 2016)
 2016-11-14 08:23:53 +01:00
vanhofen
08861d56ab Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 73d3abcdef
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-13 (Sun, 13 Nov 2016)
 2016-11-13 20:25:22 +01:00
Thilo Graf
ce278342b5 CMovieBrowser: unfify and reduce flicker effects of connect line 
Connectline object can handle hide behavior itself.


Origin commit data
------------------
Commit: 5dc6255b43
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-13 (Sun, 13 Nov 2016)
 2016-11-13 16:44:08 +01:00
vanhofen
c84c215ac5 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 3e818b1e3d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-13 (Sun, 13 Nov 2016)
 2016-11-13 01:48:39 +01:00
Stefan Seyfried
d9758e5c13 zapit: fix "comparison is always false" warnings 
demux Start() Stop() and pesFilter() are bool, so comparing < 0 really
does not make sense.


Origin commit data
------------------
Commit: 5948f045aa
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)
 2016-11-13 01:44:59 +01:00
Stefan Seyfried
bff69630e4 driver: use newer ffmpeg API 
Reduce the "deprecated function" warnings a bit when compiling against
recent ffmpeg releases. Just the drop-in-replacement "av_packet_unref"
which works with both old and new ffmpeg versions.
The other stuff needs rewrites which are not compatible with all ffmpeg
releases :-(


Origin commit data
------------------
Commit: 7154f36258
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)
 2016-11-13 01:44:45 +01:00
Stefan Seyfried
95e8550dad timermanager: fix -Waddress warning with newer gcc 
The address of Events (wich is checked against NULL) can never be NULL,
because Events is passed by reference.


Origin commit data
------------------
Commit: 0531618643
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)
 2016-11-13 01:43:55 +01:00
Stefan Seyfried
7e35a8e7df neutrinoyparser: fix string literal warning with newer gcc 
Origin commit data
------------------
Commit: ee5f73c64d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)
 2016-11-13 01:43:37 +01:00
vanhofen
6b404dbf82 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 2a7ec1a59f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-13 (Sun, 13 Nov 2016)
 2016-11-13 01:35:07 +01:00
vanhofen
d44f98a01d Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox 
Conflicts:
	configure.ac
	lib/Makefile.am
	src/zapit/src/femanager.cpp


Origin commit data
------------------
Commit: cb9b4b1d7e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-13 (Sun, 13 Nov 2016)
 2016-11-13 01:34:20 +01:00
Stefan Seyfried
4e0ce4622c zapit: fix "comparison is always false" warnings 
demux Start() Stop() and pesFilter() are bool, so comparing < 0 really
does not make sense.


Origin commit data
------------------
Commit: 71457a0b17
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)
 2016-11-12 22:19:33 +01:00
Stefan Seyfried
a40212a5eb driver: use newer ffmpeg API 
Reduce the "deprecated function" warnings a bit when compiling against
recent ffmpeg releases. Just the drop-in-replacement "av_packet_unref"
which works with both old and new ffmpeg versions.
The other stuff needs rewrites which are not compatible with all ffmpeg
releases :-(


Origin commit data
------------------
Commit: 4a400c909a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)
 2016-11-12 22:16:42 +01:00
vanhofen
b21fed6d25 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: e40d4c44b5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)
 2016-11-12 22:05:01 +01:00
vanhofen
af321e4411 moviebrowser: limit cover to one third of m_cBoxFrameInfo1 width 
Origin commit data
------------------
Commit: a47a5cd422
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)

Origin message was:
------------------
- moviebrowser: limit cover to one third of m_cBoxFrameInfo1 width
 2016-11-12 22:03:05 +01:00
vanhofen
9533a9ba4e cc_item_picture: reset keep_aspect variables after use 
Origin commit data
------------------
Commit: 73b97ecd4d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)

Origin message was:
------------------
- cc_item_picture: reset keep_aspect variables after use
 2016-11-12 22:00:12 +01:00
vanhofen
b3b0c90b2c moviebrowser: fix MB_INFO_SPACER's empty content 
Origin commit data
------------------
Commit: da604fb9a5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)

Origin message was:
------------------
- moviebrowser: fix MB_INFO_SPACER's empty content
 2016-11-12 20:40:28 +01:00
Stefan Seyfried
8634dfb240 timermanager: fix -Waddress warning with newer gcc 
The address of Events (wich is checked against NULL) can never be NULL,
because Events is passed by reference.


Origin commit data
------------------
Commit: 4bd8696a84
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)
 2016-11-12 18:25:06 +01:00
Stefan Seyfried
df635f87a1 neutrinoyparser: fix string literal warning with newer gcc 
Origin commit data
------------------
Commit: bc06052985
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)
 2016-11-12 18:24:14 +01:00
Stefan Seyfried
2e7aa7be4a Merge remote-tracking branch 'tuxbox/master' 
Origin commit data
------------------
Commit: 2c92d112d0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)
 2016-11-12 18:06:26 +01:00
vanhofen
7a0efa6d68 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 184e6325c8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)
 2016-11-11 16:39:18 +01:00
vanhofen
3011b2fe15 moviebrowser: use own defaults for moviebrowser's view 
Origin commit data
------------------
Commit: 98ba673e19
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)

Origin message was:
------------------
- moviebrowser: use own defaults for moviebrowser's view
 2016-11-11 16:38:24 +01:00
vanhofen
b1af01a476 moviebrowser: reset m_pcInfo1 box to default height, ... 
when turning m_settings.browserAdditional off


Origin commit data
------------------
Commit: ad7947d11a
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)

Origin message was:
------------------
- moviebrowser: reset m_pcInfo1 box to default height, ...

when turning m_settings.browserAdditional off
 2016-11-11 16:35:50 +01:00
vanhofen
6a8537342f osd_setup: change moviebrowser's default font sizes 
Origin commit data
------------------
Commit: 8495ac091e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)

Origin message was:
------------------
- osd_setup: change moviebrowser's default font sizes
 2016-11-11 15:31:56 +01:00
vanhofen
cb808bce7c Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 16340ed026
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)
 2016-11-11 13:59:45 +01:00
vanhofen
f717e1ea75 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: abb8e5f02a
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)
 2016-11-11 13:59:11 +01:00
vanhofen
3bfe860a5d locale: small changes in moviebrowser locales 
Origin commit data
------------------
Commit: af9672edb8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)

Origin message was:
------------------
- locale: small changes in moviebrowser locales
 2016-11-11 13:46:55 +01:00
vanhofen
36a112936c moviebrowser: show sorting menu; displays only available options 
Origin commit data
------------------
Commit: 2cd4a9e410
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)

Origin message was:
------------------
- moviebrowser: show sorting menu; displays only available options
 2016-11-11 13:46:55 +01:00
vanhofen
2e8117384c Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: d4b9daf01e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)
 2016-11-11 09:16:24 +01:00
vanhofen
130863fabf moviebrowser: remove obsolete strReplace() function 
Origin commit data
------------------
Commit: a57ef57714
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)

Origin message was:
------------------
- moviebrowser: remove obsolete strReplace() function
 2016-11-11 08:51:35 +01:00
vanhofen
e47b64d4aa eventlist: show left/right buttons in footer 
Origin commit data
------------------
Commit: 8fab6e7212
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)

Origin message was:
------------------
- eventlist: show left/right buttons in footer
 2016-11-11 01:11:02 +01:00
vanhofen
1bc70fc18f Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: d271a8999b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)
 2016-11-11 00:51:58 +01:00
vanhofen
269dd731f7 eventlist: allow windows size changes w/o neutrino restart 
Origin commit data
------------------
Commit: e3306076de
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)

Origin message was:
------------------
- eventlist: allow windows size changes w/o neutrino restart
 2016-11-11 00:51:32 +01:00
Thilo Graf
41a9339469 CMenuWidget: move signal before render methodes 
At start of methode, unusual behavior could occur.


Origin commit data
------------------
Commit: 30f231c801
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)
 2016-11-11 00:48:37 +01:00
vanhofen
7ee61c7038 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 6e36759695
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)
 2016-11-11 00:26:49 +01:00
vanhofen
62015ccfbf eventlist: allow gradient/radius changes w/o neutrino restart 
Origin commit data
------------------
Commit: c056b56d12
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)

Origin message was:
------------------
- eventlist: allow gradient/radius changes w/o neutrino restart
 2016-11-11 00:25:25 +01:00
vanhofen
48ebbedeb5 eventlist: fix right textbox in header; last char was not displayed 
Origin commit data
------------------
Commit: 00ad1ecd1c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)

Origin message was:
------------------
- eventlist: fix right textbox in header; last char was not displayed
 2016-11-11 00:18:43 +01:00
vanhofen
350f044a33 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 98a6554d7b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-10 (Thu, 10 Nov 2016)
 2016-11-10 21:39:39 +01:00
Jacek Jendrzej
d1655acd40 src/gui/epgview.cpp reset header height to single size 
Origin commit data
------------------
Commit: e3136b888c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-11-10 (Thu, 10 Nov 2016)
 2016-11-10 20:52:58 +01:00
vanhofen
344c495442 webtv: try to auto-add epg from existing channels (experimental) 
Origin commit data
------------------
Commit: 8d4576535f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-10 (Thu, 10 Nov 2016)

Origin message was:
------------------
- webtv: try to auto-add epg from existing channels (experimental)
 2016-11-10 15:24:38 +01:00
vanhofen
6256ce547d Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 722d98b46b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-10 (Thu, 10 Nov 2016)
 2016-11-10 12:48:26 +01:00
Thilo Graf
99b7d20f99 CMenuTarget: outsource CMenuTarget-class 
It's required for some inheritations into other classes if include
of menue.h is not wanted


Origin commit data
------------------
Commit: 098905e8e1
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-10 (Thu, 10 Nov 2016)
 2016-11-10 09:08:47 +01:00
Thilo Graf
8241298511 CTimerList: add menu context button to header 
Not to see that we have a possible submenu.


Origin commit data
------------------
Commit: 9eb9158c2f
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-09 (Wed, 09 Nov 2016)
 2016-11-09 19:44:13 +01:00
vanhofen
39c9b659c6 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: f8deee994d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-09 (Wed, 09 Nov 2016)
 2016-11-09 17:16:25 +01:00
vanhofen
782052704c controlapi: fix compiler warning 
error: declaration of 'channel_id' shadows a previous local


Origin commit data
------------------
Commit: 703caef3f6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-09 (Wed, 09 Nov 2016)

Origin message was:
------------------
- controlapi: fix compiler warning

error: declaration of 'channel_id' shadows a previous local
 2016-11-09 17:13:43 +01:00
vanhofen
a7a8acc8b0 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: ca4bfdf36b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-09 (Wed, 09 Nov 2016)
 2016-11-09 12:35:39 +01:00
vanhofen
9bbf604d96 controlapi: add epg_id to several outputs; add /control/getepgid 
* /control/getepgid[?format=plain|json|xml]


Origin commit data
------------------
Commit: 3150d9edac
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-09 (Wed, 09 Nov 2016)

Origin message was:
------------------
- controlapi: add epg_id to several outputs; add /control/getepgid

* /control/getepgid[?format=plain|json|xml]
 2016-11-09 11:55:44 +01:00
vanhofen
01cdb59c33 epgview: more intensive use of offset defines in imdb code 
Origin commit data
------------------
Commit: 317dd373fe
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-08 (Tue, 08 Nov 2016)

Origin message was:
------------------
- epgview: more intensive use of offset defines in imdb code
 2016-11-08 22:11:57 +01:00
vanhofen
98e986dafc Merge branch 'pu/moviebrowser' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/epgview.cpp


Origin commit data
------------------
Commit: f0d9adbe46
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-08 (Tue, 08 Nov 2016)
 2016-11-08 22:07:57 +01:00
vanhofen
5582d5a8d5 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 5b7c68825e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-08 (Tue, 08 Nov 2016)
 2016-11-08 22:05:31 +01:00
vanhofen
761b3e7f1e epgview: use small vertical offset around channellogo; ... 
more intensive use of offset defines


Origin commit data
------------------
Commit: 7d7a924d06
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-08 (Tue, 08 Nov 2016)

Origin message was:
------------------
- epgview: use small vertical offset around channellogo; ...

more intensive use of offset defines
 2016-11-08 22:03:44 +01:00