repositories
/
deb_libcec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cec: don't call SetActiveView() when reporting the power status. fixes loop which...
[deb_libcec.git]
/
src
/
testclient
/
main.cpp
diff --git
a/src/testclient/main.cpp
b/src/testclient/main.cpp
index 52a5af462b2becc356ca4ca5541e138c4e7bb711..817d26797cf7c139cf2977d611083574fadb3b7a 100644
(file)
--- a/
src/testclient/main.cpp
+++ b/
src/testclient/main.cpp
@@
-30,20
+30,22
@@
* http://www.pulse-eight.net/
*/
* http://www.pulse-eight.net/
*/
-#include "../../include/CECExports.h"
-#include "../lib/platform/threads.h"
-#include "../lib/util/StdString.h"
+#include <cec.h>
+
#include <cstdio>
#include <fcntl.h>
#include <iostream>
#include <string>
#include <sstream>
#include <cstdio>
#include <fcntl.h>
#include <iostream>
#include <string>
#include <sstream>
+#include "../lib/platform/threads.h"
+#include "../lib/util/StdString.h"
using namespace CEC;
using namespace std;
using namespace CEC;
using namespace std;
-#define CEC_TEST_CLIENT_VERSION
5
+#define CEC_TEST_CLIENT_VERSION
7
+#include <cecloader.h>
inline bool HexStrToInt(const std::string& data, uint8_t& value)
{
inline bool HexStrToInt(const std::string& data, uint8_t& value)
{
@@
-190,9
+192,13
@@
void show_console_help(void)
int main (int argc, char *argv[])
{
ICECAdapter *parser = LoadLibCec("CECTester");
int main (int argc, char *argv[])
{
ICECAdapter *parser = LoadLibCec("CECTester");
- if (!parser
&&
parser->GetMinVersion() > CEC_TEST_CLIENT_VERSION)
+ if (!parser
||
parser->GetMinVersion() > CEC_TEST_CLIENT_VERSION)
{
{
- cout << "Unable to create parser. Is libcec.dll present?" << endl;
+#ifdef __WINDOWS__
+ cout << "Cannot load libcec.dll" << endl;
+#else
+ cout << "Cannot load libcec.so" << endl;
+#endif
return 1;
}
CStdString strLog;
return 1;
}
CStdString strLog;
@@
-276,7
+282,7
@@
int main (int argc, char *argv[])
{
string strvalue;
uint8_t ivalue;
{
string strvalue;
uint8_t ivalue;
- cec_
frame
bytes;
+ cec_
command
bytes;
bytes.clear();
while (GetWord(input, strvalue) && HexStrToInt(strvalue, ivalue))
bytes.clear();
while (GetWord(input, strvalue) && HexStrToInt(strvalue, ivalue))