diff --git a/images/Cursors.h b/images/Cursors.h index fac0b6c03..83da26ff3 100644 --- a/images/Cursors.h +++ b/images/Cursors.h @@ -29,7 +29,6 @@ #include "Cursors32/BottomFrequencyCursor.xpm" #include "Cursors32/TopFrequencyCursor.xpm" #include "Cursors32/BandWidthCursor.xpm" -#include "Cursors32/PlaybackCursor.xpm" #ifdef USE_MIDI #include "Cursors32/StretchCursor.xpm" #include "Cursors32/StretchLeftCursor.xpm" @@ -50,7 +49,6 @@ #include "Cursors16/BottomFrequencyCursor.xpm" #include "Cursors16/TopFrequencyCursor.xpm" #include "Cursors16/BandWidthCursor.xpm" -#include "Cursors16/PlaybackCursor.xpm" #ifdef USE_MIDI #include "Cursors16/StretchCursor.xpm" #include "Cursors16/StretchLeftCursor.xpm" diff --git a/images/Cursors16/PlaybackCursor.xpm b/images/Cursors16/PlaybackCursor.xpm deleted file mode 100644 index 27ff52ca4..000000000 --- a/images/Cursors16/PlaybackCursor.xpm +++ /dev/null @@ -1,89 +0,0 @@ -/* XPM */ -static const char * PlaybackCursorXpm[] = { -"16 16 70 1", -" c None", -". c #FF0000", -"+ c #1A2F18", -"@ c #070C06", -"# c #447C41", -"$ c #73D26E", -"% c #335C31", -"& c #437A40", -"* c #80E97B", -"= c #7ADD74", -"- c #64B660", -"; c #213C20", -"> c #42793F", -", c #7EE579", -"' c #76D872", -") c #77D872", -"! c #79DB73", -"~ c #5BA557", -"{ c #172B16", -"] c #7EE478", -"^ c #76D671", -"/ c #75D570", -"( c #76D771", -"_ c #78DA72", -": c #79DB74", -"< c #4D8C4A", -"[ c #0D180C", -"} c #78DA73", -"| c #75D470", -"1 c #40743D", -"2 c #060C06", -"3 c #6FC96A", -"4 c #325B30", -"5 c #030603", -"6 c #76D670", -"7 c #67BB62", -"8 c #264625", -"9 c #74D36F", -"0 c #72CE6D", -"a c #6CC467", -"b c #66BA62", -"c c #335C30", -"d c #71CE6C", -"e c #6BC266", -"f c #62B25D", -"g c #498545", -"h c #162915", -"i c #74D370", -"j c #62B25E", -"k c #4B8A48", -"l c #1D351C", -"m c #74D470", -"n c #72CF6D", -"o c #63B35E", -"p c #63B45F", -"q c #51944D", -"r c #244222", -"s c #42783F", -"t c #7BE076", -"u c #6EC769", -"v c #64B55F", -"w c #244223", -"x c #020402", -"y c #3E713C", -"z c #6EC86A", -"A c #58A055", -"B c #274725", -"C c #325A2F", -"D c #315A2F", -"E c #040804", -".+@.............", -".#$%............", -".&*=-;..........", -".>,')!~{........", -".>]^/(_:<[......", -".>]^///^}|12....", -".>]^/////)}345..", -".>]^//////6)}78.", -".>]^///////90abc", -".>]^/////9defgh.", -".>]^///idejkl...", -".>]^/mnaokl.....", -".>]/napqr.......", -".stuvqwx........", -".yzABx..........", -".CDE............"}; diff --git a/images/Cursors32/PlaybackCursor.xpm b/images/Cursors32/PlaybackCursor.xpm deleted file mode 100644 index d767871c6..000000000 --- a/images/Cursors32/PlaybackCursor.xpm +++ /dev/null @@ -1,106 +0,0 @@ -/* XPM */ -static const char * PlaybackCursorXpm[] = { -"32 32 70 1", -" c None", -". c #FF0000", -"+ c #1A2F18", -"@ c #070C06", -"# c #447C41", -"$ c #73D26E", -"% c #335C31", -"& c #437A40", -"* c #80E97B", -"= c #7ADD74", -"- c #64B660", -"; c #213C20", -"> c #42793F", -", c #7EE579", -"' c #76D872", -") c #77D872", -"! c #79DB73", -"~ c #5BA557", -"{ c #172B16", -"] c #7EE478", -"^ c #76D671", -"/ c #75D570", -"( c #76D771", -"_ c #78DA72", -": c #79DB74", -"< c #4D8C4A", -"[ c #0D180C", -"} c #78DA73", -"| c #75D470", -"1 c #40743D", -"2 c #060C06", -"3 c #6FC96A", -"4 c #325B30", -"5 c #030603", -"6 c #76D670", -"7 c #67BB62", -"8 c #264625", -"9 c #74D36F", -"0 c #72CE6D", -"a c #6CC467", -"b c #66BA62", -"c c #335C30", -"d c #71CE6C", -"e c #6BC266", -"f c #62B25D", -"g c #498545", -"h c #162915", -"i c #74D370", -"j c #62B25E", -"k c #4B8A48", -"l c #1D351C", -"m c #74D470", -"n c #72CF6D", -"o c #63B35E", -"p c #63B45F", -"q c #51944D", -"r c #244222", -"s c #42783F", -"t c #7BE076", -"u c #6EC769", -"v c #64B55F", -"w c #244223", -"x c #020402", -"y c #3E713C", -"z c #6EC86A", -"A c #58A055", -"B c #274725", -"C c #325A2F", -"D c #315A2F", -"E c #040804", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................", -".........+@.....................", -".........#$%....................", -".........&*=-;..................", -".........>,')!~{................", -".........>]^/(_:<[..............", -".........>]^///^}|12............", -".........>]^/////)}345..........", -".........>]^//////6)}78.........", -".........>]^///////90abc........", -".........>]^/////9defgh.........", -".........>]^///idejkl...........", -".........>]^/mnaokl.............", -".........>]/napqr...............", -".........stuvqwx................", -".........yzABx..................", -".........CDE....................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................",}; - diff --git a/src/AllThemeResources.h b/src/AllThemeResources.h index 35374225c..ba28e97e5 100644 --- a/src/AllThemeResources.h +++ b/src/AllThemeResources.h @@ -105,7 +105,6 @@ from there. Audacity will look for a file called "Pause.png". DEFINE_IMAGE( bmpBottomFrequencyCursor, wxImage( 32, 32 ), wxT("BottomFrequencyCursor")); DEFINE_IMAGE( bmpTopFrequencyCursor, wxImage( 32, 32 ), wxT("TopFrequencyCursor")); DEFINE_IMAGE( bmpBandWidthCursor, wxImage(32, 32), wxT("BandWidthCursor")); - DEFINE_IMAGE( bmpPlaybackCursor, wxImage(32, 32), wxT("PlaybackCursor")); SET_THEME_FLAGS( resFlagNone ); DEFINE_IMAGE( bmpIBeam, wxImage( 27, 27 ), wxT("IBeam")); diff --git a/src/TrackPanel.cpp b/src/TrackPanel.cpp index fc0b06702..756acade1 100644 --- a/src/TrackPanel.cpp +++ b/src/TrackPanel.cpp @@ -505,8 +505,6 @@ TrackPanel::TrackPanel(wxWindow * parent, wxWindowID id, mBandWidthCursor = MakeCursor( wxCURSOR_ARROW, BandWidthCursorXpm, 16, 16); #endif - mPlaybackCursor = MakeCursor(wxCURSOR_ARROW, PlaybackCursorXpm, 8, 16); - #if USE_MIDI mStretchMode = stretchCenter; mStretching = false; @@ -629,7 +627,6 @@ TrackPanel::~TrackPanel() delete mTopFrequencyCursor; delete mBandWidthCursor; #endif - delete mPlaybackCursor; #if USE_MIDI delete mStretchCursor; delete mStretchLeftCursor; @@ -1751,20 +1748,6 @@ void TrackPanel::SetCursorAndTipWhenSelectTool( Track * t, const bool bShiftDown = event.ShiftDown(); -#if 1 - // Should we make a distinct status message for the ctrl-click case? - if (!bShiftDown && event.CmdDown() -#ifdef USE_MIDI - && !HitTestStretch(t, r, event) -#endif - ) { - *ppTip = _("Click to start or resume playback at the chosen time."); - // cursor? - *ppCursor = mPlaybackCursor; - return; - } -#endif - #ifdef EXPERIMENTAL_SPECTRAL_EDITING bool logF; if ( (mFreqSelMode == FREQ_SEL_SNAPPING_CENTER) && @@ -3110,9 +3093,15 @@ bool mayDragWidth, bool onlyWithinSnapDistance, wxInt64 pixelDist = mViewInfo->zoom * fabs(selend - t0); bool chooseLeft = true; - const wxInt64 rightDist = mViewInfo->zoom * fabs(selend - t1); - if (rightDist < pixelDist) - chooseLeft = false, pixelDist = rightDist; + if (mViewInfo->selectedRegion.isPoint()) + // Special case when selection is a point, and thus left + // and right distances are the same + chooseLeft = (selend < t0); + else { + const wxInt64 rightDist = mViewInfo->zoom * fabs(selend - t1); + if (rightDist < pixelDist) + chooseLeft = false, pixelDist = rightDist; + } #ifdef EXPERIMENTAL_SPECTRAL_EDITING bool chooseTime = true; diff --git a/src/TrackPanel.h b/src/TrackPanel.h index 46fd73227..47f6f675e 100644 --- a/src/TrackPanel.h +++ b/src/TrackPanel.h @@ -750,7 +750,6 @@ protected: wxCursor *mTopFrequencyCursor; wxCursor *mBandWidthCursor; #endif - wxCursor *mPlaybackCursor; #if USE_MIDI wxCursor *mStretchCursor; wxCursor *mStretchLeftCursor;