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

10915 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Liebmann
a5ea4fd29e src/gui/videosettings.cpp: Replace BOXMODEL_APOLLO by BOXMODEL_CS_HD2 
Origin commit data
------------------
Commit: bfcf4057d5
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-14 (Tue, 14 Mar 2017)
 2017-03-14 00:13:35 +01:00
Michael Liebmann
9c8d98b96e src/gui/widget/buttons.cpp: Use system/stacktrace.h ... 
... instead of driver/stacktrace


Origin commit data
------------------
Commit: 03c5d11572
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-14 (Tue, 14 Mar 2017)
 2017-03-14 00:13:35 +01:00
Michael Liebmann
ec9341770a src/system/stacktrace.cpp: Use dummy function for print_stacktrace()... 
... and install_crash_handler() if HAVE_BACKTRACE is not defined


Origin commit data
------------------
Commit: 8340534ee4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-13 (Mon, 13 Mar 2017)
 2017-03-14 00:13:35 +01:00
vanhofen
003c72673f neutrinoyparser: stay compatible with present code in Y_Blocks.txt 
Origin commit data
------------------
Commit: 60d3cfb962
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)

Origin message was:
------------------
- neutrinoyparser: stay compatible with present code in Y_Blocks.txt
 2017-03-13 23:48:08 +01:00
Michael Liebmann
bbaad5b19d Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: 2677543cc4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-13 (Mon, 13 Mar 2017)
 2017-03-13 21:55:50 +01:00
Jacek Jendrzej
8a9fcfeb55 try fix segfault with --enable-cleanup 
Origin commit data
------------------
Commit: 76530e2c05
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-13 (Mon, 13 Mar 2017)
 2017-03-13 19:13:37 +01:00
Jacek Jendrzej
aaede62c71 fix PC compil 
Origin commit data
------------------
Commit: 32a0fb6de4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-13 (Mon, 13 Mar 2017)
 2017-03-13 19:06:33 +01:00
vanhofen
14f84f0bec Merge remote-tracking branch 'neutrino-mp/master' into pu/mp 
Conflicts:
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/neutrinoyparser.cpp


Origin commit data
------------------
Commit: 8bdb16cec6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)
 2017-03-13 16:14:33 +01:00
vanhofen
30fd965086 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/channellist.cpp
	src/gui/components/cc_detailsline.cpp
	src/gui/widget/menue.cpp


Origin commit data
------------------
Commit: c4fa0eb30e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)
 2017-03-13 12:45:30 +01:00
vanhofen
9c009ade29 unify DetailsLine-names; move define to settings.h 
Origin commit data
------------------
Commit: 5b0faeab8c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)

Origin message was:
------------------
- unify DetailsLine-names; move define to settings.h
 2017-03-13 12:40:04 +01:00
vanhofen
8c65bc5cf0 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: e2cf02f310
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)
 2017-03-13 11:40:34 +01:00
vanhofen
504194f201 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 9c808309b8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)
 2017-03-13 11:40:24 +01:00
Michael Liebmann
a3e6544398 CMenuWidget::calcSize: Add forgotten 'wi' 
Origin commit data
------------------
Commit: d0b02a9752
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-13 (Mon, 13 Mar 2017)
 2017-03-13 10:34:37 +01:00
Michael Liebmann
e3076746d4 Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: fa2fd94f77
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-13 (Mon, 13 Mar 2017)
 2017-03-13 09:56:04 +01:00
Michael Liebmann
a84f479b62 CMenuWidget::calcSize: Use scale2Res() to adjust fixed sizes 
Origin commit data
------------------
Commit: 2ed30486c4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-13 (Mon, 13 Mar 2017)
 2017-03-13 09:55:58 +01:00
Michael Liebmann
b19cf5238c CMenuWidget::calcSize: Recalculation of min_width ... 
... for adjustment to the osd resolution


Origin commit data
------------------
Commit: 30db40da1a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-13 (Mon, 13 Mar 2017)
 2017-03-13 09:55:58 +01:00
Thilo Graf
6b0d4ed2c0 cc_types.h: expand button_label_cc with hint as descrpition for button 
Origin commit data
------------------
Commit: 3fa097ebb9
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)
 2017-03-13 09:45:38 +01:00
