Changeset 7444


Ignore:
Timestamp:
12/13/17 11:40:04 (17 months ago)
Author:
rohit_tandon
Message:

1) When Play on navigate is on Playback is paused after begin and end Mark.
2) If Selection is at label i.e when audio selection is not there (this often happens in Play on navigate) and player is playing then Time Elapsed will be calculated accordingly.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Obi/Obi/ProjectView/ProjectView.cs

    r7442 r7444  
    52755275                this.TransportBar.Pause(); 
    52765276                this.Selection = new AudioSelection(this.TransportBar.CurrentPlaylist.CurrentPhrase, mContentView, new AudioRange(this.TransportBar.CurrentPlaylist.CurrentTimeInAsset)); 
     5277                if (ObiForm.Settings.PlayOnNavigate) 
     5278                { 
     5279                    TransportBar.Pause(); 
     5280                } 
    52775281            } 
    52785282            mContentView.BeginSpecialNode = Selection.EmptyNodeForSelection; //@AssociateNode 
     
    52925296                m_TotalCursorTime = this.Selection.Node.Duration - m_TotalCursorTime; 
    52935297            } 
    5294             else if (this.Selection != null && this.Selection.Node != null) 
     5298            else if (this.Selection != null && this.Selection.Node != null && !(this.Selection is AudioSelection) && !this.TransportBar.IsPlayerActive) 
    52955299            { 
    52965300                m_TotalCursorTime = this.Selection.Node.Duration; 
     5301            } 
     5302            else if(this.Selection != null && this.Selection.Node != null &&  !(this.Selection is AudioSelection) && this.TransportBar.IsPlayerActive) 
     5303            { 
     5304                m_TotalCursorTime = this.Selection.Node.Duration - this.TransportBar.CurrentPlaylist.CurrentTimeInAsset; 
    52975305            } 
    52985306            //else if (this.TransportBar.IsPlayerActive) 
     
    53135321                TransportBar.Pause(); 
    53145322                this.Selection = new AudioSelection(this.TransportBar.CurrentPlaylist.CurrentPhrase, mContentView, new AudioRange(this.TransportBar.CurrentPlaylist.CurrentTimeInAsset)); 
     5323                if (ObiForm.Settings.PlayOnNavigate) 
     5324                { 
     5325                    TransportBar.Pause(); 
     5326                } 
    53155327            } 
    53165328 
     
    53435355                
    53445356            } 
    5345             else if (this.Selection != null && this.Selection.Node != null) 
    5346             { 
    5347                 m_TotalCursorTime += this.Selection.Node.Duration; 
     5357            else if (this.Selection != null && this.Selection.Node != null && !(this.Selection is AudioSelection) && !this.TransportBar.IsPlayerActive) 
     5358            { 
     5359                if (mContentView.BeginSpecialNode != mContentView.EndSpecialNode) 
     5360                { 
     5361                    m_TotalCursorTime += this.Selection.Node.Duration; 
     5362                }              
     5363            } 
     5364            else if (this.Selection != null && this.Selection.Node != null && !(this.Selection is AudioSelection) && this.TransportBar.IsPlayerActive) 
     5365            { 
     5366                if (mContentView.BeginSpecialNode != mContentView.EndSpecialNode) 
     5367                { 
     5368                    m_TotalCursorTime += this.TransportBar.CurrentPlaylist.CurrentTimeInAsset; 
     5369                } 
     5370                else 
     5371                { 
     5372                    double tempTime = this.Selection.Node.Duration - this.TransportBar.CurrentPlaylist.CurrentTimeInAsset; 
     5373                    m_TotalCursorTime = m_TotalCursorTime - tempTime; 
     5374                } 
    53485375            } 
    53495376 
     
    53875414 
    53885415            AssignSpecialNodeDialog.ShowDialog(); 
     5416            if (this.TransportBar.IsPlayerActive) 
     5417            { 
     5418                this.TransportBar.Stop(); 
     5419            } 
    53895420            if (AssignSpecialNodeDialog.DialogResult == DialogResult.OK) 
    53905421            { 
Note: See TracChangeset for help on using the changeset viewer.