mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Rearrange AudioDisplay::OnMouseEvent a bit to eliminate some duplicated code and separate the code which requires a timing controller from that which doesn't

Browse source 
Originally committed to SVN as r6179.
This commit is contained in:
Thomas Goyne 2011-12-28 21:26:54 +00:00
parent 6953a69cf8
commit 0e17edc561
1 changed files with 48 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

104
aegisub/src/audio_display.cpp
View file

@ -1104,78 +1104,33 @@ void AudioDisplay::OnMouseEvent(wxMouseEvent& event)
wxPoint mousepos = event.GetPosition(); wxPoint mousepos = event.GetPosition();
AudioDisplayInteractionObject *new_obj = 0;
// Check for scrollbar action // Check for scrollbar action
if (scrollbar->GetBounds().Contains(mousepos)) if (scrollbar->GetBounds().Contains(mousepos))
{ {
if (!controller->IsPlaying()) new_obj = scrollbar.get();
RemoveTrackCursor();
if (scrollbar->OnMouseEvent(event))
SetDraggedObject(scrollbar.get());
return;
} }
// Check for timeline action // Check for timeline action
if (timeline->GetBounds().Contains(mousepos)) else if (timeline->GetBounds().Contains(mousepos))
{ {
SetCursor(wxCursor(wxCURSOR_SIZEWE)); SetCursor(wxCursor(wxCURSOR_SIZEWE));
if (!controller->IsPlaying()) new_obj = timeline.get();
RemoveTrackCursor();
if (timeline->OnMouseEvent(event))
SetDraggedObject(timeline.get());
return;
} }
AudioTimingController *timing = controller->GetTimingController(); if (new_obj)
int drag_sensitivity = pixel_samples*3; /// @todo Make this depend on configuration
// Not scrollbar, not timeline, no button action
if (event.Moving())
{ {
if (timing)
{
int64_t samplepos = SamplesFromRelativeX(mousepos.x);
if (timing->IsNearbyMarker(samplepos, drag_sensitivity))
SetCursor(wxCursor(wxCURSOR_SIZEWE));
else
SetCursor(wxNullCursor);
}
if (!controller->IsPlaying()) if (!controller->IsPlaying())
SetTrackCursor(scroll_left + mousepos.x, OPT_GET("Audio/Display/Draw/Cursor Time")->GetBool()); RemoveTrackCursor();
if (new_obj->OnMouseEvent(event))
SetDraggedObject(new_obj);
return;
} }
if (event.Leaving() && !controller->IsPlaying()) if (event.Leaving() && !controller->IsPlaying())
{ {
RemoveTrackCursor(); RemoveTrackCursor();
} return;
if (event.LeftDown() && timing)
{
int64_t samplepos = SamplesFromRelativeX(mousepos.x);
AudioMarker *marker = timing->OnLeftClick(samplepos, drag_sensitivity);
if (marker)
{
RemoveTrackCursor();
audio_marker.reset(new AudioMarkerInteractionObject(marker, timing, this, controller, wxMOUSE_BTN_LEFT));
SetDraggedObject(audio_marker.get());
return;
}
}
if (event.RightDown() && timing)
{
int64_t samplepos = SamplesFromRelativeX(mousepos.x);
AudioMarker *marker = timing->OnRightClick(samplepos, drag_sensitivity);
if (marker)
{
RemoveTrackCursor();
audio_marker.reset(new AudioMarkerInteractionObject(marker, timing, this, controller, wxMOUSE_BTN_RIGHT));
SetDraggedObject(audio_marker.get());
return;
}
} }
if (event.MiddleIsDown()) if (event.MiddleIsDown())
@ -1183,6 +1138,43 @@ void AudioDisplay::OnMouseEvent(wxMouseEvent& event)
context->videoController->JumpToTime( context->videoController->JumpToTime(
controller->MillisecondsFromSamples(SamplesFromRelativeX(mousepos.x)), controller->MillisecondsFromSamples(SamplesFromRelativeX(mousepos.x)),
agi::vfr::EXACT); agi::vfr::EXACT);
return;
}
if (event.Moving() && !controller->IsPlaying())
{
SetTrackCursor(scroll_left + mousepos.x, OPT_GET("Audio/Display/Draw/Cursor Time")->GetBool());
}
AudioTimingController *timing = controller->GetTimingController();
if (!timing) return;
int drag_sensitivity = pixel_samples*3; /// @todo Make this depend on configuration
// Not scrollbar, not timeline, no button action
if (event.Moving())
{
int64_t samplepos = SamplesFromRelativeX(mousepos.x);
if (timing->IsNearbyMarker(samplepos, drag_sensitivity))
SetCursor(wxCursor(wxCURSOR_SIZEWE));
else
SetCursor(wxNullCursor);
}
if (event.ButtonDown(wxMOUSE_BTN_LEFT | wxMOUSE_BTN_RIGHT))
{
int64_t samplepos = SamplesFromRelativeX(mousepos.x);
AudioMarker *marker = event.LeftDown() ?
timing->OnLeftClick(samplepos, drag_sensitivity) :
timing->OnRightClick(samplepos, drag_sensitivity);
if (marker)
{
RemoveTrackCursor();
audio_marker.reset(new AudioMarkerInteractionObject(marker, timing, this, controller, (wxMouseButton)event.GetButton()));
SetDraggedObject(audio_marker.get());
return;
}
} }
} }