diff options
| -rw-r--r-- | config.c | 6 | ||||
| -rw-r--r-- | config.h | 10 | ||||
| -rw-r--r-- | device.c | 8 | ||||
| -rw-r--r-- | device.h | 4 | ||||
| -rw-r--r-- | frontend.h | 4 | ||||
| -rw-r--r-- | frontend_local.c | 25 | ||||
| -rw-r--r-- | frontend_local.h | 4 | ||||
| -rw-r--r-- | i18n.c | 62 | ||||
| -rw-r--r-- | setup_menu.c | 14 |
9 files changed, 19 insertions, 118 deletions
@@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: config.c,v 1.31 2007-03-25 02:39:26 phintuka Exp $ + * $Id: config.c,v 1.32 2007-04-12 22:53:36 phintuka Exp $ * */ @@ -41,8 +41,6 @@ const char *config_t::s_deinterlaceMethods[] = const char *config_t::s_deinterlaceMethodNames[] = {"off", "Bob", "Weave", "Greedy", "One Field", "One Field XV", "Linear Blend", "TvTime", NULL}; -const char *config_t::s_decoderPriority[] = - {"low", "normal", "high", 0}; const char *config_t::s_fieldOrder[] = {"normal", "inverted", NULL}; const char *config_t::s_audioDriverNames[] = @@ -252,7 +250,6 @@ config_t::config_t() { audio_surround = 0; sw_volume_control = 0; - decoder_priority = DECODER_PRIORITY_NORMAL; pes_buffers = i_pesBufferSize[PES_BUFFERS_SMALL_250]; strn0cpy(deinterlace_method, s_deinterlaceMethods[DEINTERLACE_NONE], sizeof(deinterlace_method)); strn0cpy(deinterlace_opts, DEFAULT_DEINTERLACE_OPTS, sizeof(deinterlace_opts)); @@ -510,7 +507,6 @@ bool config_t::SetupParse(const char *Name, const char *Value) else if (!strcasecmp(Name, "Remote.Iface")) STRN0CPY(remote_iface, Value); else if (!strcasecmp(Name, "Remote.LocalIP")) STRN0CPY(remote_address, Value); - else if (!strcasecmp(Name, "Decoder.Priority")) decoder_priority=strstra(Value,s_decoderPriority,1); else if (!strcasecmp(Name, "Decoder.PesBuffers")) pes_buffers=atoi(Value); else if (!strcasecmp(Name, "Video.Driver")) STRN0CPY(video_driver, Value); @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: config.h,v 1.21 2007-03-25 02:39:26 phintuka Exp $ + * $Id: config.h,v 1.22 2007-04-12 22:53:36 phintuka Exp $ * */ @@ -44,12 +44,6 @@ #define DEINTERLACE_TVTIME 7 #define DEINTERLACE_count 8 -// Decoder priority -#define DECODER_PRIORITY_LOW 0 -#define DECODER_PRIORITY_NORMAL 1 -#define DECODER_PRIORITY_HIGH 2 -#define DECODER_PRIORITY_count 3 - #define FIELD_ORDER_NORMAL 0 #define FIELD_ORDER_INVERTED 1 #define FIELD_ORDER_count 2 @@ -152,7 +146,6 @@ class config_t { static const char *s_aspects[]; static const char *s_deinterlaceMethods[]; static const char *s_deinterlaceMethodNames[]; - static const char *s_decoderPriority[]; static const char *s_fieldOrder[]; static const char *s_audioDriverNames[]; static const char *s_audioDrivers[]; @@ -188,7 +181,6 @@ class config_t { int audio_upmix; int sw_volume_control; /* software (xine-lib) or hardware (alsa) volume control and muting */ - int decoder_priority; int pes_buffers; char deinterlace_method[32]; char deinterlace_opts[256]; @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: device.c,v 1.36 2007-03-28 14:40:10 phintuka Exp $ + * $Id: device.c,v 1.37 2007-04-12 22:53:36 phintuka Exp $ * */ @@ -469,14 +469,14 @@ void cXinelibDevice::ConfigureVideo(int hue, int saturation, int brightness, int m_server->ConfigureVideo(hue, saturation, brightness, contrast, overscan); } -void cXinelibDevice::ConfigureDecoder(int pes_buffers, int priority) +void cXinelibDevice::ConfigureDecoder(int pes_buffers) { TRACEF("cXinelibDevice::ConfigureDecoder"); if(m_local) - m_local->ConfigureDecoder(pes_buffers, priority); + m_local->ConfigureDecoder(pes_buffers); //if(m_server) - // m_server->ConfigureDecoder(pes_buffers, priority); + // m_server->ConfigureDecoder(pes_buffers); cXinelibOsdProvider::RefreshOsd(); } @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: device.h,v 1.22 2007-03-14 17:40:38 phintuka Exp $ + * $Id: device.h,v 1.23 2007-04-12 22:53:36 phintuka Exp $ * */ @@ -222,7 +222,7 @@ class cXinelibDevice : public cDevice void ConfigureWindow(int fullscreen, int width, int height, int modeswitch, const char *modeline, int aspect, int scale_video, int field_order); - void ConfigureDecoder(int pes_buffers, int priority); + void ConfigureDecoder(int pes_buffers); // remote mode: void Listen(bool activate, int port); @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: frontend.h,v 1.13 2007-01-24 01:05:34 phintuka Exp $ + * $Id: frontend.h,v 1.14 2007-04-12 22:53:36 phintuka Exp $ * */ @@ -122,7 +122,7 @@ class cXinelibThread : public cThread, public cListObject int modeswitch, const char *modeline, int aspect, int scale_video, int field_order) {}; - virtual void ConfigureDecoder(int pes_buffers, int priority) {}; + virtual void ConfigureDecoder(int pes_buffers) {}; // Remote frontend server: virtual bool Listen(int port) { return false; } diff --git a/frontend_local.c b/frontend_local.c index c894d75a..1e01a5a4 100644 --- a/frontend_local.c +++ b/frontend_local.c @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: frontend_local.c,v 1.23 2007-03-14 13:21:08 phintuka Exp $ + * $Id: frontend_local.c,v 1.24 2007-04-12 22:53:36 phintuka Exp $ * */ @@ -177,13 +177,12 @@ void cXinelibLocal::ConfigureWindow(int fullscreen, int width, int height, aspect, scale_video, field_order); } -void cXinelibLocal::ConfigureDecoder(int pes_buffers, int priority) +void cXinelibLocal::ConfigureDecoder(int pes_buffers) { // needs xine restart { LOCK_FE; xc.pes_buffers = pes_buffers; - xc.decoder_priority = priority; if(!fe) return; m_bReady = false; @@ -334,24 +333,6 @@ void cXinelibLocal::Action(void) TRACEF("cXinelibLocal::Action"); SetPriority(2); /* lower priority */ -#if 0 - // set priority - sched_param temp; - temp.sched_priority = 2; - - if (!pthread_setschedparam(pthread_self(), SCHED_RR, &temp)) { - TRACE("cXinelibLocal("<<getpid()<<"): priority set successful to " - << temp.sched_priority << - " [" << sched_get_priority_min(SCHED_RR) << "," - << sched_get_priority_max(SCHED_RR) << "]"); - } else { - TRACE("cXinelibLocal(" << getpid() << "): Error: can't set priority to " - << temp.sched_priority << " [" - << sched_get_priority_min(SCHED_RR) - << "," << sched_get_priority_max(SCHED_RR) << "]"); - } - errno = 0; -#endif // init frontend if(!curr_fe) { @@ -387,7 +368,7 @@ void cXinelibLocal::Action(void) if(m_bReconfigRequest) { if(!fe->xine_init(fe, xc.audio_driver, xc.audio_port, xc.video_driver, - xc.pes_buffers, xc.decoder_priority, + xc.pes_buffers, 0, xc.post_plugins)) { LOGMSG("cXinelibLocal: Error initializing frontend"); break; diff --git a/frontend_local.h b/frontend_local.h index a05e47fa..84dd2ad4 100644 --- a/frontend_local.h +++ b/frontend_local.h @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: frontend_local.h,v 1.4 2007-01-24 01:06:09 phintuka Exp $ + * $Id: frontend_local.h,v 1.5 2007-04-12 22:53:36 phintuka Exp $ * */ @@ -51,7 +51,7 @@ class cXinelibLocal : public cXinelibThread virtual void ConfigureWindow(int fullscreen, int width, int height, int modeswitch, const char *modeline, int aspect, int scale_video, int field_order); - virtual void ConfigureDecoder(int pes_buffers, int priority); + virtual void ConfigureDecoder(int pes_buffers); protected: @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: i18n.c,v 1.18 2007-04-02 15:36:25 phintuka Exp $ + * $Id: i18n.c,v 1.19 2007-04-12 22:53:36 phintuka Exp $ * * Translations provided by: * @@ -59,46 +59,6 @@ const tI18nPhrase Phrases[] = { "", // Croatian }, { - "high", // English - "Hoch", // Deutsch - "", // Slovenski - "", // Italiano - "", // Nederlands - "", // Português - "", // Français - "", // Norsk - "korkea", // Suomi - "", // Polski - "", // Español - "", // Ellinika - "", // Svenska - "", // Romaneste - "", // Magyar - "", // Catala - "²ëáÞÚØÙ", // Russian - "", // Croatian - }, - { - "low", // English - "Niedrig", // Deutsch - "", // Slovenski - "", // Italiano - "", // Nederlands - "", // Português - "", // Français - "", // Norsk - "matala", // Suomi - "", // Polski - "", // Español - "", // Ellinika - "", // Svenska - "", // Romaneste - "", // Magyar - "", // Catala - "½Ø×ÚØÙ", // Russian - "", // Croatian - }, - { "normal", // English "Normal", // Deutsch "", // Slovenski @@ -605,26 +565,6 @@ const tI18nPhrase Phrases[] = { "", // Croatian }, { - "Priority", // English - "Priorität", // Deutsch - "", // Slovenski - "", // Italiano - "", // Nederlands - "", // Português - "", // Français - "", // Norsk - "Prioriteetti", // Suomi - "", // Polski - "", // Español - "", // Ellinika - "", // Svenska - "", // Romaneste - "", // Magyar - "", // Catala - "¿àØÞàØâÕâ", // Russian - "", // Croatian - }, - { "custom", // English "Benutzerdefiniert", // Deutsch "", // Slovenski diff --git a/setup_menu.c b/setup_menu.c index 25a90d36..b90b0d22 100644 --- a/setup_menu.c +++ b/setup_menu.c @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: setup_menu.c,v 1.24 2007-03-28 06:58:43 phintuka Exp $ + * $Id: setup_menu.c,v 1.25 2007-04-12 22:53:36 phintuka Exp $ * */ @@ -918,8 +918,6 @@ void cMenuSetupDecoder::Set(void) Clear(); Add(NewTitle(tr("Decoder"))); - Add(new cMenuEditStraI18nItem(tr("Priority"), &newconfig.decoder_priority, - DECODER_PRIORITY_count, xc.s_decoderPriority)); Add(ctrl_pes_buffers_ind = new cMenuEditStraI18nItem(tr("Buffer size"), &pes_buffers_ind, PES_BUFFERS_count, xc.s_bufferSize)); @@ -960,21 +958,17 @@ eOSState cMenuSetupDecoder::ProcessKey(eKeys Key) void cMenuSetupDecoder::Store(void) { int old_buffers = xc.pes_buffers; - int old_priority = xc.decoder_priority; //memcpy(&xc, &newconfig, sizeof(config_t)); xc.pes_buffers = newconfig.pes_buffers; - xc.decoder_priority = newconfig.decoder_priority; if(pes_buffers_ind != PES_BUFFERS_CUSTOM) xc.pes_buffers = xc.i_pesBufferSize[pes_buffers_ind]; - SetupStore("Decoder.Priority", xc.s_decoderPriority[xc.decoder_priority]); SetupStore("Decoder.PesBuffers", xc.pes_buffers); - if(xc.pes_buffers != old_buffers || xc.decoder_priority != old_priority) - cXinelibDevice::Instance().ConfigureDecoder(xc.pes_buffers, - xc.decoder_priority); + if(xc.pes_buffers != old_buffers) + cXinelibDevice::Instance().ConfigureDecoder(xc.pes_buffers); } @@ -1213,12 +1207,10 @@ eOSState cMenuSetupLocal::ProcessKey(eKeys Key) void cMenuSetupLocal::Store(void) { int old_buffers = xc.pes_buffers; - int old_priority = xc.decoder_priority; memcpy(&xc, &newconfig, sizeof(config_t)); xc.pes_buffers = old_buffers; - xc.decoder_priority = old_priority; strn0cpy(xc.audio_driver, xc.s_audioDrivers[audio_driver], sizeof(xc.audio_driver)); strn0cpy(xc.local_frontend, xc.s_frontends[local_frontend], sizeof(xc.local_frontend)); |