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 03a07dad863285f7d567e5b8b66a3a056a8b43de..433ac80aacf395bdb193d5e3cd08b673dbdd0fa0 100644 (file)
--- 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 b653c4d82115c6b3eb105af8070038469e34273d..6f9dcb34da1a231d3620ed7275dbf3ec646c233d 100644 (file)
--- 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 2305e0522941b9a9b4d8de8ece3898b9ae85afba..974adbb0b5e1b8ccbb3aa7b1ef482a27f15f4243 100644 (file)
--- 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 14b59d6b3c0d574b020ecf1c6a03b10b4ab53308..20e65b2dc5cbc5f263f9f92aeb0a981aca33487a 100644 (file)
--- 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);