Changeset 5836


Ignore:
Timestamp:
03/28/14 08:28:51 (6 years ago)
Author:
rohit_tandon
Message:

Commit includes bug fix for Elapse forward and also change in the profile description title in the HTML.

Location:
trunk/Obi/Obi
Files:
3 edited

Legend:

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

    r5827 r5836  
    12711271            } 
    12721272        } 
    1273         public void FastPlayWithLapseForward(double LapseForwardTime) 
     1273        public void FastPlayWithLapseForward(double LapseForwardTime,double PhraseDuration) 
    12741274        { 
    12751275            double currentTimePosition = CurrentTimeInAsset; 
     
    12791279            bool wasPaused = State == AudioPlayer.State.Paused; 
    12801280            //Console.WriteLine("paused time before " + mPlayer.CurrentTimePosition); 
    1281             if (currentTimePosition > LapseForwardTime) 
     1281            if ((currentTimePosition+LapseForwardTime)<= PhraseDuration ) 
    12821282            { 
    12831283                mPlayer.Pause(); 
     
    12911291            { 
    12921292                mPlayer.Pause(); 
    1293                 double diff=LapseForwardTime-currentTimePosition; 
    1294                 CurrentTimeInAsset += diff; 
     1293               // double diff=LapseForwardTime-currentTimePosition; 
     1294                if (wasPaused) 
     1295                { 
     1296                    double diff = PhraseDuration - currentTimePosition; 
     1297                    CurrentTimeInAsset += diff; 
     1298                } 
     1299                else 
     1300                { 
     1301                    CurrentTimeInAsset = PhraseDuration; 
     1302                } 
    12951303                // set revert time of preview playlist, to do: this should become part of CurrentTimeOfAsset finally. 
    12961304                if (this is PreviewPlaylist) ((PreviewPlaylist)this).RevertTime = 10; 
  • trunk/Obi/Obi/ProfileDesc_en.html

    r5818 r5836  
    44<html xml:lang="en" xmlns="http://www.w3.org/1999/xhtml"> 
    55  <head> 
    6     <title>Phrase Description</title> 
     6    <title>Profile Description</title> 
    77    <link rel="stylesheet" href="help.css" type="text/css"/> 
    88  </head> 
     
    297297</tr> 
    298298</table> 
    299 </div>   
    300      
    301 <!--   <!-- <p>This is <span id="test"> </span> Hello How are u </p> 
    302     <p>Copyright (c) 2008 The DAISY Consortium-->--> 
     299</div>    
     300 
    303301    
    304302  </body> 
  • trunk/Obi/Obi/ProjectView/TransportBar.cs

    r5835 r5836  
    26522652                { 
    26532653                    DetermineUseOfSoundTouch(1.0f); 
    2654                     mCurrentPlaylist.FastPlayWithLapseForward(m_ElapseBackInterval); 
     2654                    mCurrentPlaylist.FastPlayWithLapseForward(m_ElapseBackInterval,mView.Selection.Node.Duration); 
    26552655                    //  mFastPlayRateCombobox.SelectedIndex = 0; 
    26562656                    UpdateTimeDisplay(); 
Note: See TracChangeset for help on using the changeset viewer.