diff --git a/src/driver/audioplay.cpp b/src/driver/audioplay.cpp index 956319297..494eb9baf 100644 --- a/src/driver/audioplay.cpp +++ b/src/driver/audioplay.cpp @@ -90,7 +90,6 @@ void* CAudioPlayer::PlayThread( void* /*dummy*/ ) { int soundfd = -1; set_threadname("audio:play"); - g_RCInput->close_click(); /* Decode stdin to stdout. */ CBaseDec::RetCode Status = CBaseDec::DecoderBase( &getInstance()->m_Audiofile, soundfd, @@ -109,8 +108,6 @@ void* CAudioPlayer::PlayThread( void* /*dummy*/ ) "unknown" ); } - g_RCInput->open_click(); - getInstance()->state = CBaseDec::STOP; pthread_exit(0); return NULL; diff --git a/src/driver/rcinput.cpp b/src/driver/rcinput.cpp index 12c7903f2..d35c07701 100644 --- a/src/driver/rcinput.cpp +++ b/src/driver/rcinput.cpp @@ -143,7 +143,6 @@ CRCInput::CRCInput() perror("[neutrino] listen failed...\n"); exit( -1 ); } - clickfd = -1; repeat_block = repeat_block_generic = 0; checkdev(); open(); @@ -283,7 +282,6 @@ void CRCInput::open(bool recheck) //+++++++++++++++++++++++++++++++++++++++ #endif /* KEYBOARD_INSTEAD_OF_REMOTE_CONTROL */ - open_click(); calculateMaxFd(); } @@ -344,7 +342,6 @@ CRCInput::~CRCInput() if(fd_event) ::close(fd_event); - close_click(); } /************************************************************************** @@ -1416,8 +1413,6 @@ void CRCInput::getMsg_us(neutrino_msg_t * msg, neutrino_msg_data_t * data, uint6 *msg = trkey; *data = 0; /* <- button pressed */ - if(g_settings.key_click) - play_click(); return; } } /*if keyok */ @@ -1722,27 +1717,6 @@ int CRCInput::translate(int code) return (int)RC_nokey; } -void CRCInput::close_click() -{ -} - -void CRCInput::open_click() -{ -} -#if 0 -//never used -void CRCInput::reset_dsp(int /*rate*/) -{ -} - -void CRCInput::set_dsp() -{ -} -#endif -void CRCInput::play_click() -{ -} - void CRCInput::setKeyRepeatDelay(unsigned int start_ms, unsigned int repeat_ms) { for (std::vector::iterator it = indev.begin(); it != indev.end(); ++it) { diff --git a/src/driver/rcinput.h b/src/driver/rcinput.h index 93689f145..d2c29e50f 100644 --- a/src/driver/rcinput.h +++ b/src/driver/rcinput.h @@ -161,10 +161,8 @@ class CRCInput int fd_event; int fd_max; - int clickfd; __u16 rc_last_key; OpenThreads::Mutex mutex; - void set_dsp(); void open(bool recheck = false); bool checkpath(in_dev id); @@ -323,10 +321,6 @@ class CRCInput void clearRCMsg(); int messageLoop( bool anyKeyCancels = false, int timeout= -1 ); - void open_click(); - void close_click(); - void play_click(); - void reset_dsp(int rate); void setLongPressAny(bool b) { longPressAny = b; }; void setKeyRepeatDelay(unsigned int start_ms, unsigned int repeat_ms); diff --git a/src/gui/scan.cpp b/src/gui/scan.cpp index f9d24c9ae..de26daf1b 100644 --- a/src/gui/scan.cpp +++ b/src/gui/scan.cpp @@ -287,7 +287,6 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey) success = false; if(!manual) { - g_RCInput->close_click(); if (my_system(NEUTRINO_SCAN_START_SCRIPT) != 0) perror(NEUTRINO_SCAN_START_SCRIPT " failed"); } @@ -356,7 +355,6 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey) if(!manual) { if (my_system(NEUTRINO_SCAN_STOP_SCRIPT) != 0) perror(NEUTRINO_SCAN_STOP_SCRIPT " failed"); - g_RCInput->open_click(); } if(!test) { CComponentsHeaderLocalized header(x, y, width, hheight, success ? LOCALE_SCANTS_FINISHED : LOCALE_SCANTS_FAILED); diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 2526e4043..c1e429075 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -4540,7 +4540,6 @@ void CNeutrinoApp::loadKeys(const char * fname) /* options */ g_settings.menu_left_exit = tconfig.getInt32( "menu_left_exit", 0 ); - g_settings.key_click = tconfig.getInt32( "key_click", 1 ); g_settings.repeat_blocker = tconfig.getInt32("repeat_blocker", 450); g_settings.repeat_genericblocker = tconfig.getInt32("repeat_genericblocker", 100); g_settings.longkeypress_duration = tconfig.getInt32("longkeypress_duration", LONGKEYPRESS_OFF); @@ -4623,7 +4622,6 @@ void CNeutrinoApp::saveKeys(const char * fname) tconfig.setInt32( "key_pic_size_active", g_settings.key_pic_size_active ); tconfig.setInt32( "menu_left_exit", g_settings.menu_left_exit ); - tconfig.setInt32( "key_click", g_settings.key_click ); tconfig.setInt32( "repeat_blocker", g_settings.repeat_blocker ); tconfig.setInt32( "repeat_genericblocker", g_settings.repeat_genericblocker ); tconfig.setInt32( "longkeypress_duration", g_settings.longkeypress_duration ); diff --git a/src/system/settings.h b/src/system/settings.h index b56e1240a..02daab6b8 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -508,7 +508,6 @@ struct SNeutrinoSettings int key_list_end; int key_power_off; int menu_left_exit; - int key_click; int timeshift_pause; int auto_timeshift; int temp_timeshift;