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

Merge remote-tracking branch 'check/next-cc'

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: f6d8c02313
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-19 (Wed, 19 Feb 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2014-02-19 11:29:29 +01:00
parent e942dbf393 70d67dce5f
commit a3d104a600
5 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/driver/audiodec/ffmpegdec.cpp
View File

@@ -247,16 +247,20 @@ CBaseDec::RetCode CFfmpegDec::Decoder(FILE *_in, int /*OutputFd*/, State* state,
AVFrame *frame = NULL; AVFrame *frame = NULL;
AVPacket rpacket; AVPacket rpacket;
av_init_packet(&rpacket); av_init_packet(&rpacket);
c->channel_layout = c->channel_layout ? c->channel_layout : AV_CH_LAYOUT_STEREO;
av_opt_set_int(swr, "in_channel_layout", c->channel_layout, 0); av_opt_set_int(swr, "in_channel_layout", c->channel_layout, 0);
//av_opt_set_int(swr, "out_channel_layout", c->channel_layout, 0); //av_opt_set_int(swr, "out_channel_layout", c->channel_layout, 0);
av_opt_set_int(swr, "out_channel_layout", AV_CH_LAYOUT_STEREO, 0); av_opt_set_int(swr, "out_channel_layout", AV_CH_LAYOUT_STEREO, 0);
av_opt_set_int(swr, "in_sample_rate", c->sample_rate, 0); av_opt_set_int(swr, "in_sample_rate", c->sample_rate, 0);
av_opt_set_int(swr, "out_sample_rate", c->sample_rate, 0); av_opt_set_int(swr, "out_sample_rate", c->sample_rate, 0);
av_opt_set_int(swr, "in_sample_fmt", c->sample_fmt, 0); av_opt_set_sample_fmt(swr, "in_sample_fmt", c->sample_fmt, 0);
av_opt_set_int(swr, "out_sample_fmt", AV_SAMPLE_FMT_S16, 0); av_opt_set_sample_fmt(swr, "out_sample_fmt", AV_SAMPLE_FMT_S16, 0);
swr_init(swr); if (( swr_init(swr)) < 0) {
Status=DATA_ERR;
return Status;
}
uint8_t *outbuf = NULL; uint8_t *outbuf = NULL;
int outsamples = 0; int outsamples = 0;

8
src/driver/rcinput.cpp
View File

@@ -1266,7 +1266,7 @@ void CRCInput::getMsg_us(neutrino_msg_t * msg, neutrino_msg_data_t * data, uint6
firstKey = false; firstKey = false;
CTimerManager::getInstance()->cancelShutdownOnWakeup(); CTimerManager::getInstance()->cancelShutdownOnWakeup();
} }
uint32_t trkey = translate(ev.code, i); uint32_t trkey = translate(ev.code);
#ifdef _DEBUG #ifdef _DEBUG
printf("key: %04x value %d, translate: %04x -%s-\n", ev.code, ev.value, trkey, getKeyName(trkey).c_str()); printf("key: %04x value %d, translate: %04x -%s-\n", ev.code, ev.value, trkey, getKeyName(trkey).c_str());
#endif #endif
@@ -1627,7 +1627,7 @@ const char *CRCInput::getKeyNameC(const unsigned int key)
* transforms the rc-key to generic - internal use only! * transforms the rc-key to generic - internal use only!
* *
**************************************************************************/ **************************************************************************/
int CRCInput::translate(int code, int /*num*/) int CRCInput::translate(int code)
{ {
switch(code) switch(code)
{ {
@@ -1650,8 +1650,8 @@ int CRCInput::translate(int code, int /*num*/)
} }
if ((code >= 0) && (code <= KEY_MAX)) if ((code >= 0) && (code <= KEY_MAX))
return code; return code;
else
return ( unsigned int)RC_nokey; return (int)RC_nokey;
} }
void CRCInput::close_click() void CRCInput::close_click()

2
src/driver/rcinput.h
View File

@@ -161,7 +161,7 @@ class CRCInput
void open(int dev = -1); void open(int dev = -1);
void close(); void close();
int translate(int code, int num); int translate(int code);
void calculateMaxFd(void); void calculateMaxFd(void);
int checkTimers(); int checkTimers();
#ifdef IOC_IR_SET_PRI_PROTOCOL #ifdef IOC_IR_SET_PRI_PROTOCOL

2
src/gui/components/cc_item_picture.cpp
View File

@@ -153,7 +153,7 @@ void CComponentsPicture::initCCItem()
void CComponentsPicture::initPosition() void CComponentsPicture::initPosition()
{ {
//using of real x/y values to paint images if this picture object is bound in a parent form //using of real x/y values to paint images if this picture object is bound in a parent form
int px = x, py = y; int px = pic_x = x, py = pic_y = y;
if (cc_parent){ if (cc_parent){
px = cc_xr; px = cc_xr;
py = cc_yr; py = cc_yr;

2
src/system/helpers.cpp
View File

@@ -84,7 +84,7 @@ void wakeup_hdd(const char *hdd_dir)
if(!check_dir(hdd_dir) && hdd_get_standby(hdd_dir)){ if(!check_dir(hdd_dir) && hdd_get_standby(hdd_dir)){
std::string wakeup_file = hdd_dir; std::string wakeup_file = hdd_dir;
wakeup_file += "/.wakeup"; wakeup_file += "/.wakeup";
int fd = open(wakeup_file.c_str(), O_SYNC | O_WRONLY | O_CREAT | O_TRUNC); int fd = open(wakeup_file.c_str(), O_SYNC | O_WRONLY | O_CREAT | O_TRUNC, S_IWUSR);
if (fd >= 0) { if (fd >= 0) {
unsigned char buf[512]; unsigned char buf[512];
memset(buf, 0xFF, sizeof(buf)); memset(buf, 0xFF, sizeof(buf));