mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-28 16:01:10 +02:00
rcinput: remove unused/unimplemented click functions
Origin commit data
------------------
Branch: ni/coolstream
Commit: f45456d7a8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-20 (Mon, 20 Feb 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
committed by
Michael Liebmann
parent
3c678d45cf
commit
85b82bd12f
@@ -90,7 +90,6 @@ void* CAudioPlayer::PlayThread( void* /*dummy*/ )
|
|||||||
{
|
{
|
||||||
int soundfd = -1;
|
int soundfd = -1;
|
||||||
set_threadname("audio:play");
|
set_threadname("audio:play");
|
||||||
g_RCInput->close_click();
|
|
||||||
/* Decode stdin to stdout. */
|
/* Decode stdin to stdout. */
|
||||||
CBaseDec::RetCode Status =
|
CBaseDec::RetCode Status =
|
||||||
CBaseDec::DecoderBase( &getInstance()->m_Audiofile, soundfd,
|
CBaseDec::DecoderBase( &getInstance()->m_Audiofile, soundfd,
|
||||||
@@ -109,8 +108,6 @@ void* CAudioPlayer::PlayThread( void* /*dummy*/ )
|
|||||||
"unknown" );
|
"unknown" );
|
||||||
}
|
}
|
||||||
|
|
||||||
g_RCInput->open_click();
|
|
||||||
|
|
||||||
getInstance()->state = CBaseDec::STOP;
|
getInstance()->state = CBaseDec::STOP;
|
||||||
pthread_exit(0);
|
pthread_exit(0);
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@@ -143,7 +143,6 @@ CRCInput::CRCInput()
|
|||||||
perror("[neutrino] listen failed...\n");
|
perror("[neutrino] listen failed...\n");
|
||||||
exit( -1 );
|
exit( -1 );
|
||||||
}
|
}
|
||||||
clickfd = -1;
|
|
||||||
repeat_block = repeat_block_generic = 0;
|
repeat_block = repeat_block_generic = 0;
|
||||||
checkdev();
|
checkdev();
|
||||||
open();
|
open();
|
||||||
@@ -335,7 +334,6 @@ void CRCInput::open(bool recheck)
|
|||||||
//+++++++++++++++++++++++++++++++++++++++
|
//+++++++++++++++++++++++++++++++++++++++
|
||||||
#endif /* KEYBOARD_INSTEAD_OF_REMOTE_CONTROL */
|
#endif /* KEYBOARD_INSTEAD_OF_REMOTE_CONTROL */
|
||||||
|
|
||||||
open_click();
|
|
||||||
calculateMaxFd();
|
calculateMaxFd();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -396,7 +394,6 @@ CRCInput::~CRCInput()
|
|||||||
|
|
||||||
if(fd_event)
|
if(fd_event)
|
||||||
::close(fd_event);
|
::close(fd_event);
|
||||||
close_click();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**************************************************************************
|
/**************************************************************************
|
||||||
@@ -1474,8 +1471,6 @@ void CRCInput::getMsg_us(neutrino_msg_t * msg, neutrino_msg_data_t * data, uint6
|
|||||||
|
|
||||||
*msg = trkey;
|
*msg = trkey;
|
||||||
*data = 0; /* <- button pressed */
|
*data = 0; /* <- button pressed */
|
||||||
if(g_settings.key_click)
|
|
||||||
play_click();
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
} /*if keyok */
|
} /*if keyok */
|
||||||
@@ -1780,27 +1775,6 @@ int CRCInput::translate(int code)
|
|||||||
return (int)RC_nokey;
|
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)
|
void CRCInput::setKeyRepeatDelay(unsigned int start_ms, unsigned int repeat_ms)
|
||||||
{
|
{
|
||||||
for (std::vector<in_dev>::iterator it = indev.begin(); it != indev.end(); ++it) {
|
for (std::vector<in_dev>::iterator it = indev.begin(); it != indev.end(); ++it) {
|
||||||
|
@@ -164,10 +164,8 @@ class CRCInput
|
|||||||
int fd_event;
|
int fd_event;
|
||||||
|
|
||||||
int fd_max;
|
int fd_max;
|
||||||
int clickfd;
|
|
||||||
__u16 rc_last_key;
|
__u16 rc_last_key;
|
||||||
OpenThreads::Mutex mutex;
|
OpenThreads::Mutex mutex;
|
||||||
void set_dsp();
|
|
||||||
|
|
||||||
void open(bool recheck = false);
|
void open(bool recheck = false);
|
||||||
bool checkpath(in_dev id);
|
bool checkpath(in_dev id);
|
||||||
@@ -329,10 +327,6 @@ class CRCInput
|
|||||||
void clearRCMsg();
|
void clearRCMsg();
|
||||||
|
|
||||||
int messageLoop( bool anyKeyCancels = false, int timeout= -1 );
|
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 setLongPressAny(bool b) { longPressAny = b; };
|
||||||
void setKeyRepeatDelay(unsigned int start_ms, unsigned int repeat_ms);
|
void setKeyRepeatDelay(unsigned int start_ms, unsigned int repeat_ms);
|
||||||
|
@@ -278,7 +278,6 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey)
|
|||||||
success = false;
|
success = false;
|
||||||
|
|
||||||
if(!manual) {
|
if(!manual) {
|
||||||
g_RCInput->close_click();
|
|
||||||
if (my_system(NEUTRINO_SCAN_START_SCRIPT) != 0)
|
if (my_system(NEUTRINO_SCAN_START_SCRIPT) != 0)
|
||||||
perror(NEUTRINO_SCAN_START_SCRIPT " failed");
|
perror(NEUTRINO_SCAN_START_SCRIPT " failed");
|
||||||
}
|
}
|
||||||
@@ -344,7 +343,6 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey)
|
|||||||
if(!manual) {
|
if(!manual) {
|
||||||
if (my_system(NEUTRINO_SCAN_STOP_SCRIPT) != 0)
|
if (my_system(NEUTRINO_SCAN_STOP_SCRIPT) != 0)
|
||||||
perror(NEUTRINO_SCAN_STOP_SCRIPT " failed");
|
perror(NEUTRINO_SCAN_STOP_SCRIPT " failed");
|
||||||
g_RCInput->open_click();
|
|
||||||
}
|
}
|
||||||
if(!test) {
|
if(!test) {
|
||||||
CComponentsHeaderLocalized header(x, y, width, hheight, success ? LOCALE_SCANTS_FINISHED : LOCALE_SCANTS_FAILED);
|
CComponentsHeaderLocalized header(x, y, width, hheight, success ? LOCALE_SCANTS_FINISHED : LOCALE_SCANTS_FAILED);
|
||||||
|
@@ -4386,7 +4386,6 @@ void CNeutrinoApp::loadKeys(const char * fname)
|
|||||||
|
|
||||||
/* options */
|
/* options */
|
||||||
g_settings.menu_left_exit = tconfig.getInt32( "menu_left_exit", 0 );
|
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", 150);
|
g_settings.repeat_blocker = tconfig.getInt32("repeat_blocker", 150);
|
||||||
g_settings.repeat_genericblocker = tconfig.getInt32("repeat_genericblocker", 100);
|
g_settings.repeat_genericblocker = tconfig.getInt32("repeat_genericblocker", 100);
|
||||||
g_settings.longkeypress_duration = tconfig.getInt32("longkeypress_duration", LONGKEYPRESS_OFF);
|
g_settings.longkeypress_duration = tconfig.getInt32("longkeypress_duration", LONGKEYPRESS_OFF);
|
||||||
@@ -4469,7 +4468,6 @@ void CNeutrinoApp::saveKeys(const char * fname)
|
|||||||
tconfig.setInt32( "key_pic_size_active", g_settings.key_pic_size_active );
|
tconfig.setInt32( "key_pic_size_active", g_settings.key_pic_size_active );
|
||||||
|
|
||||||
tconfig.setInt32( "menu_left_exit", g_settings.menu_left_exit );
|
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_blocker", g_settings.repeat_blocker );
|
||||||
tconfig.setInt32( "repeat_genericblocker", g_settings.repeat_genericblocker );
|
tconfig.setInt32( "repeat_genericblocker", g_settings.repeat_genericblocker );
|
||||||
tconfig.setInt32( "longkeypress_duration", g_settings.longkeypress_duration );
|
tconfig.setInt32( "longkeypress_duration", g_settings.longkeypress_duration );
|
||||||
|
@@ -504,7 +504,6 @@ struct SNeutrinoSettings
|
|||||||
int key_list_end;
|
int key_list_end;
|
||||||
int key_power_off;
|
int key_power_off;
|
||||||
int menu_left_exit;
|
int menu_left_exit;
|
||||||
int key_click;
|
|
||||||
int timeshift_pause;
|
int timeshift_pause;
|
||||||
int auto_timeshift;
|
int auto_timeshift;
|
||||||
int temp_timeshift;
|
int temp_timeshift;
|
||||||
|
Reference in New Issue
Block a user