From 575dc464089181f63d005634a743a31c743e1c69 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Sat, 6 Feb 2010 19:09:07 +0000 Subject: [PATCH] fix announce_Time shadow fix, unused OutputFd git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@286 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/5fe3e4af832a4f2a9b460f42a033e6f54275ea58 Author: Jacek Jendrzej Date: 2010-02-06 (Sat, 06 Feb 2010) Origin message was: ------------------ -fix announce_Time shadow fix, unused OutputFd git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@286 e54a6e83-5905-42d5-8d5c-058d10e6a962 ------------------ This commit was generated by Migit --- src/driver/audiodec/wavdec.cpp | 2 +- src/timerd/timermanager.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/driver/audiodec/wavdec.cpp b/src/driver/audiodec/wavdec.cpp index bec2277be..aefff39c1 100644 --- a/src/driver/audiodec/wavdec.cpp +++ b/src/driver/audiodec/wavdec.cpp @@ -78,7 +78,7 @@ int endianTest=1; #define MAX_OUTPUT_SAMPLES 2048 /* AVIA_GT_PCM_MAX_SAMPLES-1 */ -CBaseDec::RetCode CWavDec::Decoder(FILE *in, int OutputFd, State* state, CAudioMetaData* meta_data, time_t* time_played, unsigned int* secondsToSkip) +CBaseDec::RetCode CWavDec::Decoder(FILE *in, int /*OutputFd*/, State* state, CAudioMetaData* meta_data, time_t* time_played, unsigned int* secondsToSkip) { char* buffer; RetCode Status=OK; diff --git a/src/timerd/timermanager.cpp b/src/timerd/timermanager.cpp index bdc24caa8..7f73d98d9 100644 --- a/src/timerd/timermanager.cpp +++ b/src/timerd/timermanager.cpp @@ -1029,7 +1029,7 @@ CTimerEvent_Standby::CTimerEvent_Standby( time_t announce_Time, time_t alarm_Tim bool sb_on, CTimerd::CTimerEventRepeat evrepeat, uint32_t repeatcount): - CTimerEvent(CTimerd::TIMER_STANDBY, announceTime, alarm_Time, (time_t) 0, evrepeat,repeatcount) + CTimerEvent(CTimerd::TIMER_STANDBY, announce_Time, alarm_Time, (time_t) 0, evrepeat,repeatcount) { standby_on = sb_on; }