@@ -141,41 +141,50 @@ public bool IsMoveDownPossible(HashSet<Audiofile> selectedAudiofiles)
141141 }
142142
143143 /// <inheritdoc/>
144- public Result MoveUp ( HashSet < Track > selectedTracks )
144+ public Result MoveUp ( HashSet < Track > selectedTracks , uint positions = 1 )
145145 {
146146 if ( IsMoveUpPossible ( selectedTracks ) == false )
147147 {
148148 return Result . Failure ( new Error ( ErrorType . NotPossible , "Moving tracks up is not possible!" ) ) ;
149149 }
150150 _traceChangeManager . BulkEdit = true ;
151- var cuesheet = _sessionStateContainer . ActiveCuesheet ;
152- foreach ( var selectedTrack in selectedTracks . OrderBy ( x => x . Position ) )
151+ while ( positions > 0 )
153152 {
154- var previousTrack = cuesheet ? . Audiofiles . SelectMany ( x => x . Tracks ) . FirstOrDefault ( x => x . Position == selectedTrack . Position - 1 ) ;
155- if ( previousTrack ? . Audiofile != null && previousTrack . Audiofile != selectedTrack . Audiofile )
153+ if ( IsMoveUpPossible ( selectedTracks ) == false )
156154 {
157- SwitchAudiofile ( selectedTrack , previousTrack . Audiofile ) ;
155+ positions = 0 ;
156+ break ;
158157 }
159- else
158+ var cuesheet = _sessionStateContainer . ActiveCuesheet ;
159+ foreach ( var selectedTrack in selectedTracks . OrderBy ( x => x . Position ) )
160160 {
161- var newBegin = previousTrack ? . Begin ;
162- var newEnd = previousTrack ? . End ;
163- if ( previousTrack != null )
161+ var previousTrack = cuesheet ? . Audiofiles . SelectMany ( x => x . Tracks ) . FirstOrDefault ( x => x . Position == selectedTrack . Position - 1 ) ;
162+ if ( previousTrack ? . Audiofile != null && previousTrack . Audiofile != selectedTrack . Audiofile )
163+ {
164+ SwitchAudiofile ( selectedTrack , previousTrack . Audiofile ) ;
165+ }
166+ else
164167 {
165- _trackManager . SetProperty ( previousTrack , x => x . Position , selectedTrack . Position ) ;
166- _trackManager . SetProperty ( previousTrack , x => x . Begin , selectedTrack . Begin ) ;
167- _trackManager . SetProperty ( previousTrack , x => x . End , selectedTrack . End ) ;
168+ var newBegin = previousTrack ? . Begin ;
169+ var newEnd = previousTrack ? . End ;
170+ if ( previousTrack != null )
171+ {
172+ _trackManager . SetProperty ( previousTrack , x => x . Position , selectedTrack . Position ) ;
173+ _trackManager . SetProperty ( previousTrack , x => x . Begin , selectedTrack . Begin ) ;
174+ _trackManager . SetProperty ( previousTrack , x => x . End , selectedTrack . End ) ;
175+ }
176+ _trackManager . SetProperty ( selectedTrack , x => x . Position , ( ushort ? ) ( selectedTrack . Position - 1 ) ) ;
177+ _trackManager . SetProperty ( selectedTrack , x => x . Begin , newBegin ) ;
178+ _trackManager . SetProperty ( selectedTrack , x => x . End , newEnd ) ;
168179 }
169- _trackManager . SetProperty ( selectedTrack , x => x . Position , ( ushort ? ) ( selectedTrack . Position - 1 ) ) ;
170- _trackManager . SetProperty ( selectedTrack , x => x . Begin , newBegin ) ;
171- _trackManager . SetProperty ( selectedTrack , x => x . End , newEnd ) ;
180+
172181 }
173-
174- }
175- foreach ( var audiofile in cuesheet ! . Audiofiles )
176- {
177- var orderedTracks = audiofile . Tracks . OrderBy ( x => x . Position ) . ToList ( ) ;
178- _audiofileManager . SetProperty ( audiofile , x => x . Tracks , orderedTracks ) ;
182+ foreach ( var audiofile in cuesheet ! . Audiofiles )
183+ {
184+ var orderedTracks = audiofile . Tracks . OrderBy ( x => x . Position ) . ToList ( ) ;
185+ _audiofileManager . SetProperty ( audiofile , x => x . Tracks , orderedTracks ) ;
186+ }
187+ positions -- ;
179188 }
180189 _traceChangeManager . BulkEdit = false ;
181190 return Result . Success ( ) ;
@@ -216,40 +225,49 @@ public Result MoveUp(HashSet<Audiofile> selectedAudiofiles)
216225 }
217226
218227 /// <inheritdoc/>
219- public Result MoveDown ( HashSet < Track > selectedTracks )
228+ public Result MoveDown ( HashSet < Track > selectedTracks , uint positions = 1 )
220229 {
221230 if ( IsMoveDownPossible ( selectedTracks ) == false )
222231 {
223232 return Result . Failure ( new Error ( ErrorType . NotPossible , "Moving tracks down is not possible!" ) ) ;
224233 }
225234 _traceChangeManager . BulkEdit = true ;
226- var cuesheet = _sessionStateContainer . ActiveCuesheet ;
227- foreach ( var selectedTrack in selectedTracks . OrderByDescending ( x => x . Position ) )
235+ while ( positions > 0 )
228236 {
229- var nextTrack = cuesheet ? . Audiofiles . SelectMany ( x => x . Tracks ) . FirstOrDefault ( x => x . Position == selectedTrack . Position + 1 ) ;
230- if ( nextTrack ? . Audiofile != null && nextTrack . Audiofile != selectedTrack . Audiofile )
237+ if ( IsMoveDownPossible ( selectedTracks ) == false )
231238 {
232- SwitchAudiofile ( selectedTrack , nextTrack . Audiofile ) ;
239+ positions = 0 ;
240+ break ;
233241 }
234- else
242+ var cuesheet = _sessionStateContainer . ActiveCuesheet ;
243+ foreach ( var selectedTrack in selectedTracks . OrderByDescending ( x => x . Position ) )
235244 {
236- var newBegin = nextTrack ? . Begin ;
237- var newEnd = nextTrack ? . End ;
238- 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 )
247+ {
248+ SwitchAudiofile ( selectedTrack , nextTrack . Audiofile ) ;
249+ }
250+ else
239251 {
240- _trackManager . SetProperty ( nextTrack , x => x . Position , selectedTrack . Position ) ;
241- _trackManager . SetProperty ( nextTrack , x => x . Begin , selectedTrack . Begin ) ;
242- _trackManager . SetProperty ( nextTrack , x => x . End , selectedTrack . End ) ;
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 ) ;
243263 }
244- _trackManager . SetProperty ( selectedTrack , x => x . Position , ( ushort ? ) ( selectedTrack . Position + 1 ) ) ;
245- _trackManager . SetProperty ( selectedTrack , x => x . Begin , newBegin ) ;
246- _trackManager . SetProperty ( selectedTrack , x => x . End , newEnd ) ;
247264 }
248- }
249- foreach ( var audiofile in cuesheet ! . Audiofiles )
250- {
251- var orderedTracks = audiofile . Tracks . OrderBy ( x => x . Position ) . ToList ( ) ;
252- _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 -- ;
253271 }
254272 _traceChangeManager . BulkEdit = false ;
255273 return Result . Success ( ) ;
0 commit comments