From f095b4e29303db052ff87ef979831d61cfc8d56f Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Wed, 11 Dec 2013 12:41:57 +0400 Subject: [PATCH] driver/audioplay.cpp: cleanup header, init m_SecondsToSkip variable --- src/driver/audioplay.cpp | 2 ++ src/driver/audioplay.h | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/driver/audioplay.cpp b/src/driver/audioplay.cpp index fdaf4e1e7..4359956ba 100644 --- a/src/driver/audioplay.cpp +++ b/src/driver/audioplay.cpp @@ -164,6 +164,7 @@ void CAudioPlayer::init() CBaseDec::Init(); state = CBaseDec::STOP; thrPlay = 0; + m_SecondsToSkip = 0; } void CAudioPlayer::sc_callback(void *arg) @@ -210,6 +211,7 @@ void CAudioPlayer::clearFileData() m_Audiofile.clear(); m_played_time=0; m_sc_buffered=0; + m_SecondsToSkip = 0; } CAudioMetaData CAudioPlayer::getMetaData() diff --git a/src/driver/audioplay.h b/src/driver/audioplay.h index e56516a97..651acead5 100644 --- a/src/driver/audioplay.h +++ b/src/driver/audioplay.h @@ -37,9 +37,7 @@ class CAudioPlayer private: time_t m_played_time; int m_sc_buffered; - FILE *soundfd; pthread_t thrPlay; - FILE *fp; CBaseDec::State state; static void* PlayThread(void*); void clearFileData(); @@ -47,7 +45,6 @@ private: protected: CAudiofile m_Audiofile; - bool SetDSP(int soundfd, int fmt, unsigned int dsp_speed, unsigned int channels); public: static CAudioPlayer* getInstance();