diff options
| -rw-r--r-- | device.c | 44 | ||||
| -rw-r--r-- | frontend_local.c | 12 | ||||
| -rw-r--r-- | frontend_svr.c | 6 | ||||
| -rw-r--r-- | tools/udp_pes_scheduler.c | 4 | ||||
| -rw-r--r-- | xine_fbfe_frontend.c | 4 | ||||
| -rw-r--r-- | xine_frontend.c | 14 | ||||
| -rw-r--r-- | xine_frontend_main.c | 4 | ||||
| -rw-r--r-- | xine_input_vdr.c | 8 |
8 files changed, 27 insertions, 69 deletions
@@ -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.2 2006-06-04 11:00:04 phintuka Exp $ + * $Id: device.c,v 1.3 2006-06-11 19:08:05 phintuka Exp $ * */ @@ -133,25 +133,7 @@ void cXinelibStatusMonitor::Replaying(const cControl *Control, //----------------------------- device ---------------------------------------- -#ifdef USENOPPLAYER -class cNopControl : public cControl { -public: - cNopControl() : cControl(new cPlayer()) - { LOGMSG("cNopControl created"); } - ~cNopControl() - { LOGMSG("cNopControl destroyed"); } - virtual void Hide(void) {}; - - static int NopPlayerActivated; -}; - -int cNopControl::NopPlayerActivated = 0; -#endif - -// // Singleton -// - cXinelibDevice* cXinelibDevice::m_pInstance = NULL; cXinelibDevice& cXinelibDevice::Instance(void) @@ -256,14 +238,6 @@ bool cXinelibDevice::StartDevice() CreateTimerEvent(this, &cXinelibDevice::CheckInactivityTimer, 60*1000, false); #endif -#ifdef USENOPPLAYER - if(!m_local) { - LOGMSG("No clients, activating cNopControl"); - cControl::Launch(new cNopControl); - cNopControl::NopPlayerActivated = true; - } -#endif - LOGDBG("cXinelibDevice::StartDevice(): Device started"); return true; } @@ -308,13 +282,6 @@ void cXinelibDevice::ForcePrimaryDevice(bool On) if(On) { Counter++; -#ifdef USENOPPLAYER - if(cNopControl::NopPlayerActivated) { - LOGMSG("First client, stopping cNopControl"); - cControl::Shutdown(); - cNopControl::NopPlayerActivated = false; - } -#endif if(xc.force_primary_device) { if(cDevice::PrimaryDevice() && this != cDevice::PrimaryDevice()) { /* TODO: may need to use vdr main thread for this */ @@ -335,7 +302,7 @@ void cXinelibDevice::ForcePrimaryDevice(bool On) } else /* Off */ { Counter--; if(Counter<0) - LOGMSG("Internal error (ForcePrimaryDevice < 0)"); + LOGMSG("ForcePrimaryDevice: Internal error (ForcePrimaryDevice < 0)"); if(!Counter) { if(Original) { LOGMSG("Restoring original primary device %d", Original); @@ -350,13 +317,6 @@ void cXinelibDevice::ForcePrimaryDevice(bool On) cDevice::SetPrimaryDevice(Original); Original = 0; } -#ifdef USENOPPLAYER - if(!m_local && !cControl::Control()) { - LOGMSG("No clients, activating cNopControl"); - cControl::Launch(new cNopControl); - cNopControl::NopPlayerActivated = true; - } -#endif } } } diff --git a/frontend_local.c b/frontend_local.c index 13f8f0b0..9bcae10c 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.3 2006-06-04 11:00:04 phintuka Exp $ + * $Id: frontend_local.c,v 1.4 2006-06-11 19:08:05 phintuka Exp $ * */ @@ -246,11 +246,11 @@ frontend_t *cXinelibLocal::load_frontend(const char *fe_name) if(strrchr(libname, '/')) *(strrchr(libname, '/')+1) = 0; - LOGMSG("Searching frontend %s from %s", xc.s_frontends[fe_ind], libname); + LOGDBG("Searching frontend %s from %s", xc.s_frontends[fe_ind], libname); do { strcat(libname, xc.s_frontend_files[fe_ind]); - LOGMSG("Probing %s", libname); + LOGDBG("Probing %s", libname); if (stat(libname, &statbuffer)) { LOGERR("load_frontend: can't stat %s",libname); @@ -272,7 +272,7 @@ frontend_t *cXinelibLocal::load_frontend(const char *fe_name) dlclose(h_fe_lib); h_fe_lib = lib; - LOGMSG("Using frontend %s (%s) from %s", + LOGDBG("Using frontend %s (%s) from %s", xc.s_frontends[fe_ind], xc.s_frontendNames[fe_ind], xc.s_frontend_files[fe_ind]); @@ -437,7 +437,7 @@ void cXinelibLocal::Action(void) fe = NULL; } - LOGMSG("cXinelibLocal::Action - Xine closed"); + LOGMSG("cXinelibLocal::Action: Xine closed"); } if(curr_fe) { @@ -447,6 +447,6 @@ void cXinelibLocal::Action(void) } m_bIsFinished = true; - LOGMSG("cXinelibLocal::Action - finished"); + LOGMSG("cXinelibLocal::Action: thread finished"); } diff --git a/frontend_svr.c b/frontend_svr.c index 75fc7b4c..51bbcb27 100644 --- a/frontend_svr.c +++ b/frontend_svr.c @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: frontend_svr.c,v 1.4 2006-06-11 10:20:53 phintuka Exp $ + * $Id: frontend_svr.c,v 1.5 2006-06-11 19:08:05 phintuka Exp $ * */ @@ -1165,12 +1165,12 @@ void cXinelibServer::Action(void) /* request real-time scheduling */ if (!pthread_setschedparam(pthread_self(), SCHED_RR, &temp)) { - LOGMSG("cXinelibServer priority set successful SCHED_RR %d [%d,%d]", + LOGDBG("cXinelibServer priority set successful SCHED_RR %d [%d,%d]", temp.sched_priority, sched_get_priority_min(SCHED_RR), sched_get_priority_max(SCHED_RR)); } else { - LOGMSG("cXinelibServer: Can't set priority to SCHED_RR %d [%d,%d]", + LOGDBG("cXinelibServer: Can't set priority to SCHED_RR %d [%d,%d]", temp.sched_priority, sched_get_priority_min(SCHED_RR), sched_get_priority_max(SCHED_RR)); diff --git a/tools/udp_pes_scheduler.c b/tools/udp_pes_scheduler.c index c5c435fb..b9a929fe 100644 --- a/tools/udp_pes_scheduler.c +++ b/tools/udp_pes_scheduler.c @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: udp_pes_scheduler.c,v 1.3 2006-06-11 15:50:47 phintuka Exp $ + * $Id: udp_pes_scheduler.c,v 1.4 2006-06-11 19:08:05 phintuka Exp $ * */ @@ -516,7 +516,7 @@ void cUdpScheduler::Action(void) #endif { if(m_QueuePending > (MAX_QUEUE_SIZE-5)) - LOGMSG("cUdpScheduler: kernel transmit queue > ~30kb ! (master=%d ; Queue=%d)", + LOGDBG("cUdpScheduler: kernel transmit queue > ~30kb ! (master=%d ; Queue=%d)", m_Master, m_QueuePending); CondWait.Wait(2); } diff --git a/xine_fbfe_frontend.c b/xine_fbfe_frontend.c index 8157293b..dddbfbcc 100644 --- a/xine_fbfe_frontend.c +++ b/xine_fbfe_frontend.c @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: xine_fbfe_frontend.c,v 1.2 2006-06-04 11:00:04 phintuka Exp $ + * $Id: xine_fbfe_frontend.c,v 1.3 2006-06-11 19:08:05 phintuka Exp $ * */ @@ -109,7 +109,7 @@ static void fbfe_update_display_size(frontend_t *this_gen) VO_PROP_WINDOW_WIDTH); this->height = this->video_port->get_property(this->video_port, VO_PROP_WINDOW_HEIGHT); - LOGMSG("Framebuffer size after initialization: %dx%d", + LOGDBG("Framebuffer size after initialization: %dx%d", this->width, this->height); } } diff --git a/xine_frontend.c b/xine_frontend.c index 93c3a689..0fd845e0 100644 --- a/xine_frontend.c +++ b/xine_frontend.c @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: xine_frontend.c,v 1.3 2006-06-04 11:00:04 phintuka Exp $ + * $Id: xine_frontend.c,v 1.4 2006-06-11 19:08:05 phintuka Exp $ * */ @@ -570,7 +570,7 @@ static int fe_post_close(fe_t *this, const char *name, int which) /* by name */ if(name) { - LOGMSG("closing post plugin: %s", name); + LOGDBG("closing post plugin: %s", name); if(applugin_unload_post(posts, name)) { /*LOGDBG(" * rewiring audio");*/ applugin_rewire_posts(posts); @@ -589,7 +589,7 @@ static int fe_post_close(fe_t *this, const char *name, int which) if(posts->post_vis_elements_num && posts->post_vis_elements && posts->post_vis_elements[0]) { - LOGMSG("Closing audio visualization post plugins"); + LOGDBG("Closing audio visualization post plugins"); if(applugin_unload_post(posts, posts->post_vis_elements[0]->name)) { /*LOGDBG(" * rewiring audio");*/ applugin_rewire_posts(posts); @@ -599,7 +599,7 @@ static int fe_post_close(fe_t *this, const char *name, int which) } if(which == POST_AUDIO || which < 0) { /* audio effect(s) */ - LOGMSG("Closing audio post plugins"); + LOGDBG("Closing audio post plugins"); if(applugin_disable_post(posts, NULL)) { /*LOGDBG(" * rewiring audio");*/ applugin_rewire_posts(posts); @@ -607,7 +607,7 @@ static int fe_post_close(fe_t *this, const char *name, int which) } } if(which == POST_VIDEO || which < 0) { /* video effect(s) */ - LOGMSG("Closing video post plugins"); + LOGDBG("Closing video post plugins"); if(vpplugin_unload_post(posts, NULL)) { /*LOGDBG(" * rewiring video");*/ vpplugin_rewire_posts(posts); @@ -619,7 +619,7 @@ static int fe_post_close(fe_t *this, const char *name, int which) if(posts->post_pip_elements_num && posts->post_pip_elements && posts->post_pip_elements[0]) { - LOGMSG("Closing PIP (mosaico) post plugins"); + LOGDBG("Closing PIP (mosaico) post plugins"); if(vpplugin_unload_post(posts, "mosaico")) { /*LOGDBG(" * rewiring video");*/ vpplugin_rewire_posts(posts); @@ -1081,7 +1081,7 @@ static char *fe_grab(frontend_t *this_gen, int *size, int jpeg, if(!this->input && !find_input(this)) return 0; - LOGMSG("fe_grab: grabbing %s %d %dx%d", + LOGDBG("fe_grab: grabbing %s %d %dx%d", jpeg ? "JPEG" : "PNM", quality, width, height); if (quality < 0 || quality > 100) diff --git a/xine_frontend_main.c b/xine_frontend_main.c index e9db2ae1..bf227f20 100644 --- a/xine_frontend_main.c +++ b/xine_frontend_main.c @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: xine_frontend_main.c,v 1.3 2006-06-06 07:57:41 phintuka Exp $ + * $Id: xine_frontend_main.c,v 1.4 2006-06-11 19:08:05 phintuka Exp $ * */ @@ -139,7 +139,7 @@ static void *kbd_receiver_thread(void *fe) } while(!terminate_key_pressed && code != 0xffff); - LOGMSG("Keyboard thread terminated"); + LOGDBG("Keyboard thread terminated"); tcsetattr(STDIN_FILENO, TCSANOW, &saved_tm); pthread_exit(NULL); return NULL; /* never reached */ diff --git a/xine_input_vdr.c b/xine_input_vdr.c index aa4e273f..0835cbba 100644 --- a/xine_input_vdr.c +++ b/xine_input_vdr.c @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: xine_input_vdr.c,v 1.5 2006-06-11 15:44:40 phintuka Exp $ + * $Id: xine_input_vdr.c,v 1.6 2006-06-11 19:08:05 phintuka Exp $ * */ @@ -2172,10 +2172,8 @@ static int control_read_cmd(vdr_input_plugin_t *this, char *buf, int maxlen) if (num_bytes <= 0) { LOGERR("control_read_cmd read error at [%d]", num_bytes); if(num_bytes < 0 && errno == EINTR && this->fd_control >= 0) { -LOGMSG("EINTR - continue"); continue; } -LOGMSG("return -1"); return -1; } @@ -3144,7 +3142,7 @@ static int vdr_plugin_read_net_udp(vdr_input_plugin_t *this) Waiting for free buffers just makes things worse ... */ if(num_free < 5) { if(!this->is_paused) { - LOGMSG("UDP Fifo buffer full !"); + LOGDBG("UDP Fifo buffer full !"); if(this->scr && !udp->scr_jump_done) { pvrscr_skip_frame (this->scr); @@ -3834,7 +3832,7 @@ static void vdr_plugin_dispose (input_plugin_t *this_gen) if(!this_gen) return; - LOGMSG("vdr_plugin_dispose"); + LOGDBG("vdr_plugin_dispose"); if (this->slave_event_queue) xine_event_dispose_queue (this->slave_event_queue); |