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
12,571 Commits 2 Branches 9 Tags
2ee2bcff88ce7b4e00e75e95e973959e812a7f61
Commit Graph

503 Commits

Author SHA1 Message Date
vanhofen
a1b33ba3a7 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: a4a6c60356
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-13 (Fri, 13 Jan 2017)
 2017-01-13 21:08:52 +01:00
Jacek Jendrzej
7a5f8ac1df src/gui/movieplayer.cpp try to fix livestreamInfo 
Origin commit data
------------------
Commit: 2abdd1143e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-01-13 (Fri, 13 Jan 2017)
 2017-01-13 18:59:56 +01:00
vanhofen
73ca7cf0c8 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Commit: 38f17cd88b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-06 (Tue, 06 Dec 2016)
 2016-12-06 20:46:37 +01:00
vanhofen
5892f863e5 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/movieplayer.cpp


Origin commit data
------------------
Commit: 461f9f046d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-06 (Tue, 06 Dec 2016)
 2016-12-06 13:02:25 +01:00
Michael Liebmann
bb37905588 MoviePlayer: Rework enable/disable of osd time, file time and mute icon 
Origin commit data
------------------
Commit: 2045e91c47
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-12-05 (Mon, 05 Dec 2016)
 2016-12-05 15:54:56 +01:00
vanhofen
073d0d4ffb Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 87da827b30
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-05 (Mon, 05 Dec 2016)
 2016-12-05 00:52:33 +01:00
vanhofen
6754ff3e61 movieplayer: rework help; use rc_help to show help 
Origin commit data
------------------
Commit: 5ad794e004
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-05 (Mon, 05 Dec 2016)

Origin message was:
------------------
- movieplayer: rework help; use rc_help to show help
 2016-12-05 00:50:39 +01:00
Stefan Seyfried
eab48f2ed9 Merge remote-tracking branch 'tuxbox/master' 
Origin commit data
------------------
Commit: c6d7968381
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)
 2016-12-04 18:02:51 +01:00
vanhofen
9086c24617 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 87fe81b890
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-02 (Fri, 02 Dec 2016)
 2016-12-02 23:39:21 +01:00
Michael Liebmann
16a2eb0566 MoviePlayer: Disable NI InfoIcons when view movieinfo 
Origin commit data
------------------
Commit: c05351c8d8
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-12-02 (Fri, 02 Dec 2016)
 2016-12-02 00:40:01 +01:00
vanhofen
56273f6a56 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: bd9aa1b199
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-02 (Fri, 02 Dec 2016)
 2016-12-02 00:39:36 +01:00
Michael Liebmann
2bb2b1c977 MoviePlayer: Disable InfoClock and FileTime when view movieinfo 
Origin commit data
------------------
Commit: 47ffc7586a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-12-02 (Fri, 02 Dec 2016)
 2016-12-02 00:21:59 +01:00
Michael Liebmann
feac1111ee CLuaInstVideo::PlayFile: Infoviewer was not displayed when InfoFunc was set 
- Fix commit b15bec5dd6
 - Set Lua api version to 1.68


Origin commit data
------------------
Commit: e92df63a4a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-12-02 (Fri, 02 Dec 2016)
 2016-12-02 00:21:58 +01:00
Michael Liebmann
b15bec5dd6 lua: Fix InfoFunc for displaying information in the movieplayer 
- Fix for commit 38488e642c
 - Set Lua api version to 1.66


Origin commit data
------------------
Commit: 1aee964c14
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-12-01 (Thu, 01 Dec 2016)
 2016-12-01 14:28:21 +01:00
vanhofen
56879044cb Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/audioplayer.cpp
	src/gui/movieplayer.cpp
	src/gui/pictureviewer.cpp
	src/gui/upnpbrowser.cpp


Origin commit data
------------------
Commit: 2f3793fa1d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-24 (Thu, 24 Nov 2016)
 2016-11-24 21:45:31 +01:00
vanhofen
cf6c9b99d9 enable epg-scan while audioplayer, movieplayer, pictureviewer and 
upnp-browser runs


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

Origin message was:
------------------
- enable epg-scan while audioplayer, movieplayer, pictureviewer and

upnp-browser runs
 2016-11-24 21:41:23 +01:00
