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

Code base convergence.

Browse Source 
git-svn-id: https://pupnp.svn.sourceforge.net/svnroot/pupnp/branches/branch-1.6.x@530 119443c7-1b9e-41f8-b6fc-b9c35fce742c
This commit is contained in:
Marcelo Roberto Jimenez 2010-04-01 20:36:30 +00:00
parent 2bcbdffd89
commit 640fa8b1be
1 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
upnp/inc/upnp.h
View File

@ -418,6 +418,28 @@
#endif #endif
#if UPNP_VERSION >= 10800
/*
* Opaque data structures. The following includes are data structures that
* must be externally visible. Since version 1.8.0, only an opaque typedef
* is visible from the outside world. Any operation on these data types
* must be done using the appropriate interface functions.
*
* This policy has the great advantage that it is now possible to change
* the internal implementation of these data structures without breaking
* the API.
*/
#include "ActionComplete.h"
#include "ActionRequest.h"
#include "Discovery.h"
#include "Event.h"
#include "EventSubscribe.h"
#include "FileInfo.h"
#include "StateVarComplete.h"
#include "StateVarRequest.h"
#include "SubscriptionRequest.h"
#endif /* UPNP_VERSION >= 10800 */
/*! /*!
* \name Constants and Types * \name Constants and Types
@ -615,6 +637,8 @@ enum Upnp_DescType_e {
typedef enum Upnp_DescType_e Upnp_DescType; typedef enum Upnp_DescType_e Upnp_DescType;
#if UPNP_VERSION < 10800
/** Returned as part of a {\bf UPNP_CONTROL_ACTION_COMPLETE} callback. */ /** Returned as part of a {\bf UPNP_CONTROL_ACTION_COMPLETE} callback. */
struct Upnp_Action_Request struct Upnp_Action_Request
@ -839,9 +863,11 @@ struct File_Info
* with it, the SDK frees the {\bf DOMString}. */ * with it, the SDK frees the {\bf DOMString}. */
DOMString content_type; DOMString content_type;
}; };
#endif /* UPNP_VERSION < 10800 */
/** All callback functions share the same prototype, documented below. /*!
* All callback functions share the same prototype, documented below.
* Note that any memory passed to the callback function * Note that any memory passed to the callback function
* is valid only during the callback and should be copied if it * is valid only during the callback and should be copied if it
* needs to persist. This callback function needs to be thread * needs to persist. This callback function needs to be thread
@ -2429,7 +2455,7 @@ EXPORT_SPEC int UpnpHttpGetProgress(
*/ */
EXPORT_SPEC int UpnpCancelHttpGet( EXPORT_SPEC int UpnpCancelHttpGet(
/*! [in] The handle of the connection created by the call to /*! [in] The handle of the connection created by the call to
* \b UpnpOpenHttpPost. */ * \b UpnpOpenHttpGet. */
void *handle); void *handle);
/*! /*!
@ -2442,7 +2468,7 @@ EXPORT_SPEC int UpnpCancelHttpGet(
*/ */
EXPORT_SPEC int UpnpCloseHttpGet( EXPORT_SPEC int UpnpCloseHttpGet(
/*! [in] The handle of the connection created by the call to /*! [in] The handle of the connection created by the call to
* \b UpnpOpenHttpPost. */ * \b UpnpOpenHttpGet. */
void *handle); void *handle);
@ -2620,7 +2646,13 @@ typedef int (*VDCallback_GetInfo)(
/*! [in] The name of the file to query. */ /*! [in] The name of the file to query. */
const char *filename, const char *filename,
/*! [out] Pointer to a structure to store the information on the file. */ /*! [out] Pointer to a structure to store the information on the file. */
struct File_Info *info); #if UPNP_VERSION < 10800
struct File_Info *info
#else
UpnpFileInfo *info
#endif /* UPNP_VERSION < 10800 */
);
/*! /*!
* \brief Sets the get_info callback function to be used to access a virtual * \brief Sets the get_info callback function to be used to access a virtual