repositories
/
deb_libcec.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5a8d43c
)
cec-client: only read persisted EEPROM settings when -r or --rom is provided as cmdli...
author
Lars Op den Kamp
<lars@opdenkamp.eu>
Fri, 9 Mar 2012 14:10:28 +0000
(15:10 +0100)
committer
Lars Op den Kamp
<lars@opdenkamp.eu>
Fri, 9 Mar 2012 14:10:28 +0000
(15:10 +0100)
src/testclient/main.cpp
patch
|
blob
|
blame
|
history
diff --git
a/src/testclient/main.cpp
b/src/testclient/main.cpp
index de96e0df237a83e738e10769cb8ae5bc06d98667..964cf68384b1d224a881466164ffb09a38186b5e 100644
(file)
--- a/
src/testclient/main.cpp
+++ b/
src/testclient/main.cpp
@@
-214,6
+214,7
@@
void ShowHelpCommandLine(const char* strExec)
" -b --base {int} The logical address of the device to with this " << endl <<
" adapter is connected." << endl <<
" -f --log-file {file} Writes all libCEC log message to a file" << endl <<
" -b --base {int} The logical address of the device to with this " << endl <<
" adapter is connected." << endl <<
" -f --log-file {file} Writes all libCEC log message to a file" << endl <<
+ " -r --rom Read persisted settings from the EEPROM" << endl <<
" -sf --short-log-file {file} Writes all libCEC log message without timestamps" << endl <<
" and log levels to a file." << endl <<
" -d --log-level {level} Sets the log level. See cectypes.h for values." << endl <<
" -sf --short-log-file {file} Writes all libCEC log message without timestamps" << endl <<
" and log levels to a file." << endl <<
" -d --log-level {level} Sets the log level. See cectypes.h for values." << endl <<
@@
-1014,6
+1015,13
@@
bool ProcessCommandLineArguments(int argc, char *argv[])
}
++iArgPtr;
}
}
++iArgPtr;
}
+ else if (!strcmp(argv[iArgPtr], "-r") ||
+ !strcmp(argv[iArgPtr], "--rom"))
+ {
+ cout << "using settings from EEPROM" << endl;
+ g_config.bGetSettingsFromROM = 1;
+ ++iArgPtr;
+ }
else
{
g_strPort = argv[iArgPtr++];
else
{
g_strPort = argv[iArgPtr++];
@@
-1034,7
+1042,6
@@
int main (int argc, char *argv[])
g_callbacks.CBCecKeyPress = &CecKeyPress;
g_callbacks.CBCecCommand = &CecCommand;
g_config.callbacks = &g_callbacks;
g_callbacks.CBCecKeyPress = &CecKeyPress;
g_callbacks.CBCecCommand = &CecCommand;
g_config.callbacks = &g_callbacks;
- g_config.bGetSettingsFromROM = 1;
if (!ProcessCommandLineArguments(argc, argv))
return 0;
if (!ProcessCommandLineArguments(argc, argv))
return 0;