vanhofen
65e0a39980 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	data/locale/nederlands.locale
	data/locale/slovak.locale
	data/locale/unmaintained/czech.locale
	src/gui/components/cc_frm_footer.cpp
	src/gui/start_wizard.cpp
	src/gui/widget/msgbox.cpp


Origin commit data
------------------
Commit: fce378f8ff
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)
 2016-11-21 12:46:49 +01:00
vanhofen
cc7ad7ce1a Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/lua/lua_misc.cpp
	src/neutrino.cpp
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Commit: 3420991007
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-19 (Sat, 19 Nov 2016)
 2016-11-19 21:11:54 +01:00
vanhofen
dbfd2214db Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Commit: 1ddcc0c7ce
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-02 (Wed, 02 Nov 2016)
 2016-11-02 09:50:10 +01:00
FlatTV
2d27470c3a don't execute ci "hack", if calling from movieplayer 
Origin commit data
------------------
Commit: a2193c9e44
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)
 2016-10-25 18:48:00 +02:00
Thilo Graf
11b3307251 CMsgBox: rework msgbox classes with Window class implementation 
Replacing messagebox, hintbox_ext and some derivated parts with
basic class hintbox and derivated class CMsgBox. This should unify
window handling and avoids maintain of multiple classes with quasi
same purpose and adds more functionality.

TODO: fix and optimize details


Origin commit data
------------------
Commit: dde298b1b7
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-04-04 (Mon, 04 Apr 2016)
 2016-10-24 10:31:24 +02:00
Stefan Seyfried
54189f271a Merge remote-tracking branch 'tuxbox/master' 
* needs compile fixes
* needs additional tests, of course :-)


Origin commit data
------------------
Commit: 13ab1ebc8a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)
 2016-10-22 11:37:40 +02:00
vanhofen
7220c6b265 Merge branch 'ni/cst-next' into ni/mp/cst-next 
Conflicts:
	acinclude.m4
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/epgplus.cpp
	src/gui/plugins.cpp
	src/gui/widget/listbox.cpp
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Commit: 7135aac394
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)
 2016-10-10 17:27:55 +02:00
vanhofen
9b1904e84d Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Commit: 6c8ea9793f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-06 (Thu, 06 Oct 2016)
 2016-10-06 21:18:48 +02:00
Thilo Graf
fc29cf8824 lua api: fix broken build with --disable-lua 
Origin commit data
------------------
Commit: 1d74379981
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-02 (Sun, 02 Oct 2016)
 2016-10-03 01:44:54 +02:00
vanhofen
dc49f53122 Merge branch 'ni/cst-next' into ni/mp/cst-next 
Conflicts:
	src/gui/streaminfo2.cpp


Origin commit data
------------------
Commit: e2dfa1c952
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-30 (Fri, 30 Sep 2016)
 2016-09-30 00:12:45 +02:00
vanhofen
c4f59468b6 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Origin commit data
------------------
Commit: c165d752d7
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-29 (Thu, 29 Sep 2016)
 2016-09-29 18:12:43 +02:00
vanhofen
3f2a0b299c movieplayer: fix -Wformat warning; Vol. 2 
Origin commit data
------------------
Commit: 49b0ec3319
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-29 (Thu, 29 Sep 2016)

Origin message was:
------------------
- movieplayer: fix -Wformat warning; Vol. 2
 2016-09-29 18:06:58 +02:00
vanhofen
7433978a1c Merge branch 'ni/cst-next' into ni/mp/cst-next 
Origin commit data
------------------
Commit: 0d035edb33
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-29 (Thu, 29 Sep 2016)
 2016-09-29 11:59:40 +02:00
vanhofen
22a31dccd6 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Origin commit data
------------------
Commit: f69fdc425b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-29 (Thu, 29 Sep 2016)
 2016-09-29 11:59:21 +02:00
vanhofen
41be0e256e movieplayer: fix -Wformat warning 
Origin commit data
------------------
Commit: 256b0965ba
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-29 (Thu, 29 Sep 2016)

Origin message was:
------------------
- movieplayer: fix -Wformat warning
 2016-09-29 10:53:06 +02:00
vanhofen
51272057d1 movieinfo: internally rename epgEpgId -> epgId 
Origin commit data
------------------
Commit: f8321b6558
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgEpgId -> epgId
 2016-09-20 08:03:51 +02:00
