mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 17:01:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'test/cst-next'

Browse Source 
Conflicts:
	src/gui/osdlang_setup.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 48fdfc5e5e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-19 (Thu, 19 Feb 2015)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2015-02-19 14:10:26 +01:00
parent a51c9d1e6a 3731854ff0
commit e4e9fb1e46
23 changed files with 86 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libcoolstream2/cs_api.h
View File

@@ -33,7 +33,7 @@ enum CS_LOG_MODULE {
CS_LOG_POWER_CLK,
CS_LOG_MEM,
CS_LOG_API,
CS_LOG_CA,
CS_LOG_CA
};
// Initialization

6
lib/libcoolstream2/cs_frontpanel.h
View File

@@ -62,7 +62,7 @@ typedef enum {
FP_FLAG_ALIGN_LEFT = 0x10, /* align the text in display from the left (default) */
FP_FLAG_ALIGN_RIGHT = 0x20, /* align the text in display from the right (arabic) */
FP_FLAG_UPDATE_SCROLL_POS = 0x40, /* update the current position for scrolling (internal use only) */
FP_FLAG_USER = 0x80, /* user flags set (internal use only) */
FP_FLAG_USER = 0x80 /* user flags set (internal use only) */
} fp_flag;
typedef struct {
@@ -80,7 +80,7 @@ typedef enum {
FP_LED_3_ON = 0x88,
FP_LED_1_OFF = 0x01,
FP_LED_2_OFF = 0x02,
FP_LED_3_OFF = 0x08,
FP_LED_3_OFF = 0x08
} fp_led_ctrl_t;
typedef struct {
@@ -105,7 +105,7 @@ typedef struct {
typedef enum {
FP_DISPLAY_TEXT_NONE = 0,
FP_DISPLAY_TEXT_LIMITED,
FP_DISPLAY_TEXT_ALL,
FP_DISPLAY_TEXT_ALL
} fp_display_text_type_t;
typedef enum {

2
lib/libcoolstream2/dmx_cs.h
View File

@@ -27,7 +27,7 @@
typedef enum {
DMX_TS = 0,
DMX_DMA,
DMX_DMA
} DMX_TYPE;
typedef enum {

2
lib/libcoolstream2/video_cs.h
View File

@@ -32,7 +32,7 @@ typedef enum {
// Output types
ANALOG_xD_SCART = (1 << 8), // Output is SCART
ANALOG_xD_CINCH = (1 << 9), // Output is Cinch
ANALOG_xD_BOTH = (3 << 8), // Output cannot individually control scart, cinch outputs
ANALOG_xD_BOTH = (3 << 8) // Output cannot individually control scart, cinch outputs
// due to limited amount of DACs (ie TANK, Trinity)
} analog_mode_t;