iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Refresh(false) elimination 

Originally committed to SVN as r58.
This commit is contained in:
Fredrik Mellbin 2006-02-02 18:24:58 +00:00
parent ae6fcba54e
commit 5062ea6e31
1 changed files with 12 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
core/audio_display.cpp
View File

@ -363,6 +363,8 @@ void AudioDisplay::UpdateImage(bool weak) {
// Done // Done
dc.EndDrawing(); dc.EndDrawing();
Refresh(false);
} }
@ -618,11 +620,10 @@ void AudioDisplay::GetKaraokePos(__int64 &karStart,__int64 &karEnd, bool cap) {
void AudioDisplay::Update() { void AudioDisplay::Update() {
if (blockUpdate) return; if (blockUpdate) return;
if (loaded) { if (loaded) {
if (Options.AsBool(_T("Audio Autoscroll"))) MakeDialogueVisible(); if (Options.AsBool(_T("Audio Autoscroll")))
else { MakeDialogueVisible();
else
UpdateImage(true); UpdateImage(true);
Refresh(false);
}
} }
} }
@ -644,7 +645,6 @@ void AudioDisplay::MakeDialogueVisible(bool force) {
// Update // Update
UpdateImage(); UpdateImage();
Refresh(false);
} }
@ -654,7 +654,6 @@ void AudioDisplay::SetPosition(int pos) {
Position = pos; Position = pos;
PositionSample = pos * samples; PositionSample = pos * samples;
UpdateImage(); UpdateImage();
Refresh(false);
} }
@ -694,7 +693,6 @@ void AudioDisplay::SetSamplesPercent(int percent,bool update,float pivot) {
// Update // Update
UpdateScrollbar(); UpdateScrollbar();
UpdateImage(); UpdateImage();
Refresh(false);
} }
} }
@ -728,7 +726,6 @@ void AudioDisplay::SetScale(float _scale) {
if (scale == _scale) return; if (scale == _scale) return;
scale = _scale; scale = _scale;
UpdateImage(); UpdateImage();
Refresh(false);
} }
@ -755,7 +752,6 @@ void AudioDisplay::SetFile(wxString file) {
// Update // Update
UpdateImage(); UpdateImage();
Refresh(false);
} }
catch (wxString &err) { catch (wxString &err) {
wxMessageBox(err,_T("Error loading audio"),wxICON_ERROR | wxOK); wxMessageBox(err,_T("Error loading audio"),wxICON_ERROR | wxOK);
@ -1083,9 +1079,7 @@ void AudioDisplay::OnMouseEvent(wxMouseEvent& event) {
else { else {
int step = event.GetWheelRotation() * w / 360; int step = event.GetWheelRotation() * w / 360;
UpdatePosition(Position+step,false); UpdatePosition(Position+step,false);
//SetFocus();
UpdateImage(); UpdateImage();
Refresh(false);
} }
} }
@ -1188,13 +1182,10 @@ void AudioDisplay::OnMouseEvent(wxMouseEvent& event) {
// Commit // Commit
NeedCommit = true; NeedCommit = true;
if (Options.AsBool(_T("Audio SSA Allow Autocommit")) && Options.AsBool(_T("Audio Autocommit")) && curStartMS <= curEndMS) { if (Options.AsBool(_T("Audio SSA Allow Autocommit")) && Options.AsBool(_T("Audio Autocommit")) && curStartMS <= curEndMS)
CommitChanges(); CommitChanges();
} else
else {
UpdateImage(true); UpdateImage(true);
Refresh(false);
}
} }
} }
@ -1356,7 +1347,6 @@ void AudioDisplay::OnMouseEvent(wxMouseEvent& event) {
wxCursor cursor(wxCURSOR_SIZEWE); wxCursor cursor(wxCURSOR_SIZEWE);
SetCursor(cursor); SetCursor(cursor);
UpdateImage(true); UpdateImage(true);
Refresh(false);
} }
} }
@ -1366,13 +1356,10 @@ void AudioDisplay::OnMouseEvent(wxMouseEvent& event) {
if (diagUpdated) { if (diagUpdated) {
diagUpdated = false; diagUpdated = false;
NeedCommit = true; NeedCommit = true;
if (Options.AsBool(_T("Audio Autocommit")) && curStartMS <= curEndMS) { if (Options.AsBool(_T("Audio Autocommit")) && curStartMS <= curEndMS)
CommitChanges(); CommitChanges();
} else
else {
UpdateImage(true); UpdateImage(true);
Refresh(false);
}
} }
// Single click on nothing // Single click on nothing
@ -1383,7 +1370,6 @@ void AudioDisplay::OnMouseEvent(wxMouseEvent& event) {
if (syl != -1) { if (syl != -1) {
karaoke->SetSyllable(syl); karaoke->SetSyllable(syl);
UpdateImage(true); UpdateImage(true);
Refresh(false);
} }
} }
} }
@ -1415,7 +1401,6 @@ void AudioDisplay::OnSize(wxSizeEvent &event) {
// Update image // Update image
UpdateImage(); UpdateImage();
Refresh(false);
// Update scrollbar // Update scrollbar
UpdateScrollbar(); UpdateScrollbar();
@ -1537,14 +1522,12 @@ void AudioDisplay::OnKeyDown(wxKeyEvent &event) {
if (Hotkeys.IsPressed(_T("Audio Scroll Left"))) { if (Hotkeys.IsPressed(_T("Audio Scroll Left"))) {
UpdatePosition(Position-128,false); UpdatePosition(Position-128,false);
UpdateImage(); UpdateImage();
Refresh(false);
} }
// Move forward // Move forward
if (Hotkeys.IsPressed(_T("Audio Scroll Right"))) { if (Hotkeys.IsPressed(_T("Audio Scroll Right"))) {
UpdatePosition(Position+128,false); UpdatePosition(Position+128,false);
UpdateImage(); UpdateImage();
Refresh(false);
} }
// Play first 500 ms // Play first 500 ms
@ -1603,13 +1586,10 @@ void AudioDisplay::OnKeyDown(wxKeyEvent &event) {
if (diagUpdated) { if (diagUpdated) {
diagUpdated = false; diagUpdated = false;
NeedCommit = true; NeedCommit = true;
if ((Options.AsBool(_T("Audio SSA Allow Autocommit")) || Options.AsBool(_T("Audio SSA Mode")) == false) && Options.AsBool(_T("Audio Autocommit")) && curStartMS <= curEndMS) { if ((Options.AsBool(_T("Audio SSA Allow Autocommit")) || Options.AsBool(_T("Audio SSA Mode")) == false) && Options.AsBool(_T("Audio Autocommit")) && curStartMS <= curEndMS)
CommitChanges(); CommitChanges();
} else
else {
UpdateImage(true); UpdateImage(true);
Refresh(false);
}
} }
} }
@ -1628,10 +1608,8 @@ void AudioDisplay::ChangeLine(int delta) {
dialogue = NULL; dialogue = NULL;
grid->editBox->SetToLine(next); grid->editBox->SetToLine(next);
grid->SelectRow(next); grid->SelectRow(next);
if (!dialogue) { if (!dialogue)
UpdateImage(true); UpdateImage(true);
Refresh(false);
}
line_n = next; line_n = next;
} }
} }
@ -1739,7 +1717,6 @@ void AudioDisplay::OnGetFocus(wxFocusEvent &event) {
if (!hasFocus) { if (!hasFocus) {
hasFocus = true; hasFocus = true;
UpdateImage(true); UpdateImage(true);
Refresh(false);
} }
} }