Thilo Graf
fbe5200b0c cc_types: move struct button_label_cc into cc_types.h 
Origin commit data
------------------
Commit: e777ecdfdb
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)
 2017-03-13 09:45:38 +01:00
Thilo Graf
e23f4e1db5 CComponentsFooter: add bg_image to button_label_cc type 
Origin commit data
------------------
Commit: e2ca965ee9
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)
 2017-03-13 09:45:38 +01:00
vanhofen
9d255f3f05 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	lib/libdvbsub/dvbsubtitle.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/neutrinoyparser.cpp


Origin commit data
------------------
Commit: 69d8616a91
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-12 (Sun, 12 Mar 2017)
 2017-03-12 22:03:03 +01:00
vanhofen
7dd5854d20 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Commit: e7ff6d5493
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-12 (Sun, 12 Mar 2017)
 2017-03-12 21:59:40 +01:00
vanhofen
d259a7fa79 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 6d784e8fb0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-12 (Sun, 12 Mar 2017)
 2017-03-12 21:59:02 +01:00
Michael Liebmann
6e32a631bd Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: 828329452e
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-12 (Sun, 12 Mar 2017)
 2017-03-12 06:37:10 +01:00
Michael Liebmann
f9abc1c985 Revert "- allow to force given osd resolution in "videosystem = auto" mode" 
This reverts commit b9472250c3.


Origin commit data
------------------
Commit: 5ce34d5cf9
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-12 (Sun, 12 Mar 2017)
 2017-03-12 06:32:52 +01:00
vanhofen
da360bea16 tuxtxt.cpp: align to tuxbox-neutrino 
Origin commit data
------------------
Commit: f599f3aa98
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-11 (Sat, 11 Mar 2017)

Origin message was:
------------------
- tuxtxt.cpp: align to tuxbox-neutrino
 2017-03-11 12:50:36 +01:00
Thilo Graf
616904958c CComponentsFooter: simplify implementation of button labels 
button_label_l and button_label_s are now
merged to button_label_cc with prepared default values for text and locales.This type contains all possible
button label properties. Values for locales and string
are evaluated in setButtonLabels(), so it's possible to remove some
overloaded methodes.


Origin commit data
------------------
Commit: c766a970dc
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-11 (Sat, 11 Mar 2017)
 2017-03-11 00:45:25 +01:00
Thilo Graf
002a3ab7d2 CCDraw: add possibility to use background images as item background 
Provides functionality to use a backround image instead to render
usual box. If an image is defined, box render is disabled, but behavior
for hide, kill, cache... is not changed.

TODO:
- maybe needs global caching because images are not yet managed like icons in framebuffer class


Origin commit data
------------------
Commit: ccb82083e2
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-11 (Sat, 11 Mar 2017)
 2017-03-11 00:45:25 +01:00
Stefan Seyfried
600dc518cd bouquetlist: don't block RC keys while list is opened 
Origin commit data
------------------
Commit: c857fc49be
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-07 (Tue, 07 Mar 2017)
 2017-03-10 19:10:19 +01:00
Stefan Seyfried
e56dde123a msgbox: deobfuscate assignment of default result value 
Origin commit data
------------------
Commit: 2cef61bd8e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-07 (Tue, 07 Mar 2017)
 2017-03-10 19:10:06 +01:00
Michael Liebmann
bd2ffd04f3 Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: 87cb1b514a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-10 (Fri, 10 Mar 2017)
 2017-03-10 15:38:15 +01:00
vanhofen
1cb8859aa9 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: d384f4e37c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)
 2017-03-10 15:37:03 +01:00
vanhofen
4110492797 controlapi: /control/info => return PACKAGE_NAME and PACKAGE_VERSION 
Origin commit data
------------------
Commit: 0203de264f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)

Origin message was:
------------------
- controlapi: /control/info => return PACKAGE_NAME and PACKAGE_VERSION
 2017-03-10 15:36:13 +01:00
vanhofen
8ce36eb9e1 remove obsolete ifdef's 
Origin commit data
------------------
Commit: 4aecc9f1b5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)

Origin message was:
------------------
- remove obsolete ifdef's
 2017-03-10 15:27:30 +01:00
vanhofen
b90bc955c3 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 114392256c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)
 2017-03-10 15:21:17 +01:00
