generic-library/libupnp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge of similar code.

Browse Source
This commit is contained in:
Marcelo Roberto Jimenez 2010-10-04 13:19:00 -03:00
parent 60b26c913d
commit 4f5d0e1d70
6 changed files with 37 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build/inc/autoconfig.h
View File

@ -2,7 +2,7 @@
/* autoconfig.h.in. Generated from configure.ac by autoheader. */ /* autoconfig.h.in. Generated from configure.ac by autoheader. */
/* Define to 1 to compile debug code */ /* Define to 1 to compile debug code */
/* #undef DEBUG */ #define DEBUG 1
/* Define to 1 if you have the <arpa/inet.h> header file. */ /* Define to 1 if you have the <arpa/inet.h> header file. */
#define HAVE_ARPA_INET_H 1 #define HAVE_ARPA_INET_H 1
@ -87,10 +87,10 @@
#define LT_OBJDIR ".libs/" #define LT_OBJDIR ".libs/"
/* Define to 1 to prevent compilation of assert() */ /* Define to 1 to prevent compilation of assert() */
#define NDEBUG 1 /* #undef NDEBUG */
/* Define to 1 to prevent some debug code */ /* Define to 1 to prevent some debug code */
#define NO_DEBUG 1 /* #undef NO_DEBUG */
/* Define to 1 if your C compiler doesn't accept -c and -o together. */ /* Define to 1 if your C compiler doesn't accept -c and -o together. */
/* #undef NO_MINUS_C_MINUS_O */ /* #undef NO_MINUS_C_MINUS_O */
@ -130,7 +130,7 @@
#define UPNP_HAVE_CLIENT 1 #define UPNP_HAVE_CLIENT 1
/* see upnpconfig.h */ /* see upnpconfig.h */
/* #undef UPNP_HAVE_DEBUG */ #define UPNP_HAVE_DEBUG 1
/* see upnpconfig.h */ /* see upnpconfig.h */
#define UPNP_HAVE_DEVICE 1 #define UPNP_HAVE_DEVICE 1

2
build/inc/upnpconfig.h
View File

