mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'check/next-cc'

Browse Source 
it compiles, but is not really tested...

Conflicts:
	src/driver/netfile.cpp
	src/driver/volume.cpp
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bookmarkmanager.cpp
	src/gui/bouquetlist.cpp
	src/gui/eventlist.cpp
	src/gui/movieplayer.cpp
	src/gui/pictureviewer.cpp
	src/gui/scan.cpp
	src/gui/test_menu.h
	src/gui/timerlist.cpp
	src/gui/update.cpp
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/system/flashtool.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/femanager.cpp
This commit is contained in:
Stefan Seyfried
2013-06-16 21:22:14 +02:00
parent 49f875508e 7097abe420
commit d5d5a60261
160 changed files with 6251 additions and 2072 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libcoolstream/cnxtfb.h
View File

@@ -39,7 +39,7 @@ typedef enum
{
CNXTFB_BLEND_MODE_GLOBAL_ALPHA = 0, /* Global / Region Alpha */
CNXTFB_BLEND_MODE_PIXEL_ALPHA, /* Alpha from pixel */
CNXTFB_BLEND_MODE_ALPHA_MULTIPLIED, /* Global alpha multiplied with pixel alpha */
CNXTFB_BLEND_MODE_ALPHA_MULTIPLIED /* Global alpha multiplied with pixel alpha */
} CNXTFB_BLEND_MODE;
#define CNXTFB_IO(type) _IO('F', type)

4
lib/libcoolstream/cs_frontpanel.h
View File

@@ -61,7 +61,7 @@ typedef enum {
FP_FLAG_SCROLL_DELAY = 0x08, /* delayed scroll start */
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 */
FP_FLAG_UPDATE_SCROLL_POS = 0x40 /* update the current position for scrolling */
} fp_flag;
typedef struct {
@@ -79,7 +79,7 @@ typedef enum {
FP_LED_3_ON = 0x83,
FP_LED_1_OFF = 0x01,
FP_LED_2_OFF = 0x02,
FP_LED_3_OFF = 0x03,
FP_LED_3_OFF = 0x03
} fp_led_ctrl_t;
typedef struct {

4
lib/libcoolstream/cs_vfd.h
View File

@@ -60,7 +60,7 @@ typedef enum
VFD_FLAG_SCROLL_DELAY = 0x08, /* delayed scroll start */
VFD_FLAG_ALIGN_LEFT = 0x10, /* align the text in display from the left (default) */
VFD_FLAG_ALIGN_RIGHT = 0x20, /* align the text in display from the right (arabic) */
VFD_FLAG_UPDATE_SCROLL_POS = 0x40, /* update the current position for scrolling */
VFD_FLAG_UPDATE_SCROLL_POS = 0x40 /* update the current position for scrolling */
} vfd_flag;
typedef struct {
@@ -78,7 +78,7 @@ typedef enum {
VFD_LED_3_ON = 0x83,
VFD_LED_1_OFF = 0x01,
VFD_LED_2_OFF = 0x02,
VFD_LED_3_OFF = 0x03,
VFD_LED_3_OFF = 0x03
} vfd_led_ctrl_t;
typedef struct {

6
lib/libcoolstream/playback_cs.h
View File

@@ -11,6 +11,8 @@
#define __PLAYBACK_CS_H_
#include <string>
#include <stdint.h>
#include <vector>
typedef enum {
PLAYMODE_TS = 0,
@@ -61,7 +63,9 @@ public:
bool IsEnabled(void) const { return enabled; }
void FindAllPids(playback_audio_pid_info_t *audiopids, uint16_t size, uint16_t *numpida);
void FindAllPids(uint16_t *apids, unsigned short *ac3flags, uint16_t *numpida, std::string *language);
void FindAllSubs(uint16_t *pids, unsigned short *supported, uint16_t *numpida, std::string *language);
bool SelectSubtitles(int pid);
void GetChapters(std::vector<int> &positions, std::vector<std::string> &titles);
};
#endif // __PLAYBACK_CS_H_