diff -r 43bb1b8ed555 -r b6df6fce6e5d client/src/Iri.Modernisation.Controls/ViewModel/ProductionTimeLine/ProductionTimeLineVM.cs --- a/client/src/Iri.Modernisation.Controls/ViewModel/ProductionTimeLine/ProductionTimeLineVM.cs Mon Jan 25 09:30:22 2010 +0100 +++ b/client/src/Iri.Modernisation.Controls/ViewModel/ProductionTimeLine/ProductionTimeLineVM.cs Wed Jan 27 10:37:39 2010 +0100 @@ -240,23 +240,9 @@ } } - private VideoChapterType _selectedChapterType; + - /// - /// Chapitre en cours - /// - public VideoChapterType SelectedChapterType - { - get - { - return _selectedChapterType; - } - set - { - _selectedChapterType = value; - OnPropertyChanged("SelectedChapterType"); - } - } + private void InitializeCommands() { @@ -304,7 +290,7 @@ InitializeCommands(); } - + private void TimeChange_Executed(object sender, SLExtensions.Input.ExecutedEventArgs e) { double newValue = ((double)e.Parameter); @@ -317,15 +303,19 @@ if (Vs.TimerIn.TotalMilliseconds <= newValue && Vs.TimerOut.TotalMilliseconds > newValue) { ActualVideoSequence = Vs; - ViewModelVideoViewer.Source = ActualVideoSequence.Path; - ViewModelVideoViewer.GoTo(TimeSpan.FromMilliseconds(newValue) - Vs.TimerIn +Vs.BeginTrim); + + /**/ + ViewModelVideoViewer.BeginIn = TimeSpan.FromMilliseconds(newValue)+ Vs.BeginTrim; + ViewModelVideoViewer.Source = ActualVideoSequence.Path; + ViewModelVideoViewer.GoTo(TimeSpan.FromMilliseconds(newValue) - Vs.TimerIn + Vs.BeginTrim); + ViewModelVideoViewer.BeginIn = Vs.BeginTrim; } } } else { - ViewModelVideoViewer.GoTo(TimeSpan.FromMilliseconds(newValue) - ActualVideoSequence.TimerIn); + ViewModelVideoViewer.GoTo(TimeSpan.FromMilliseconds(newValue) - ActualVideoSequence.TimerIn + ActualVideoSequence.BeginTrim); } @@ -378,12 +368,12 @@ private void EditorPartSelected_Executed(object sender, SLExtensions.Input.ExecutedEventArgs e) { - SelectedChapter = (int)((HeaderProductionEventArgs)e.Source).ChapterType; - SelectedChapterType = ((HeaderProductionEventArgs)e.Source).ChapterType ; + + IsIndexing = ((HeaderProductionEventArgs)e.Source).IsIndexPart; } - public event EventHandler SwitchVideo; + } public class ProductionTimeLineVMEventArgs : EventArgs