@ -69,7 +69,7 @@
/** Defined to 1 if the library has been compiled with DEBUG enabled /** Defined to 1 if the library has been compiled with DEBUG enabled
* (i.e. configure --enable-debug) : <upnp/upnpdebug.h> file is available */ * (i.e. configure --enable-debug) : <upnp/upnpdebug.h> file is available */
/* #undef UPNP_HAVE_DEBUG */ #define UPNP_HAVE_DEBUG 1
/** Defined to 1 if the library has been compiled with client API enabled /** Defined to 1 if the library has been compiled with client API enabled

10
upnp/sample/tvcombo/upnp_tv_ctrlpt.c
View File

@ -937,25 +937,23 @@ TvStateUpdate( char *UDN,
* *
********************************************************************************/ ********************************************************************************/
void TvCtrlPointHandleEvent( void TvCtrlPointHandleEvent(
const UpnpString *sid, const char *sid,
int evntkey, int evntkey,
IXML_Document *changes) IXML_Document *changes)
{ {
struct TvDeviceNode *tmpdevnode; struct TvDeviceNode *tmpdevnode;
int service; int service;
const char *aux_sid = NULL;
ithread_mutex_lock(&DeviceListMutex); ithread_mutex_lock(&DeviceListMutex);
tmpdevnode = GlobalDeviceList; tmpdevnode = GlobalDeviceList;
while (tmpdevnode) { while (tmpdevnode) {
for (service = 0; service < TV_SERVICE_SERVCOUNT; ++service) { for (service = 0; service < TV_SERVICE_SERVCOUNT; ++service) {
aux_sid = UpnpString_get_String(sid); if (strcmp(tmpdevnode->device.TvService[service].SID, sid) == 0) {
if (strcmp(tmpdevnode->device.TvService[service].SID, aux_sid) == 0) {
SampleUtil_Print("Received Tv %s Event: %d for SID %s", SampleUtil_Print("Received Tv %s Event: %d for SID %s",
TvServiceName[service], TvServiceName[service],
evntkey, evntkey,
aux_sid); sid);
TvStateUpdate( TvStateUpdate(
tmpdevnode->device.UDN, tmpdevnode->device.UDN,
service, service,
@ -1139,7 +1137,7 @@ int TvCtrlPointCallbackEventHandler(Upnp_EventType EventType, void *Event, void
case UPNP_EVENT_RECEIVED: { case UPNP_EVENT_RECEIVED: {
UpnpEvent *e_event = (UpnpEvent *)Event; UpnpEvent *e_event = (UpnpEvent *)Event;
TvCtrlPointHandleEvent( TvCtrlPointHandleEvent(
UpnpEvent_get_SID(e_event), UpnpEvent_get_SID_cstr(e_event),
UpnpEvent_get_EventKey(e_event), UpnpEvent_get_EventKey(e_event),
UpnpEvent_get_ChangedVariables(e_event)); UpnpEvent_get_ChangedVariables(e_event));
break; break;

23
upnp/sample/tvcombo/upnp_tv_ctrlpt.h
View File

@ -44,6 +44,7 @@ extern "C" {
#include "ithread.h" #include "ithread.h"
#include "upnp.h" #include "upnp.h"
#include "UpnpString.h"
#include "upnptools.h" #include "upnptools.h"
@ -120,11 +121,11 @@ extern ithread_mutex_t DeviceListMutex;
extern UpnpClient_Handle ctrlpt_handle; extern UpnpClient_Handle ctrlpt_handle;
void TvCtrlPointPrintHelp(); void TvCtrlPointPrintHelp(void);
int TvCtrlPointDeleteNode(struct TvDeviceNode*); int TvCtrlPointDeleteNode(struct TvDeviceNode *);
int TvCtrlPointRemoveDevice(const char *); int TvCtrlPointRemoveDevice(const char *);
int TvCtrlPointRemoveAll(); int TvCtrlPointRemoveAll(void);
int TvCtrlPointRefresh(); int TvCtrlPointRefresh(void);
int TvCtrlPointSendAction(int, int, char *, char **, char **, int); int TvCtrlPointSendAction(int, int, char *, char **, char **, int);
@ -148,20 +149,20 @@ int TvCtrlPointGetContrast(int);
int TvCtrlPointGetBrightness(int); int TvCtrlPointGetBrightness(int);
int TvCtrlPointGetDevice(int, struct TvDeviceNode **); int TvCtrlPointGetDevice(int, struct TvDeviceNode **);
int TvCtrlPointPrintList( void ); int TvCtrlPointPrintList(void);
int TvCtrlPointPrintDevice(int); int TvCtrlPointPrintDevice(int);
void TvCtrlPointAddDevice(IXML_Document *, const char *, int); void TvCtrlPointAddDevice(IXML_Document *, const char *, int);
void TvCtrlPointHandleGetVar(const char *, const char *, const DOMString); void TvCtrlPointHandleGetVar(const char *, const char *, const DOMString);
void TvStateUpdate(char*,int, IXML_Document * , char **); void TvStateUpdate(char*,int, IXML_Document * , char **);
void TvCtrlPointHandleEvent(const UpnpString *, int, IXML_Document *); void TvCtrlPointHandleEvent(const char *, int, IXML_Document *);
void TvCtrlPointHandleSubscribeUpdate(const char *, const Upnp_SID, int); void TvCtrlPointHandleSubscribeUpdate(const char *, const Upnp_SID, int);
int TvCtrlPointCallbackEventHandler(Upnp_EventType, void *, void *); int TvCtrlPointCallbackEventHandler(Upnp_EventType, void *, void *);
void TvCtrlPointVerifyTimeouts(int); void TvCtrlPointVerifyTimeouts(int);
void TvCtrlPointPrintCommands( void ); void TvCtrlPointPrintCommands(void);
void* TvCtrlPointCommandLoop( void* ); void* TvCtrlPointCommandLoop(void *);
int TvCtrlPointStart( print_string printFunctionPtr, state_update updateFunctionPtr ); int TvCtrlPointStart(print_string printFunctionPtr, state_update updateFunctionPtr);
int TvCtrlPointStop( void ); int TvCtrlPointStop(void);
int TvCtrlPointProcessCommand( char *cmdline ); int TvCtrlPointProcessCommand(char *cmdline);
#ifdef __cplusplus #ifdef __cplusplus
}; };

10
upnp/sample/tvctrlpt/upnp_tv_ctrlpt.c
View File

@ -943,25 +943,23 @@ TvStateUpdate( char *UDN,
* *
********************************************************************************/ ********************************************************************************/
void TvCtrlPointHandleEvent( void TvCtrlPointHandleEvent(
const UpnpString *sid, const char *sid,
int evntkey, int evntkey,
IXML_Document *changes) IXML_Document *changes)
{ {
struct TvDeviceNode *tmpdevnode; struct TvDeviceNode *tmpdevnode;
int service; int service;
const char *aux_sid = NULL;
ithread_mutex_lock(&DeviceListMutex); ithread_mutex_lock(&DeviceListMutex);
tmpdevnode = GlobalDeviceList; tmpdevnode = GlobalDeviceList;
while (tmpdevnode) { while (tmpdevnode) {
for (service = 0; service < TV_SERVICE_SERVCOUNT; ++service) { for (service = 0; service < TV_SERVICE_SERVCOUNT; ++service) {
aux_sid = UpnpString_get_String(sid); if (strcmp(tmpdevnode->device.TvService[service].SID, sid) == 0) {
if (strcmp(tmpdevnode->device.TvService[service].SID, aux_sid) == 0) {
SampleUtil_Print("Received Tv %s Event: %d for SID %s", SampleUtil_Print("Received Tv %s Event: %d for SID %s",
TvServiceName[service], TvServiceName[service],
evntkey, evntkey,
aux_sid); sid);
TvStateUpdate( TvStateUpdate(
tmpdevnode->device.UDN, tmpdevnode->device.UDN,
service, service,
@ -1158,7 +1156,7 @@ int TvCtrlPointCallbackEventHandler(Upnp_EventType EventType, void *Event, void
case UPNP_EVENT_RECEIVED: { case UPNP_EVENT_RECEIVED: {
UpnpEvent *e_event = (UpnpEvent *)Event; UpnpEvent *e_event = (UpnpEvent *)Event;
TvCtrlPointHandleEvent( TvCtrlPointHandleEvent(
UpnpEvent_get_SID(e_event), UpnpEvent_get_SID_cstr(e_event),
UpnpEvent_get_EventKey(e_event), UpnpEvent_get_EventKey(e_event),
UpnpEvent_get_ChangedVariables(e_event)); UpnpEvent_get_ChangedVariables(e_event));
break; break;

23
upnp/sample/tvctrlpt/upnp_tv_ctrlpt.h
View File

@ -44,6 +44,7 @@ extern "C" {
#include "ithread.h" #include "ithread.h"
#include "upnp.h" #include "upnp.h"
#include "UpnpString.h"
#include "upnptools.h" #include "upnptools.h"
@ -120,11 +121,11 @@ extern ithread_mutex_t DeviceListMutex;
extern UpnpClient_Handle ctrlpt_handle; extern UpnpClient_Handle ctrlpt_handle;
void TvCtrlPointPrintHelp(); void TvCtrlPointPrintHelp(void);
int TvCtrlPointDeleteNode(struct TvDeviceNode*); int TvCtrlPointDeleteNode(struct TvDeviceNode *);
int TvCtrlPointRemoveDevice(const char *); int TvCtrlPointRemoveDevice(const char *);
int TvCtrlPointRemoveAll(); int TvCtrlPointRemoveAll(void);
int TvCtrlPointRefresh(); int TvCtrlPointRefresh(void);
int TvCtrlPointSendAction(int, int, char *, char **, char **, int); int TvCtrlPointSendAction(int, int, char *, char **, char **, int);
@ -148,20 +149,20 @@ int TvCtrlPointGetContrast(int);
int TvCtrlPointGetBrightness(int); int TvCtrlPointGetBrightness(int);
int TvCtrlPointGetDevice(int, struct TvDeviceNode **); int TvCtrlPointGetDevice(int, struct TvDeviceNode **);
int TvCtrlPointPrintList( void ); int TvCtrlPointPrintList(void);
int TvCtrlPointPrintDevice(int); int TvCtrlPointPrintDevice(int);
void TvCtrlPointAddDevice(IXML_Document *, const char *, int); void TvCtrlPointAddDevice(IXML_Document *, const char *, int);
void TvCtrlPointHandleGetVar(const char *, const char *, const DOMString); void TvCtrlPointHandleGetVar(const char *, const char *, const DOMString);
void TvStateUpdate(char*,int, IXML_Document * , char **); void TvStateUpdate(char*,int, IXML_Document * , char **);
void TvCtrlPointHandleEvent(const UpnpString *, int, IXML_Document *); void TvCtrlPointHandleEvent(const char *, int, IXML_Document *);
void TvCtrlPointHandleSubscribeUpdate(const char *, const Upnp_SID, int); void TvCtrlPointHandleSubscribeUpdate(const char *, const Upnp_SID, int);
int TvCtrlPointCallbackEventHandler(Upnp_EventType, void *, void *); int TvCtrlPointCallbackEventHandler(Upnp_EventType, void *, void *);
void TvCtrlPointVerifyTimeouts(int); void TvCtrlPointVerifyTimeouts(int);
void TvCtrlPointPrintCommands( void ); void TvCtrlPointPrintCommands(void);
void* TvCtrlPointCommandLoop( void* ); void* TvCtrlPointCommandLoop(void *);
int TvCtrlPointStart( print_string printFunctionPtr, state_update updateFunctionPtr ); int TvCtrlPointStart(print_string printFunctionPtr, state_update updateFunctionPtr);
int TvCtrlPointStop( void ); int TvCtrlPointStop(void);
int TvCtrlPointProcessCommand( char *cmdline ); int TvCtrlPointProcessCommand(char *cmdline);
#ifdef __cplusplus #ifdef __cplusplus
}; };