aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2013-07-14 19:16:01 +0300
committerEugene Sandulenko2013-07-14 19:16:01 +0300
commit977038e847f9e08280e9accae2db28b3f5d40abc (patch)
treeca8870b4e5f052767e94bc1ba981fdd21b3ab10d
parentc1397788f240bb029ece9d0a551f702eb08e043a (diff)
downloadscummvm-rg350-977038e847f9e08280e9accae2db28b3f5d40abc.tar.gz
scummvm-rg350-977038e847f9e08280e9accae2db28b3f5d40abc.tar.bz2
scummvm-rg350-977038e847f9e08280e9accae2db28b3f5d40abc.zip
RECORDER: Rename class variable in accoudance with our code style.
-rw-r--r--gui/EventRecorder.cpp28
-rw-r--r--gui/EventRecorder.h2
2 files changed, 15 insertions, 15 deletions
diff --git a/gui/EventRecorder.cpp b/gui/EventRecorder.cpp
index 8917eac2d7..b62399d799 100644
--- a/gui/EventRecorder.cpp
+++ b/gui/EventRecorder.cpp
@@ -84,7 +84,7 @@ EventRecorder::EventRecorder() {
_temporarySlot = 0;
_realSaveManager = 0;
_realMixerManager = 0;
- controlPanel = 0;
+ _controlPanel = 0;
_lastMillis = 0;
_lastScreenshotTime = 0;
_screenshotPeriod = 0;
@@ -109,8 +109,8 @@ void EventRecorder::deinit() {
_recordMode = kPassthrough;
delete _fakeMixerManager;
_fakeMixerManager = NULL;
- controlPanel->close();
- delete controlPanel;
+ _controlPanel->close();
+ delete _controlPanel;
debugC(1, kDebugLevelEventRec, "playback:action=stopplayback");
g_system->getEventManager()->getEventDispatcher()->unregisterSource(this);
_recordMode = kPassthrough;
@@ -140,7 +140,7 @@ void EventRecorder::processMillis(uint32 &millis, bool skipRecord) {
millisDelay = millis - _lastMillis;
_lastMillis = millis;
_fakeTimer += millisDelay;
- controlPanel->setReplayedTime(_fakeTimer);
+ _controlPanel->setReplayedTime(_fakeTimer);
timerEvent.recordedtype = Common::kRecorderEventTypeTimer;
timerEvent.time = _fakeTimer;
_playbackFile->writeEvent(timerEvent);
@@ -163,7 +163,7 @@ void EventRecorder::processMillis(uint32 &millis, bool skipRecord) {
}
}
millis = _fakeTimer;
- controlPanel->setReplayedTime(_fakeTimer);
+ _controlPanel->setReplayedTime(_fakeTimer);
break;
case kRecorderPlaybackPause:
millis = _fakeTimer;
@@ -222,12 +222,12 @@ void EventRecorder::togglePause() {
case kRecorderRecord:
oldState = _recordMode;
_recordMode = kRecorderPlaybackPause;
- controlPanel->runModal();
+ _controlPanel->runModal();
_recordMode = oldState;
_initialized = true;
break;
case kRecorderPlaybackPause:
- controlPanel->close();
+ _controlPanel->close();
break;
default:
break;
@@ -290,7 +290,7 @@ void EventRecorder::init(Common::String recordFileName, RecordMode mode) {
return;
}
if (_recordMode != kPassthrough) {
- controlPanel = new GUI::OnScreenDialog(_recordMode == kRecorderRecord);
+ _controlPanel = new GUI::OnScreenDialog(_recordMode == kRecorderRecord);
}
if (_recordMode == kRecorderPlayback) {
applyPlaybackSettings();
@@ -452,8 +452,8 @@ Common::List<Common::Event> EventRecorder::mapEvent(const Common::Event &ev, Com
return Common::DefaultEventMapper::mapEvent(ev, source);
break;
case kRecorderRecord:
- g_gui.processEvent(evt, controlPanel);
- if (((evt.type == Common::EVENT_LBUTTONDOWN) || (evt.type == Common::EVENT_LBUTTONUP) || (evt.type == Common::EVENT_MOUSEMOVE)) && controlPanel->isMouseOver()) {
+ g_gui.processEvent(evt, _controlPanel);
+ if (((evt.type == Common::EVENT_LBUTTONDOWN) || (evt.type == Common::EVENT_LBUTTONUP) || (evt.type == Common::EVENT_MOUSEMOVE)) && _controlPanel->isMouseOver()) {
return Common::List<Common::Event>();
} else {
Common::RecorderEvent e;
@@ -466,13 +466,13 @@ Common::List<Common::Event> EventRecorder::mapEvent(const Common::Event &ev, Com
break;
case kRecorderPlaybackPause: {
Common::Event dialogEvent;
- if (controlPanel->isEditDlgVisible()) {
+ if (_controlPanel->isEditDlgVisible()) {
dialogEvent = ev;
} else {
dialogEvent = evt;
}
- g_gui.processEvent(dialogEvent, controlPanel->getActiveDlg());
- if (((dialogEvent.type == Common::EVENT_LBUTTONDOWN) || (dialogEvent.type == Common::EVENT_LBUTTONUP) || (dialogEvent.type == Common::EVENT_MOUSEMOVE)) && controlPanel->isMouseOver()) {
+ g_gui.processEvent(dialogEvent, _controlPanel->getActiveDlg());
+ if (((dialogEvent.type == Common::EVENT_LBUTTONDOWN) || (dialogEvent.type == Common::EVENT_LBUTTONUP) || (dialogEvent.type == Common::EVENT_MOUSEMOVE)) && _controlPanel->isMouseOver()) {
return Common::List<Common::Event>();
}
return Common::DefaultEventMapper::mapEvent(dialogEvent, source);
@@ -562,7 +562,7 @@ void EventRecorder::preDrawOverlayGui() {
g_system->showOverlay();
g_gui.theme()->clearAll();
g_gui.theme()->openDialog(true, GUI::ThemeEngine::kShadingNone);
- controlPanel->drawDialog();
+ _controlPanel->drawDialog();
g_gui.theme()->finishBuffering();
g_gui.theme()->updateScreen();
_recordMode = oldMode;
diff --git a/gui/EventRecorder.h b/gui/EventRecorder.h
index 3e32d89232..60fe07fafc 100644
--- a/gui/EventRecorder.h
+++ b/gui/EventRecorder.h
@@ -193,7 +193,7 @@ private:
DefaultTimerManager *_timerManager;
RecorderSaveFileManager _fakeSaveManager;
NullSdlMixerManager *_fakeMixerManager;
- GUI::OnScreenDialog *controlPanel;
+ GUI::OnScreenDialog *_controlPanel;
Common::RecorderEvent _nextEvent;
void setFileHeader();