@@ -225,40 +225,49 @@ public Result MoveUp(HashSet<Audiofile> selectedAudiofiles)
225225 }
226226
227227 /// <inheritdoc/>
228- public Result MoveDown ( HashSet < Track > selectedTracks )
228+ public Result MoveDown ( HashSet < Track > selectedTracks , uint positions = 1 )
229229 {
230230 if ( IsMoveDownPossible ( selectedTracks ) == false )
231231 {
232232 return Result . Failure ( new Error ( ErrorType . NotPossible , "Moving tracks down is not possible!" ) ) ;
233233 }
234234 _traceChangeManager . BulkEdit = true ;
235- var cuesheet = _sessionStateContainer . ActiveCuesheet ;
236- foreach ( var selectedTrack in selectedTracks . OrderByDescending ( x => x . Position ) )
235+ while ( positions > 0 )
237236 {
238- var nextTrack = cuesheet ? . Audiofiles . SelectMany ( x => x . Tracks ) . FirstOrDefault ( x => x . Position == selectedTrack . Position + 1 ) ;
239- if ( nextTrack ? . Audiofile != null && nextTrack . Audiofile != selectedTrack . Audiofile )
237+ if ( IsMoveDownPossible ( selectedTracks ) == false )
240238 {
241- SwitchAudiofile ( selectedTrack , nextTrack . Audiofile ) ;
239+ positions = 0 ;
240+ break ;
242241 }
243- else
242+ var cuesheet = _sessionStateContainer . ActiveCuesheet ;
243+ foreach ( var selectedTrack in selectedTracks . OrderByDescending ( x => x . Position ) )
244244 {
245- var newBegin = nextTrack ? . Begin ;
246- var newEnd = nextTrack ? . End ;
247- if ( nextTrack != null )
245+ var nextTrack = cuesheet ? . Audiofiles . SelectMany ( x => x . Tracks ) . FirstOrDefault ( x => x . Position == selectedTrack . Position + 1 ) ;
246+ if ( nextTrack ? . Audiofile != null && nextTrack . Audiofile != selectedTrack . Audiofile )
248247 {
249- _trackManager . SetProperty ( nextTrack , x => x . Position , selectedTrack . Position ) ;
250- _trackManager . SetProperty ( nextTrack , x => x . Begin , selectedTrack . Begin ) ;
251- _trackManager . SetProperty ( nextTrack , x => x . End , selectedTrack . End ) ;
248+ SwitchAudiofile ( selectedTrack , nextTrack . Audiofile ) ;
249+ }
250+ else
251+ {
252+ var newBegin = nextTrack ? . Begin ;
253+ var newEnd = nextTrack ? . End ;
254+ if ( nextTrack != null )
255+ {
256+ _trackManager . SetProperty ( nextTrack , x => x . Position , selectedTrack . Position ) ;
257+ _trackManager . SetProperty ( nextTrack , x => x . Begin , selectedTrack . Begin ) ;
258+ _trackManager . SetProperty ( nextTrack , x => x . End , selectedTrack . End ) ;
259+ }
260+ _trackManager . SetProperty ( selectedTrack , x => x . Position , ( ushort ? ) ( selectedTrack . Position + 1 ) ) ;
261+ _trackManager . SetProperty ( selectedTrack , x => x . Begin , newBegin ) ;
262+ _trackManager . SetProperty ( selectedTrack , x => x . End , newEnd ) ;
252263 }
253- _trackManager . SetProperty ( selectedTrack , x => x . Position , ( ushort ? ) ( selectedTrack . Position + 1 ) ) ;
254- _trackManager . SetProperty ( selectedTrack , x => x . Begin , newBegin ) ;
255- _trackManager . SetProperty ( selectedTrack , x => x . End , newEnd ) ;
256264 }
257- }
258- foreach ( var audiofile in cuesheet ! . Audiofiles )
259- {
260- var orderedTracks = audiofile . Tracks . OrderBy ( x => x . Position ) . ToList ( ) ;
261- _audiofileManager . SetProperty ( audiofile , x => x . Tracks , orderedTracks ) ;
265+ foreach ( var audiofile in cuesheet ! . Audiofiles )
266+ {
267+ var orderedTracks = audiofile . Tracks . OrderBy ( x => x . Position ) . ToList ( ) ;
268+ _audiofileManager . SetProperty ( audiofile , x => x . Tracks , orderedTracks ) ;
269+ }
270+ positions -- ;
262271 }
263272 _traceChangeManager . BulkEdit = false ;
264273 return Result . Success ( ) ;
0 commit comments