From: hyc Date: Mon, 22 Mar 2010 09:39:07 +0000 (+0000) Subject: Add accessors for debuglevel, libversion, ctrlC, to avoid external X-Git-Tag: v2.4~157 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ceacf56288f6fcd174280c42a4ed3ad8d36188f2;p=rtmpdump Add accessors for debuglevel, libversion, ctrlC, to avoid external programs depending on library internal variables. git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@385 400ebc74-4327-4243-bc38-086b20814532 --- diff --git a/librtmp/log.c b/librtmp/log.c index 03a07da..433ac80 100644 --- a/librtmp/log.c +++ b/librtmp/log.c @@ -46,6 +46,16 @@ void RTMP_LogSetOutput(FILE *file) fmsg = file; } +void RTMP_LogSetLevel(RTMP_LogLevel level) +{ + RTMP_debuglevel = level; +} + +RTMP_LogLevel RTMP_LogGetLevel() +{ + return RTMP_debuglevel; +} + void RTMP_LogPrintf(const char *format, ...) { char str[MAX_PRINT_LEN]=""; diff --git a/librtmp/log.h b/librtmp/log.h index b653c4d..6f9dcb3 100644 --- a/librtmp/log.h +++ b/librtmp/log.h @@ -48,6 +48,8 @@ void RTMP_LogStatus(const char *format, ...); void RTMP_Log(int level, const char *format, ...); void RTMP_LogHex(int level, const char *data, unsigned long len); void RTMP_LogHexString(int level, const char *data, unsigned long len); +void RTMP_LogSetLevel(RTMP_LogLevel lvl); +RTMP_LogLevel RTMP_LogGetLevel(); #ifdef __cplusplus } diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c index 2305e05..974adbb 100644 --- a/librtmp/rtmp.c +++ b/librtmp/rtmp.c @@ -137,6 +137,12 @@ RTMP_GetTime() #endif } +void +RTMP_UserInterrupt() +{ + RTMP_ctrlC = true; +} + void RTMPPacket_Reset(RTMPPacket *p) { @@ -180,6 +186,12 @@ RTMPPacket_Dump(RTMPPacket *p) p->m_nBodySize, p->m_body ? (unsigned char)p->m_body[0] : 0); } +int +RTMP_LibVersion() +{ + return RTMP_LIB_VERSION; +} + void RTMP_TLS_Init() { diff --git a/librtmp/rtmp.h b/librtmp/rtmp.h index 14b59d6..20e65b2 100644 --- a/librtmp/rtmp.h +++ b/librtmp/rtmp.h @@ -36,6 +36,8 @@ extern "C" { #endif +#define RTMP_LIB_VERSION 0x020202 /* 2.2b */ + #define RTMP_FEATURE_HTTP 0x01 #define RTMP_FEATURE_ENC 0x02 #define RTMP_FEATURE_SSL 0x04 @@ -279,6 +281,8 @@ extern "C" void RTMP_Init(RTMP *r); void RTMP_Close(RTMP *r); + int RTMP_LibVersion(); + void RTMP_UserInterrupt(); /* user typed Ctrl-C */ bool RTMP_SendCtrl(RTMP *r, short nType, unsigned int nObject, unsigned int nTime);