vanhofen
d02bdfbf4f movieinfo: internally rename epgId -> channelId 
Origin commit data
------------------
Commit: 802b4bc792
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgId -> channelId
 2016-09-20 08:03:51 +02:00
vanhofen
2054cdc5cc movieinfo: internally rename epgChannel -> ChannelName 
Origin commit data
------------------
Commit: b758f4c69d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgChannel -> ChannelName
 2016-09-20 08:03:51 +02:00
vanhofen
1d174874e0 movieinfo: internally rename epgAudioPid -> AudioPid 
Origin commit data
------------------
Commit: dc831c545c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgAudioPid -> AudioPid
 2016-09-20 08:03:50 +02:00
vanhofen
32c57fda18 movieinfo: internally rename epgVideoPid -> VideoPid 
Origin commit data
------------------
Commit: e2358a58a3
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgVideoPid -> VideoPid
 2016-09-20 08:03:50 +02:00
vanhofen
73463ef279 add listModeKey() function to simplify these calls 
Origin commit data
------------------
Commit: 59b7e3ae36
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- add listModeKey() function to simplify these calls
 2016-09-20 08:03:50 +02:00
vanhofen
49386530ec movieinfo: internally rename epgEpgId -> epgId 
Origin commit data
------------------
Commit: aa8a3849f4
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgEpgId -> epgId
 2016-09-10 00:32:35 +02:00
vanhofen
138af5fcaf movieinfo: internally rename epgId -> channelId 
Origin commit data
------------------
Commit: 625cbb6122
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgId -> channelId
 2016-09-10 00:32:35 +02:00
vanhofen
08e1339fcf movieinfo: internally rename epgChannel -> ChannelName 
Origin commit data
------------------
Commit: a85d539bd0
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgChannel -> ChannelName
 2016-09-10 00:32:35 +02:00
vanhofen
bde496cad2 movieinfo: internally rename epgAudioPid -> AudioPid 
Origin commit data
------------------
Commit: c5dcb1c4f6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgAudioPid -> AudioPid
 2016-09-10 00:32:35 +02:00
vanhofen
15e649ebbe movieinfo: internally rename epgVideoPid -> VideoPid 
Origin commit data
------------------
Commit: 8bb566eba5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgVideoPid -> VideoPid
 2016-09-10 00:32:35 +02:00
vanhofen
c7b679a928 movieinfo: internally rename epgEpgId -> epgId 
Origin commit data
------------------
Commit: 53c6a23d07
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgEpgId -> epgId
 2016-09-09 22:01:34 +02:00
vanhofen
8a52c8ab54 movieinfo: internally rename epgId -> channelId 
Origin commit data
------------------
Commit: 6978b8c994
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgId -> channelId
 2016-09-09 19:43:00 +02:00
vanhofen
599c6608fa movieinfo: internally rename epgChannel -> ChannelName 
Origin commit data
------------------
Commit: dbcbf06560
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgChannel -> ChannelName
 2016-09-09 19:33:04 +02:00
vanhofen
d0882070ed movieinfo: internally rename epgAudioPid -> AudioPid 
Origin commit data
------------------
Commit: 6fe2d04e1e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgAudioPid -> AudioPid
 2016-09-09 18:58:11 +02:00
vanhofen
c1d73f292a movieinfo: internally rename epgVideoPid -> VideoPid 
Origin commit data
------------------
Commit: 0fa9e392af
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgVideoPid -> VideoPid
 2016-09-09 18:45:07 +02:00
vanhofen
91fc1e2528 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Origin commit data
------------------
Commit: e419a5c3b6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)
 2016-09-09 10:45:45 +02:00
vanhofen
fa2686a90e add listModeKey() function to simplify these calls 
Origin commit data
------------------
Commit: 2911e638c7
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- add listModeKey() function to simplify these calls
 2016-09-09 10:42:46 +02:00
vanhofen
bc33663742 Merge branch 'ni/mp' into ni/cst-next 
Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/Makefile.am
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libdvbsub/dvbsub.cpp
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/gui/dboxinfo.cpp
	src/gui/movieplayer.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/Makefile.am
	src/system/flashtool.cpp


Origin commit data
------------------
Commit: 161347db29
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)
 2016-08-26 19:13:47 +02:00