BADA: Convert CRLF to LF

This commit is contained in:
Willem Jan Palenstijn 2012-09-04 22:25:28 +02:00
parent b4090ead4d
commit 6e14e97670
2 changed files with 177 additions and 177 deletions

View File

@ -1,115 +1,115 @@
/* ScummVM - Graphic Adventure Engine
*
* ScummVM is the legal property of its developers, whose names
* are too numerous to list here. Please refer to the COPYRIGHT
* file distributed with this source distribution.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/
#if defined(BADA)
#include "backends/timer/bada/timer.h"
//
// TimerSlot
//
TimerSlot::TimerSlot(Common::TimerManager::TimerProc callback,
uint32 interval, void *refCon) :
_timer(0),
_callback(callback),
_interval(interval),
_refCon(refCon) {
}
TimerSlot::~TimerSlot() {
}
bool TimerSlot::OnStart() {
_timer = new Osp::Base::Runtime::Timer();
if (!_timer || IsFailed(_timer->Construct(*this))) {
AppLog("Failed to create timer");
return false;
}
if (IsFailed(_timer->Start(_interval))) {
AppLog("failed to start timer");
return false;
}
AppLog("started timer %d", _interval);
return true;
}
void TimerSlot::OnStop() {
AppLog("timer stopped");
if (_timer) {
_timer->Cancel();
delete _timer;
_timer = NULL;
}
}
void TimerSlot::OnTimerExpired(Timer &timer) {
_callback(_refCon);
timer.Start(_interval);
}
//
// BadaTimerManager
//
BadaTimerManager::BadaTimerManager() {
}
BadaTimerManager::~BadaTimerManager() {
for (Common::List<TimerSlot>::iterator slot = _timers.begin();
slot != _timers.end(); ) {
slot->Stop();
slot = _timers.erase(slot);
}
}
bool BadaTimerManager::installTimerProc(TimerProc proc, int32 interval, void *refCon,
const Common::String &id) {
TimerSlot *slot = new TimerSlot(proc, interval / 1000, refCon);
if (IsFailed(slot->Construct(THREAD_TYPE_EVENT_DRIVEN))) {
AppLog("Failed to create timer thread");
delete slot;
return false;
}
if (IsFailed(slot->Start())) {
delete slot;
AppLog("Failed to start timer thread");
return false;
}
_timers.push_back(*slot);
return true;
}
void BadaTimerManager::removeTimerProc(TimerProc proc) {
for (Common::List<TimerSlot>::iterator slot = _timers.begin();
slot != _timers.end(); ++slot) {
if (slot->_callback == proc) {
slot->Stop();
slot = _timers.erase(slot);
}
}
}
#endif
/* ScummVM - Graphic Adventure Engine
*
* ScummVM is the legal property of its developers, whose names
* are too numerous to list here. Please refer to the COPYRIGHT
* file distributed with this source distribution.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/
#if defined(BADA)
#include "backends/timer/bada/timer.h"
//
// TimerSlot
//
TimerSlot::TimerSlot(Common::TimerManager::TimerProc callback,
uint32 interval, void *refCon) :
_timer(0),
_callback(callback),
_interval(interval),
_refCon(refCon) {
}
TimerSlot::~TimerSlot() {
}
bool TimerSlot::OnStart() {
_timer = new Osp::Base::Runtime::Timer();
if (!_timer || IsFailed(_timer->Construct(*this))) {
AppLog("Failed to create timer");
return false;
}
if (IsFailed(_timer->Start(_interval))) {
AppLog("failed to start timer");
return false;
}
AppLog("started timer %d", _interval);
return true;
}
void TimerSlot::OnStop() {
AppLog("timer stopped");
if (_timer) {
_timer->Cancel();
delete _timer;
_timer = NULL;
}
}
void TimerSlot::OnTimerExpired(Timer &timer) {
_callback(_refCon);
timer.Start(_interval);
}
//
// BadaTimerManager
//
BadaTimerManager::BadaTimerManager() {
}
BadaTimerManager::~BadaTimerManager() {
for (Common::List<TimerSlot>::iterator slot = _timers.begin();
slot != _timers.end(); ) {
slot->Stop();
slot = _timers.erase(slot);
}
}
bool BadaTimerManager::installTimerProc(TimerProc proc, int32 interval, void *refCon,
const Common::String &id) {
TimerSlot *slot = new TimerSlot(proc, interval / 1000, refCon);
if (IsFailed(slot->Construct(THREAD_TYPE_EVENT_DRIVEN))) {
AppLog("Failed to create timer thread");
delete slot;
return false;
}
if (IsFailed(slot->Start())) {
delete slot;
AppLog("Failed to start timer thread");
return false;
}
_timers.push_back(*slot);
return true;
}
void BadaTimerManager::removeTimerProc(TimerProc proc) {
for (Common::List<TimerSlot>::iterator slot = _timers.begin();
slot != _timers.end(); ++slot) {
if (slot->_callback == proc) {
slot->Stop();
slot = _timers.erase(slot);
}
}
}
#endif

View File

@ -1,62 +1,62 @@
/* ScummVM - Graphic Adventure Engine
*
* ScummVM is the legal property of its developers, whose names
* are too numerous to list here. Please refer to the COPYRIGHT
* file distributed with this source distribution.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/
#ifndef BADA_TIMER_H
#define BADA_TIMER_H
#include <FBase.h>
#include "common/timer.h"
#include "common/list.h"
using namespace Osp::Base::Runtime;
struct TimerSlot: public ITimerEventListener, public Thread {
TimerSlot(Common::TimerManager::TimerProc callback,
uint32 interval,
void *refCon);
~TimerSlot();
bool OnStart(void);
void OnStop(void);
void OnTimerExpired(Timer &timer);
Timer *_timer;
Common::TimerManager::TimerProc _callback;
uint32 _interval; // in microseconds
void *_refCon;
};
class BadaTimerManager : public Common::TimerManager {
public:
BadaTimerManager();
~BadaTimerManager();
bool installTimerProc(TimerProc proc, int32 interval, void *refCon,
const Common::String &id);
void removeTimerProc(TimerProc proc);
private:
Common::List<TimerSlot> _timers;
};
#endif
/* ScummVM - Graphic Adventure Engine
*
* ScummVM is the legal property of its developers, whose names
* are too numerous to list here. Please refer to the COPYRIGHT
* file distributed with this source distribution.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/
#ifndef BADA_TIMER_H
#define BADA_TIMER_H
#include <FBase.h>
#include "common/timer.h"
#include "common/list.h"
using namespace Osp::Base::Runtime;
struct TimerSlot: public ITimerEventListener, public Thread {
TimerSlot(Common::TimerManager::TimerProc callback,
uint32 interval,
void *refCon);
~TimerSlot();
bool OnStart(void);
void OnStop(void);
void OnTimerExpired(Timer &timer);
Timer *_timer;
Common::TimerManager::TimerProc _callback;
uint32 _interval; // in microseconds
void *_refCon;
};
class BadaTimerManager : public Common::TimerManager {
public:
BadaTimerManager();
~BadaTimerManager();
bool installTimerProc(TimerProc proc, int32 interval, void *refCon,
const Common::String &id);
void removeTimerProc(TimerProc proc);
private:
Common::List<TimerSlot> _timers;
};
#endif