diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-03-23 12:51:13 +0300 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-03-23 12:51:13 +0300 |
commit | b09ef67d1381b2c04ad4b2804bce7e1adfdd8575 (patch) | |
tree | 4690d59248123a46a96351d52ab782a68bb07310 | |
parent | b5296836358a0a5e942cd6c984c6179766dbf962 (diff) |
Remove ENABLE_DEBUG_LOGFILE define from version.h
-rw-r--r-- | common/includes/version.h | 6 | ||||
-rw-r--r-- | decoder/LAVAudio/LAVAudio.cpp | 4 | ||||
-rw-r--r-- | decoder/LAVVideo/LAVVideo.cpp | 6 | ||||
-rw-r--r-- | demuxer/LAVSplitter/LAVSplitter.cpp | 4 |
4 files changed, 9 insertions, 11 deletions
diff --git a/common/includes/version.h b/common/includes/version.h index 672721b6..32a85d22 100644 --- a/common/includes/version.h +++ b/common/includes/version.h @@ -36,10 +36,4 @@ #define LAV_VERSION_STR MAKE_STR(LAV_VERSION) -#ifdef LAV_DEBUG_RELEASE -#define ENABLE_DEBUG_LOGFILE 1 -#else -#define ENABLE_DEBUG_LOGFILE 0 -#endif - #endif diff --git a/decoder/LAVAudio/LAVAudio.cpp b/decoder/LAVAudio/LAVAudio.cpp index 59cda835..3f5729ab 100644 --- a/decoder/LAVAudio/LAVAudio.cpp +++ b/decoder/LAVAudio/LAVAudio.cpp @@ -98,7 +98,7 @@ CLAVAudio::CLAVAudio(LPUNKNOWN pUnk, HRESULT* phr) //DbgSetModuleLevel (LOG_CUSTOM2, DWORD_MAX); // Jitter statistics //DbgSetModuleLevel (LOG_CUSTOM5, DWORD_MAX); // Extensive timing options -#if ENABLE_DEBUG_LOGFILE +#ifdef LAV_DEBUG_RELEASE DbgSetLogFileDesktop(LAVC_AUDIO_LOG_FILE); #endif #else @@ -118,7 +118,7 @@ CLAVAudio::~CLAVAudio() m_hDllExtraDecoder = nullptr; } -#if defined(DEBUG) && ENABLE_DEBUG_LOGFILE +#if defined(DEBUG) && defined(LAV_DEBUG_RELEASE) DbgCloseLogFile(); #endif } diff --git a/decoder/LAVVideo/LAVVideo.cpp b/decoder/LAVVideo/LAVVideo.cpp index 62cc15f2..05ac3b6c 100644 --- a/decoder/LAVVideo/LAVVideo.cpp +++ b/decoder/LAVVideo/LAVVideo.cpp @@ -88,7 +88,7 @@ CLAVVideo::CLAVVideo(LPUNKNOWN pUnk, HRESULT* phr) DbgSetModuleLevel (LOG_TRACE, DWORD_MAX); DbgSetModuleLevel (LOG_ERROR, DWORD_MAX); DbgSetModuleLevel (LOG_CUSTOM1, DWORD_MAX); // FFMPEG messages use custom1 -#if ENABLE_DEBUG_LOGFILE +#ifdef LAV_DEBUG_RELEASE DbgSetLogFileDesktop(LAVC_VIDEO_LOG_FILE); #endif #endif @@ -112,6 +112,10 @@ CLAVVideo::~CLAVVideo() SafeRelease(&m_SubtitleConsumer); SAFE_DELETE(m_pSubtitleInput); + +#if defined(DEBUG) && defined(LAV_DEBUG_RELEASE) + DbgCloseLogFile(); +#endif } HRESULT CLAVVideo::CreateTrayIcon() diff --git a/demuxer/LAVSplitter/LAVSplitter.cpp b/demuxer/LAVSplitter/LAVSplitter.cpp index c2713e39..5f03507e 100644 --- a/demuxer/LAVSplitter/LAVSplitter.cpp +++ b/demuxer/LAVSplitter/LAVSplitter.cpp @@ -66,7 +66,7 @@ CLAVSplitter::CLAVSplitter(LPUNKNOWN pUnk, HRESULT* phr) DbgSetModuleLevel (LOG_TRACE, DWORD_MAX); DbgSetModuleLevel (LOG_ERROR, DWORD_MAX); -#if ENABLE_DEBUG_LOGFILE +#ifdef LAV_DEBUG_RELEASE DbgSetLogFileDesktop(LAVF_LOG_FILE); #endif #endif @@ -86,7 +86,7 @@ CLAVSplitter::~CLAVSplitter() SafeRelease(&m_pSite); -#if defined(DEBUG) && ENABLE_DEBUG_LOGFILE +#if defined(DEBUG) && defined(LAV_DEBUG_RELEASE) DbgCloseLogFile(); #endif } |