[Xineliboutput-cvslog] vdr-xineliboutput frontend_local.c, 1.25, 1.26
Brought to you by:
phintuka
From: Petri H. <phi...@us...> - 2007-05-17 17:07:14
|
Update of /cvsroot/xineliboutput/vdr-xineliboutput In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv15474 Modified Files: frontend_local.c Log Message: (no functional changes) Index: frontend_local.c =================================================================== RCS file: /cvsroot/xineliboutput/vdr-xineliboutput/frontend_local.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- frontend_local.c 17 May 2007 17:04:20 -0000 1.25 +++ frontend_local.c 17 May 2007 17:07:13 -0000 1.26 @@ -46,6 +46,29 @@ #define LOCK_FE cRwLockBlock(m_feLock, false) #define LOCK_FE_WR cRwLockBlock(m_feLock, true) +//----------------- keyboard control handler (C callback) -------------------- + +extern "C" { + static void keypress_handler(const char *keymap, const char *key) + { + if(!strncmp("INFO ", keymap, 5)) { + + cXinelibThread::InfoHandler(keymap+5); + + } else if(!xc.use_x_keyboard || !key) { + + /* Only X11 key events came this way in local mode. + Keyboard is handled by vdr. */ + LOGMSG("keypress_handler(%s): X11 Keyboard disabled in config", key); + + } else { + + cXinelibThread::KeypressHandler(keymap, key, false, false); + + } + } +}; + //----------------------------- cXinelibLocal -------------------------------- cXinelibLocal::cXinelibLocal(const char *frontend_name) : @@ -210,7 +233,6 @@ LOGMSG("Xine_Control: message too long ! (%s)", buf); return 0; } - //buf[sizeof(buf)-1] = 0; LOCK_FE; if(fe) return fe->xine_control(fe, (char*)buf); @@ -219,31 +241,6 @@ } // -// keyboard control handler (C callback) -// - -extern "C" { - static void keypress_handler(const char *keymap, const char *key) - { - if(!strncmp("INFO ", keymap, 5)) { - - cXinelibThread::InfoHandler(keymap+5); - - } else if(!xc.use_x_keyboard || !key) { - - /* Only X11 key events came this way in local mode. - Keyboard is handled by vdr. */ - LOGMSG("keypress_handler(%s): X11 Keyboard disabled in config", key); - - } else { - - cXinelibThread::KeypressHandler(keymap, key, false, false); - - } - } -}; - -// // Frontend loader // |