vanhofen
a8db520beb Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	lib/hardware/coolstream/hd2/libcoolstream/cs_api.h


Origin commit data
------------------
Commit: 8c95f1f7a8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)
 2017-03-10 15:10:04 +01:00
vanhofen
e96b2f0178 hardware_caps: just changes in comments 
Origin commit data
------------------
Commit: ff6046bb56
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)

Origin message was:
------------------
- hardware_caps: just changes in comments
 2017-03-10 15:07:52 +01:00
vanhofen
a924473bb6 neutrinoyparser: use hw_caps in func_get_boxtype() ... 
... and func_get_boxmodel()


Origin commit data
------------------
Commit: 305b1a6da5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)

Origin message was:
------------------
- neutrinoyparser: use hw_caps in func_get_boxtype() ...

... and func_get_boxmodel()
 2017-03-10 15:07:52 +01:00
vanhofen
26584b4308 controlapi: use hw_caps in HWInfoCGI() 
Origin commit data
------------------
Commit: b902648b08
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)

Origin message was:
------------------
- controlapi: use hw_caps in HWInfoCGI()
 2017-03-10 15:07:52 +01:00
vanhofen
7afeaefba4 controlapi: /control/info => return right name 
Origin commit data
------------------
Commit: e092059f32
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)

Origin message was:
------------------
- controlapi: /control/info => return right name
 2017-03-10 15:07:52 +01:00
vanhofen
4ccc9cbdaf hardware_caps/Makefile: use @HWLIB_CFLAGS@ instead of defines 
Origin commit data
------------------
Commit: 24b159f84c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)

Origin message was:
------------------
- hardware_caps/Makefile: use @HWLIB_CFLAGS@ instead of defines
 2017-03-10 15:07:52 +01:00
vanhofen
2fd434895b hardware_caps: use define instead of value; better readability 
Origin commit data
------------------
Commit: 7cca1e02c3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)

Origin message was:
------------------
- hardware_caps: use define instead of value; better readability
 2017-03-10 15:07:52 +01:00
vanhofen
86c64163c7 Revert "hardware_caps.cpp: Add hw ifdef for cs_get_chip_type()" 
This reverts commit ec191c5a38
because libcoolstream now is updated


Origin commit data
------------------
Commit: 83de4ba055
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)
 2017-03-10 15:07:52 +01:00
Michael Liebmann
90c7bffdeb Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: 5e09df1d91
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-10 (Fri, 10 Mar 2017)
 2017-03-10 14:50:04 +01:00
Michael Liebmann
cd4922c0c2 hd2/libcoolstream/*.h: Update for new libcoolstream functions 
- cs_get_lib_version()
 - cs_compare_lib_versions()
 - GetVideoSystem()
 - GetVideoSystemFormatName()
 - Add CS_CHIP_NEVIS definitions


Origin commit data
------------------
Commit: ab6ca5b606
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-10 (Fri, 10 Mar 2017)
 2017-03-10 14:35:32 +01:00
Michael Liebmann
5b136d4c55 hd1/libcoolstream/cs_api.h: Update for new libcoolstream functions 
- cs_get_lib_version()
 - cs_compare_lib_versions()
 - cs_get_chip_type() (dummy function for compatibility with hd2)
 - Add CS_CHIP_xxx definitions


Origin commit data
------------------
Commit: 7eecd09eca
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-10 (Fri, 10 Mar 2017)
 2017-03-10 14:35:32 +01:00
vanhofen
48237318fb Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: a4836e50d8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)
 2017-03-10 00:31:15 +01:00
vanhofen
38dd0be012 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 8fb706226a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)
 2017-03-10 00:31:02 +01:00
Michael Liebmann
fffa20b430 Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: fee5cd0175
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-09 (Thu, 09 Mar 2017)
 2017-03-09 17:34:42 +01:00
Michael Liebmann
ec191c5a38 hardware_caps.cpp: Add hw ifdef for cs_get_chip_type() 
Origin commit data
------------------
Commit: f5cdaff282
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-09 (Thu, 09 Mar 2017)
 2017-03-09 17:34:25 +01:00
Michael Liebmann
42c7b9035d Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: 94492c4271
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-09 (Thu, 09 Mar 2017)
 2017-03-09 15:17:25 +01:00