From: <ju...@us...> - 2008-05-15 23:03:23
|
Revision: 3069 http://urakawa.svn.sourceforge.net/urakawa/?rev=3069&view=rev Author: julienq Date: 2008-05-15 16:03:22 -0700 (Thu, 15 May 2008) Log Message: ----------- Updated preview (keyboard shortcut + transport menu) Modified Paths: -------------- trunk/urakawa/application/Obi/Obi/Audio/AudioPlayer.cs trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs trunk/urakawa/application/Obi/Obi/ObiForm.cs trunk/urakawa/application/Obi/Obi/ObiForm.resx trunk/urakawa/application/Obi/Obi/Playlist.cs trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs Modified: trunk/urakawa/application/Obi/Obi/Audio/AudioPlayer.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/Audio/AudioPlayer.cs 2008-05-15 15:50:48 UTC (rev 3068) +++ trunk/urakawa/application/Obi/Obi/Audio/AudioPlayer.cs 2008-05-15 23:03:22 UTC (rev 3069) @@ -59,7 +59,7 @@ // Member variables changed by user private int m_VolumeLevel; - private int m_FwdRwdRate; // holds skip time multiplier for forward / rewind mode , value is 0 for normal playback, positive for FastForward and negetive for Rewind + private int mFwdRwdRate; // holds skip time multiplier for forward / rewind mode , value is 0 for normal playback, positive for FastForward and negetive for Rewind private float m_fFastPlayFactor; /// fholds fast play multiplier private bool m_IsPreviewing; // Is true when playback is used for previewing a selection or marking. @@ -92,7 +92,7 @@ mPreviewTimer.Tick += new System.EventHandler(this.PreviewTimer_Tick); mPreviewTimer.Interval = 100; //mPlaybackMode = PlaybackMode.Normal; - m_FwdRwdRate = 0 ; + mFwdRwdRate = 0 ; m_fFastPlayFactor = 1; mIsFwdRwd = false; mEventsEnabled = true; @@ -183,11 +183,11 @@ {//2 lCurrentPosition = m_lPausePosition; }//-2 - if (m_FwdRwdRate != 0 ) lCurrentPosition = m_lChunkStartPosition; + if (mFwdRwdRate != 0 ) lCurrentPosition = m_lChunkStartPosition; lCurrentPosition = CalculationFunctions.AdaptToFrame(lCurrentPosition, m_FrameSize); }//-1 - if (PrevBytePosition > lCurrentPosition && m_FwdRwdRate >= 0) + if (PrevBytePosition > lCurrentPosition && mFwdRwdRate >= 0) return PrevBytePosition; PrevBytePosition = lCurrentPosition; @@ -202,20 +202,20 @@ /// <param name="mode">The new mode.</param> private void SetPlaybackMode( int rate ) { - if (rate != m_FwdRwdRate ) + if (rate != mFwdRwdRate ) { if (State == AudioPlayerState.Playing) { long restartPos = GetCurrentBytePosition(); StopPlayback(); mState = AudioPlayerState.Paused; - m_FwdRwdRate = rate ; + mFwdRwdRate = rate ; InitPlay( mCurrentAudio , restartPos, 0); } else if (mState == AudioPlayerState.Paused || mState == AudioPlayerState.Stopped) { - m_FwdRwdRate = rate ; + mFwdRwdRate = rate ; } } } @@ -255,7 +255,7 @@ { get { - return m_FwdRwdRate; + return mFwdRwdRate; } set { @@ -410,7 +410,7 @@ void SetPlayFrequency(float l_frequency) { if (mSoundBuffer != null - && m_FwdRwdRate == 0 ) + && mFwdRwdRate == 0 ) { try { @@ -508,36 +508,38 @@ } } + + // Get a byte position from a time in ms. for the given PCM format info. + private long BytePositionFromTime(double time, PCMFormatInfo info) + { + ushort align = info.getBlockAlign(); + return CalculationFunctions.AdaptToFrame(CalculationFunctions.ConvertTimeToByte(time, (int)info.getSampleRate(), align), align); + } + /// <summary> /// Starts a preview playback /// playback time returns back to restore time after previewing /// end of asset is not triggered after previewing /// pause and stop functions work as same as that during normal playback - /// <see cref=""/> /// </summary> - /// <param name="asset"></param> - /// <param name="timeFrom"></param> - /// <param name="timeTo"></param> - /// <param name="RestoreTime"></param> - public void PlayPreview(AudioMediaData asset, double timeFrom, double timeTo, double RestoreTime) + public void PlayPreview(AudioMediaData asset, double from, double timeTo, double RestoreTime) { // it is public function so API state will be used if (State == AudioPlayerState.Stopped || State == AudioPlayerState.Paused) { if ( asset != null && asset.getAudioDuration().getTimeDeltaAsMillisecondFloat() > 0) { - long lStartPosition = CalculationFunctions.ConvertTimeToByte(timeFrom, (int)asset.getPCMFormat().getSampleRate(), asset.getPCMFormat().getBlockAlign()); + long lStartPosition = CalculationFunctions.ConvertTimeToByte(from, (int)asset.getPCMFormat().getSampleRate(), asset.getPCMFormat().getBlockAlign()); lStartPosition = CalculationFunctions.AdaptToFrame(lStartPosition, asset.getPCMFormat().getBlockAlign()); long lEndPosition = CalculationFunctions.ConvertTimeToByte(timeTo, (int)asset.getPCMFormat().getSampleRate(), asset.getPCMFormat().getBlockAlign()); lEndPosition = CalculationFunctions.AdaptToFrame(lEndPosition, asset.getPCMFormat().getBlockAlign()); // check for valid arguments - if (lStartPosition < 0) - lStartPosition = 0; + if (lStartPosition < 0) lStartPosition = 0; if (lEndPosition > asset.getPCMLength()) lEndPosition = asset.getPCMLength(); - if ( m_FwdRwdRate == 0 ) + if ( mFwdRwdRate == 0 ) { m_IsPreviewing = true ; m_StateBeforePreview = State; @@ -575,13 +577,13 @@ { InitialiseWithAsset (asset ) ; - if (m_FwdRwdRate == 0) + if (mFwdRwdRate == 0) PlayAssetStream(lStartPosition, lEndPosition); - else if (m_FwdRwdRate > 0) + else if (mFwdRwdRate > 0) { FastForward(lStartPosition); } - else if (m_FwdRwdRate < 0) + else if (mFwdRwdRate < 0) { if (lStartPosition == 0) lStartPosition = mCurrentAudio.getPCMLength(); @@ -719,23 +721,23 @@ /// Thread function which is responsible for refreshing half of sound buffer after every 0.5 second and also for stopping play at end of asset /// <see cref=""/> /// </summary> - private void RefreshBuffer () - { - - int ReadPosition; - - // variable to prevent least count errors in clip end time + private void RefreshBuffer() + { + + int ReadPosition; + + // variable to prevent least count errors in clip end time long SafeMargin = CalculationFunctions.ConvertTimeToByte(1, m_SamplingRate, m_FrameSize); - while ( m_lPlayed < ( m_lLength - SafeMargin ) ) - {//1 - if (mSoundBuffer.Status.BufferLost ) - mSoundBuffer.Restore () ; + while (m_lPlayed < (m_lLength - SafeMargin)) + {//1 + if (mSoundBuffer.Status.BufferLost) + mSoundBuffer.Restore(); - - Thread.Sleep (50) ; + Thread.Sleep(50); + if (UpdateVuMeter != null) { ReadPosition = mSoundBuffer.PlayPosition; @@ -743,89 +745,89 @@ if (ReadPosition < ((m_SizeBuffer) - m_UpdateVMArrayLength)) { Array.Copy(mSoundBuffer.Read(ReadPosition, typeof(byte), LockFlag.None, m_UpdateVMArrayLength), arUpdateVM, m_UpdateVMArrayLength); - if ( mEventsEnabled == true) - UpdateVuMeter(this, new Events.Audio.Player.UpdateVuMeterEventArgs()); // JQ // temp for debugging tk + if (mEventsEnabled == true) + UpdateVuMeter(this, new Events.Audio.Player.UpdateVuMeterEventArgs()); // JQ // temp for debugging tk } } - // check if play cursor is in second half , then refresh first half else second + // check if play cursor is in second half , then refresh first half else second // refresh front part for odd count - if ((m_BufferCheck% 2) == 1 && mSoundBuffer.PlayPosition > m_RefreshLength) - {//2 - mSoundBuffer.Write (0 , mAudioStream , m_RefreshLength, 0) ; - m_lPlayed = m_lPlayed + m_RefreshLength ; - m_BufferCheck++ ; - }//-1 - // refresh Rear half of buffer for even count - else if ((m_BufferCheck % 2 == 0) && mSoundBuffer.PlayPosition < m_RefreshLength) - {//1 - mSoundBuffer.Write (m_RefreshLength, mAudioStream, m_RefreshLength, 0) ; - m_lPlayed = m_lPlayed + m_RefreshLength ; - m_BufferCheck++ ; - // end of even/ odd part of buffer; - }//-1 + if ((m_BufferCheck % 2) == 1 && mSoundBuffer.PlayPosition > m_RefreshLength) + {//2 + mSoundBuffer.Write(0, mAudioStream, m_RefreshLength, 0); + m_lPlayed = m_lPlayed + m_RefreshLength; + m_BufferCheck++; + }//-1 + // refresh Rear half of buffer for even count + else if ((m_BufferCheck % 2 == 0) && mSoundBuffer.PlayPosition < m_RefreshLength) + {//1 + mSoundBuffer.Write(m_RefreshLength, mAudioStream, m_RefreshLength, 0); + m_lPlayed = m_lPlayed + m_RefreshLength; + m_BufferCheck++; + // end of even/ odd part of buffer; + }//-1 - // end of while - } - + // end of while + } + m_IsEndOfAsset = false; - int LengthDifference = (int)(m_lPlayed - m_lLength ); - mBufferStopPosition= -1 ; - // if there is no refresh after first load thenrefresh maps directly - if ( m_BufferCheck == 1 ) - { - mBufferStopPosition = Convert.ToInt32(m_SizeBuffer - LengthDifference ); + int LengthDifference = (int)(m_lPlayed - m_lLength); + mBufferStopPosition = -1; + // if there is no refresh after first load thenrefresh maps directly + if (m_BufferCheck == 1) + { + mBufferStopPosition = Convert.ToInt32(m_SizeBuffer - LengthDifference); } // if last refresh is to Front, BufferCheck is even and stop position is at front of buffer. else if ((m_BufferCheck % 2) == 0) { - mBufferStopPosition = Convert.ToInt32(m_RefreshLength - LengthDifference ); - } - else if ((m_BufferCheck > 1) && (m_BufferCheck % 2) == 1) + mBufferStopPosition = Convert.ToInt32(m_RefreshLength - LengthDifference); + } + else if ((m_BufferCheck > 1) && (m_BufferCheck % 2) == 1) { mBufferStopPosition = Convert.ToInt32(m_SizeBuffer - LengthDifference); } - + int CurrentPlayPosition; CurrentPlayPosition = mSoundBuffer.PlayPosition; - int StopMargin = Convert.ToInt32 (CalculationFunctions.ConvertTimeToByte( 70 , m_SamplingRate, m_FrameSize)); - StopMargin = (int) (StopMargin * m_fFastPlayFactor); + int StopMargin = Convert.ToInt32(CalculationFunctions.ConvertTimeToByte(70, m_SamplingRate, m_FrameSize)); + StopMargin = (int)(StopMargin * m_fFastPlayFactor); - if ( mBufferStopPosition < StopMargin) - mBufferStopPosition = StopMargin; + if (mBufferStopPosition < StopMargin) + mBufferStopPosition = StopMargin; - while (CurrentPlayPosition < (mBufferStopPosition - StopMargin) || CurrentPlayPosition > ( mBufferStopPosition )) - { - Thread.Sleep(50); - CurrentPlayPosition = mSoundBuffer.PlayPosition; - } + while (CurrentPlayPosition < (mBufferStopPosition - StopMargin) || CurrentPlayPosition > (mBufferStopPosition)) + { + Thread.Sleep(50); + CurrentPlayPosition = mSoundBuffer.PlayPosition; + } - - // Stopping process begins - mBufferStopPosition = -1 ; - m_lPausePosition = 0; - mSoundBuffer.Stop () ; + + // Stopping process begins + mBufferStopPosition = -1; + m_lPausePosition = 0; + mSoundBuffer.Stop(); if (ResetVuMeter != null) ResetVuMeter(this, new Obi.Events.Audio.Player.UpdateVuMeterEventArgs()); mAudioStream.Close(); - // changes the state and trigger events + // changes the state and trigger events Events.Audio.Player.StateChangedEventArgs e = new Events.Audio.Player.StateChangedEventArgs(mState); mState = AudioPlayerState.Stopped; - TriggerStateChangedEvent(e); + TriggerStateChangedEvent(e); if (mEventsEnabled) - m_IsEventEnabledDelayedTillTimer= true; + m_IsEventEnabledDelayedTillTimer = true; else - m_IsEventEnabledDelayedTillTimer= false; + m_IsEventEnabledDelayedTillTimer = false; m_IsEndOfAsset = true; PreviewPlaybackStop(); - // RefreshBuffer ends - } + // RefreshBuffer ends + } private bool m_IsEventEnabledDelayedTillTimer= true ; private void PreviewPlaybackStop() @@ -1001,7 +1003,7 @@ private void Rewind( long lStartPosition ) { // let's play backward! - if ( m_FwdRwdRate != 0 ) + if ( mFwdRwdRate != 0 ) { m_lChunkStartPosition = lStartPosition ; mEventsEnabled = false; @@ -1022,7 +1024,7 @@ { // let's play forward! - if (m_FwdRwdRate != 0 ) + if (mFwdRwdRate != 0 ) { m_lChunkStartPosition = lStartPosition; mEventsEnabled = false; @@ -1038,7 +1040,7 @@ private void PreviewTimer_Tick(object sender, EventArgs e) { //1 - double StepInMs = Math.Abs( 4000 * m_FwdRwdRate ) ; + double StepInMs = Math.Abs( 4000 * mFwdRwdRate ) ; long lStepInBytes = CalculationFunctions.ConvertTimeToByte(StepInMs, (int) mCurrentAudio.getPCMFormat().getSampleRate () , mCurrentAudio.getPCMFormat().getBlockAlign ()); int PlayChunkLength = 1200; long lPlayChunkLength = CalculationFunctions.ConvertTimeToByte( PlayChunkLength , (int)mCurrentAudio.getPCMFormat().getSampleRate(), mCurrentAudio.getPCMFormat().getBlockAlign()); @@ -1046,7 +1048,7 @@ long PlayStartPos = 0; long PlayEndPos = 0; - if ( m_FwdRwdRate > 0 ) + if ( mFwdRwdRate > 0 ) { //2 if (( mCurrentAudio.getPCMLength () - ( lStepInBytes + m_lChunkStartPosition ) ) > lPlayChunkLength ) { //3 @@ -1071,7 +1073,7 @@ EndOfAudioAsset(this, new Events.Audio.Player.EndOfAudioAssetEventArgs()); } //-3 } //-2 - else if ( m_FwdRwdRate < 0 ) + else if ( mFwdRwdRate < 0 ) { //2 //if (m_lChunkStartPosition > (lStepInBytes ) && lPlayChunkLength <= m_Asset.getPCMLength () ) if (m_lChunkStartPosition > 0 ) @@ -1103,7 +1105,7 @@ /// </summary> private void StopForwardRewind() { - if (m_FwdRwdRate != 0 || mPreviewTimer.Enabled) + if (mFwdRwdRate != 0 || mPreviewTimer.Enabled) { mPreviewTimer.Enabled = false; //m_FwdRwdRate = 0 ; Modified: trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs 2008-05-15 15:50:48 UTC (rev 3068) +++ trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs 2008-05-15 23:03:22 UTC (rev 3069) @@ -129,10 +129,10 @@ this.SpeedUptoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mSpeedDowntoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mElapseBacktoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.PlayPreviewtoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.mPreviewFromtoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.PreviewUptotoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.PreviewSelectedAudiotoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.mPreviewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.mPreviewFromToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.mPreviewUpToToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.mPreviewSelectedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mRecordToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mStartListeningToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mStartRecordingToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -801,7 +801,7 @@ this.mResumeToolStripMenuItem, this.mStopToolStripMenuItem, this.FastPlaytoolStripMenuItem, - this.PlayPreviewtoolStripMenuItem, + this.mPreviewToolStripMenuItem, this.mRecordToolStripMenuItem, this.toolStripSeparator5, this.navigationToolStripMenuItem, @@ -882,32 +882,32 @@ resources.ApplyResources(this.mElapseBacktoolStripMenuItem, "mElapseBacktoolStripMenuItem"); this.mElapseBacktoolStripMenuItem.Click += new System.EventHandler(this.ElapseBacktoolStripMenuItem_Click); // - // PlayPreviewtoolStripMenuItem + // mPreviewToolStripMenuItem // - this.PlayPreviewtoolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.mPreviewFromtoolStripMenuItem, - this.PreviewUptotoolStripMenuItem, - this.PreviewSelectedAudiotoolStripMenuItem}); - this.PlayPreviewtoolStripMenuItem.Name = "PlayPreviewtoolStripMenuItem"; - resources.ApplyResources(this.PlayPreviewtoolStripMenuItem, "PlayPreviewtoolStripMenuItem"); + this.mPreviewToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.mPreviewFromToolStripMenuItem, + this.mPreviewUpToToolStripMenuItem, + this.mPreviewSelectedToolStripMenuItem}); + this.mPreviewToolStripMenuItem.Name = "mPreviewToolStripMenuItem"; + resources.ApplyResources(this.mPreviewToolStripMenuItem, "mPreviewToolStripMenuItem"); // - // mPreviewFromtoolStripMenuItem + // mPreviewFromToolStripMenuItem // - resources.ApplyResources(this.mPreviewFromtoolStripMenuItem, "mPreviewFromtoolStripMenuItem"); - this.mPreviewFromtoolStripMenuItem.Name = "mPreviewFromtoolStripMenuItem"; - this.mPreviewFromtoolStripMenuItem.Click += new System.EventHandler(this.PreviewFromtoolStripMenuItem_Click); + resources.ApplyResources(this.mPreviewFromToolStripMenuItem, "mPreviewFromToolStripMenuItem"); + this.mPreviewFromToolStripMenuItem.Name = "mPreviewFromToolStripMenuItem"; + this.mPreviewFromToolStripMenuItem.Click += new System.EventHandler(this.PreviewFromtoolStripMenuItem_Click); // - // PreviewUptotoolStripMenuItem + // mPreviewUpToToolStripMenuItem // - this.PreviewUptotoolStripMenuItem.Name = "PreviewUptotoolStripMenuItem"; - resources.ApplyResources(this.PreviewUptotoolStripMenuItem, "PreviewUptotoolStripMenuItem"); - this.PreviewUptotoolStripMenuItem.Click += new System.EventHandler(this.PreviewUptotoolStripMenuItem_Click); + this.mPreviewUpToToolStripMenuItem.Name = "mPreviewUpToToolStripMenuItem"; + resources.ApplyResources(this.mPreviewUpToToolStripMenuItem, "mPreviewUpToToolStripMenuItem"); + this.mPreviewUpToToolStripMenuItem.Click += new System.EventHandler(this.PreviewUptotoolStripMenuItem_Click); // - // PreviewSelectedAudiotoolStripMenuItem + // mPreviewSelectedToolStripMenuItem // - this.PreviewSelectedAudiotoolStripMenuItem.Name = "PreviewSelectedAudiotoolStripMenuItem"; - resources.ApplyResources(this.PreviewSelectedAudiotoolStripMenuItem, "PreviewSelectedAudiotoolStripMenuItem"); - this.PreviewSelectedAudiotoolStripMenuItem.Click += new System.EventHandler(this.PreviewSelectedAudiotoolStripMenuItem_Click); + this.mPreviewSelectedToolStripMenuItem.Name = "mPreviewSelectedToolStripMenuItem"; + resources.ApplyResources(this.mPreviewSelectedToolStripMenuItem, "mPreviewSelectedToolStripMenuItem"); + this.mPreviewSelectedToolStripMenuItem.Click += new System.EventHandler(this.PreviewSelectedAudiotoolStripMenuItem_Click); // // mRecordToolStripMenuItem // @@ -1022,10 +1022,11 @@ // // mToolsToolStripMenuItem // - resources.ApplyResources(this.mToolsToolStripMenuItem, "mToolsToolStripMenuItem"); + this.mToolsToolStripMenuItem.AccessibleName = global::Obi.messages.phrase_extra_Plain; this.mToolsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.preferencesToolStripMenuItem1}); this.mToolsToolStripMenuItem.Name = "mToolsToolStripMenuItem"; + resources.ApplyResources(this.mToolsToolStripMenuItem, "mToolsToolStripMenuItem"); // // preferencesToolStripMenuItem1 // @@ -1216,14 +1217,14 @@ private System.Windows.Forms.ToolStripMenuItem mFocusOnTransportBarToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem mPhraseDetectionToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem FastPlaytoolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem PlayPreviewtoolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem mPreviewToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem NormalSpeedtoolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem SpeedUptoolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem mSpeedDowntoolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem mElapseBacktoolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem mPreviewFromtoolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem PreviewUptotoolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem PreviewSelectedAudiotoolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem mPreviewFromToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem mPreviewUpToToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem mPreviewSelectedToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem mInPhraseSelectionToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem mBeginInPhraseSelectionToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem mEndInPhraseSelectionToolStripMenuItem; Modified: trunk/urakawa/application/Obi/Obi/ObiForm.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-15 15:50:48 UTC (rev 3068) +++ trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-15 23:03:22 UTC (rev 3069) @@ -609,7 +609,7 @@ { mPlayAllToolStripMenuItem.Enabled = mProjectView.CanPlay; mPlaySelectionToolStripMenuItem.Enabled = mProjectView.CanPlaySelection; - PlayPreviewtoolStripMenuItem.Enabled = mProjectView.CanPlay; + mPreviewToolStripMenuItem.Enabled = mProjectView.CanPlay; FastPlaytoolStripMenuItem.Enabled = mProjectView.CanPlay; if (mProjectView.CanResume) @@ -638,6 +638,11 @@ } mStartRecordingToolStripMenuItem.Enabled = mProjectView.TransportBar.Enabled; mStartListeningToolStripMenuItem.Enabled = mProjectView.TransportBar.Enabled; + + mPreviewToolStripMenuItem.Enabled = mProjectView.CanPreview || mProjectView.CanPreviewAudioSelection; + mPreviewFromToolStripMenuItem.Enabled = mProjectView.CanPreview; + mPreviewUpToToolStripMenuItem.Enabled = mProjectView.CanPreview; + mPreviewSelectedToolStripMenuItem.Enabled = mProjectView.CanPreviewAudioSelection; } private void mPlayAllToolStripMenuItem_Click(object sender, EventArgs e) @@ -736,21 +741,10 @@ mProjectView.TransportBar.FastPlayNormaliseWithLapseBack(); } - private void PreviewFromtoolStripMenuItem_Click(object sender, EventArgs e) - { - mProjectView.TransportBar.PlayPreviewFromCurrentPosition(); - } + private void PreviewFromtoolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.Preview(true); } + private void PreviewUptotoolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.Preview(false); } + private void PreviewSelectedAudiotoolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.PreviewAudioSelection(); } - private void PreviewUptotoolStripMenuItem_Click(object sender, EventArgs e) - { - mProjectView.TransportBar.PlayPreviewUptoCurrentPosition(); - } - - private void PreviewSelectedAudiotoolStripMenuItem_Click(object sender, EventArgs e) - { - mProjectView.TransportBar.PlayPreviewSelectedFragment(); - } - private void PhraseDetectionToolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.ApplyPhraseDetection(); Modified: trunk/urakawa/application/Obi/Obi/ObiForm.resx =================================================================== --- trunk/urakawa/application/Obi/Obi/ObiForm.resx 2008-05-15 15:50:48 UTC (rev 3068) +++ trunk/urakawa/application/Obi/Obi/ObiForm.resx 2008-05-15 23:03:22 UTC (rev 3069) @@ -236,15 +236,6 @@ <data name="toolStripSeparator2.Size" type="System.Drawing.Size, System.Drawing"> <value>256, 6</value> </data> - <data name="openrecentSeparator.Size" type="System.Drawing.Size, System.Drawing"> - <value>112, 6</value> - </data> - <data name="mClearListToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>115, 22</value> - </data> - <data name="mClearListToolStripMenuItem.Text" xml:space="preserve"> - <value>&Clear list</value> - </data> <data name="mRecentProjectToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> <value>259, 22</value> </data> @@ -272,6 +263,205 @@ <data name="mFileToolStripMenuItem.Text" xml:space="preserve"> <value>&File</value> </data> + <data name="toolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing"> + <value>37, 20</value> + </data> + <data name="toolStripMenuItem1.Text" xml:space="preserve"> + <value>&Edit</value> + </data> + <data name="mViewToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>41, 20</value> + </data> + <data name="mViewToolStripMenuItem.Text" xml:space="preserve"> + <value>&View</value> + </data> + <data name="mSectionsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>59, 20</value> + </data> + <data name="mSectionsToolStripMenuItem.Text" xml:space="preserve"> + <value>&Sections</value> + </data> + <data name="mPhrasesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>57, 20</value> + </data> + <data name="mPhrasesToolStripMenuItem.Text" xml:space="preserve"> + <value>&Phrases</value> + </data> + <data name="playToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>172, 22</value> + </data> + <data name="playToolStripMenuItem.Text" xml:space="preserve"> + <value>&Play</value> + </data> + <data name="mPauseToolStripMenuItem.AccessibleName" xml:space="preserve"> + <value>Pause Space</value> + </data> + <data name="mPauseToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve"> + <value>Space</value> + </data> + <data name="mPauseToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>172, 22</value> + </data> + <data name="mPauseToolStripMenuItem.Text" xml:space="preserve"> + <value>Pa&use</value> + </data> + <data name="mResumeToolStripMenuItem.AccessibleName" xml:space="preserve"> + <value>Resume Space</value> + </data> + <data name="mResumeToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve"> + <value>Space</value> + </data> + <data name="mResumeToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>172, 22</value> + </data> + <data name="mResumeToolStripMenuItem.Text" xml:space="preserve"> + <value>Res&ume</value> + </data> + <data name="mStopToolStripMenuItem.AccessibleName" xml:space="preserve"> + <value>Stop Ctrl+Space</value> + </data> + <data name="mStopToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> + <value>Ctrl+Space</value> + </data> + <data name="mStopToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>172, 22</value> + </data> + <data name="mStopToolStripMenuItem.Text" xml:space="preserve"> + <value>&Stop</value> + </data> + <data name="FastPlaytoolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>172, 22</value> + </data> + <data name="FastPlaytoolStripMenuItem.Text" xml:space="preserve"> + <value>Fast p&lay</value> + </data> + <data name="mPreviewFromToolStripMenuItem.AccessibleName" xml:space="preserve"> + <value>Preview from... Ctrl+P</value> + </data> + <data name="mPreviewFromToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> + <value>Ctrl+P</value> + </data> + <data name="mPreviewFromToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>187, 22</value> + </data> + <data name="mPreviewFromToolStripMenuItem.Text" xml:space="preserve"> + <value>Preview &from...</value> + </data> + <data name="mPreviewUpToToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>187, 22</value> + </data> + <data name="mPreviewUpToToolStripMenuItem.Text" xml:space="preserve"> + <value>Preview &up to...</value> + </data> + <data name="mPreviewSelectedToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>187, 22</value> + </data> + <data name="mPreviewSelectedToolStripMenuItem.Text" xml:space="preserve"> + <value>Preview &selected</value> + </data> + <data name="mPreviewToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>172, 22</value> + </data> + <data name="mPreviewToolStripMenuItem.Text" xml:space="preserve"> + <value>Pre&view</value> + </data> + <data name="mRecordToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>172, 22</value> + </data> + <data name="mRecordToolStripMenuItem.Text" xml:space="preserve"> + <value>&Record</value> + </data> + <data name="toolStripSeparator5.Size" type="System.Drawing.Size, System.Drawing"> + <value>169, 6</value> + </data> + <data name="navigationToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>172, 22</value> + </data> + <data name="navigationToolStripMenuItem.Text" xml:space="preserve"> + <value>&Navigation</value> + </data> + <data name="mRewindToolStripMenuItem.AccessibleName" xml:space="preserve"> + <value>Rewind Ctrl+comma</value> + </data> + <data name="mRewindToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve"> + <value>Ctrl+,</value> + </data> + <data name="mRewindToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> + <value>Ctrl+Oemcomma</value> + </data> + <data name="mRewindToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>172, 22</value> + </data> + <data name="mRewindToolStripMenuItem.Text" xml:space="preserve"> + <value>Re&wind</value> + </data> + <data name="mFastForwardToolStripMenuItem.AccessibleName" xml:space="preserve"> + <value>Fast forward Ctrl+.</value> + </data> + <data name="mFastForwardToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve"> + <value>Ctrl+.</value> + </data> + <data name="mFastForwardToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> + <value>Ctrl+OemPeriod</value> + </data> + <data name="mFastForwardToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>172, 22</value> + </data> + <data name="mFastForwardToolStripMenuItem.Text" xml:space="preserve"> + <value>&Fast forward</value> + </data> + <data name="transportToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>66, 20</value> + </data> + <data name="transportToolStripMenuItem.Text" xml:space="preserve"> + <value>Tr&ansport</value> + </data> + <data name="mToolsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>44, 20</value> + </data> + <data name="mToolsToolStripMenuItem.Text" xml:space="preserve"> + <value>&Tools</value> + </data> + <data name="mHelpToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>40, 20</value> + </data> + <data name="mHelpToolStripMenuItem.Text" xml:space="preserve"> + <value>&Help</value> + </data> + <data name="mMenuStrip.Location" type="System.Drawing.Point, System.Drawing"> + <value>0, 0</value> + </data> + <data name="mMenuStrip.Size" type="System.Drawing.Size, System.Drawing"> + <value>958, 24</value> + </data> + <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> + <data name="mMenuStrip.TabIndex" type="System.Int32, mscorlib"> + <value>1</value> + </data> + <data name="mMenuStrip.Text" xml:space="preserve"> + <value>menuStrip1</value> + </data> + <data name=">>mMenuStrip.Name" xml:space="preserve"> + <value>mMenuStrip</value> + </data> + <data name=">>mMenuStrip.Type" xml:space="preserve"> + <value>System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>mMenuStrip.Parent" xml:space="preserve"> + <value>$this</value> + </data> + <data name=">>mMenuStrip.ZOrder" xml:space="preserve"> + <value>2</value> + </data> + <data name="openrecentSeparator.Size" type="System.Drawing.Size, System.Drawing"> + <value>112, 6</value> + </data> + <data name="mClearListToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>115, 22</value> + </data> + <data name="mClearListToolStripMenuItem.Text" xml:space="preserve"> + <value>&Clear list</value> + </data> <data name="mUndoToolStripMenuItem.AccessibleName" xml:space="preserve"> <value>Undo Ctrl+Z</value> </data> @@ -431,12 +621,6 @@ <data name="mFindPreviousToolStripMenuItem.Text" xml:space="preserve"> <value>Find pre&vious</value> </data> - <data name="toolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing"> - <value>37, 20</value> - </data> - <data name="toolStripMenuItem1.Text" xml:space="preserve"> - <value>&Edit</value> - </data> <data name="mShowTOCViewToolStripMenuItem.AccessibleName" xml:space="preserve"> <value>Show TOC view Ctrl+Alt+T</value> </data> @@ -590,12 +774,6 @@ <data name="mShowSourceToolStripMenuItem.Text" xml:space="preserve"> <value>Show sou&rce view</value> </data> - <data name="mViewToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>41, 20</value> - </data> - <data name="mViewToolStripMenuItem.Text" xml:space="preserve"> - <value>&View</value> - </data> <data name="mAddSectionToolStripMenuItem.AccessibleName" xml:space="preserve"> <value>Add section Ctrl+H</value> </data> @@ -710,12 +888,6 @@ <data name="mSectionIsUsedToolStripMenuItem.Text" xml:space="preserve"> <value>Section is &used</value> </data> - <data name="mSectionsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>59, 20</value> - </data> - <data name="mSectionsToolStripMenuItem.Text" xml:space="preserve"> - <value>&Sections</value> - </data> <data name="mAddBlankPhraseToolStripMenuItem.AccessibleName" xml:space="preserve"> <value>Add blank phrase Ctrl+B</value> </data> @@ -791,6 +963,12 @@ <data name="toolStripSeparator6.Size" type="System.Drawing.Size, System.Drawing"> <value>250, 6</value> </data> + <data name="mAssignRoleToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>253, 22</value> + </data> + <data name="mAssignRoleToolStripMenuItem.Text" xml:space="preserve"> + <value>&Assign role</value> + </data> <data name="mSetAsHeadingToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> <value>160, 22</value> </data> @@ -827,12 +1005,6 @@ <data name="mAddRoleToolStripTextBox.Text" xml:space="preserve"> <value>(Add role)</value> </data> - <data name="mAssignRoleToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>253, 22</value> - </data> - <data name="mAssignRoleToolStripMenuItem.Text" xml:space="preserve"> - <value>&Assign role</value> - </data> <data name="mEditRolesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> <value>253, 22</value> </data> @@ -869,10 +1041,15 @@ <data name="mMarkDefaultCustomClassToolStripMenuItem.Text" xml:space="preserve"> <value>Mar&k default custom class</value> </data> - <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <data name="mMarkDefaultCustomClassToolStripMenuItem.Visible" type="System.Boolean, mscorlib"> <value>False</value> </data> + <data name="mInPhraseSelectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>253, 22</value> + </data> + <data name="mInPhraseSelectionToolStripMenuItem.Text" xml:space="preserve"> + <value>In-ph&rase audio selection</value> + </data> <data name="mBeginInPhraseSelectionToolStripMenuItem.AccessibleName" xml:space="preserve"> <value>Begin in-phrase selection Ctrl+[</value> </data> @@ -909,11 +1086,11 @@ <data name="mDeselectInPhraseSelectionToolStripMenuItem.Text" xml:space="preserve"> <value>&Deselect</value> </data> - <data name="mInPhraseSelectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <data name="mGoToToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> <value>253, 22</value> </data> - <data name="mInPhraseSelectionToolStripMenuItem.Text" xml:space="preserve"> - <value>In-ph&rase audio selection</value> + <data name="mGoToToolStripMenuItem.Text" xml:space="preserve"> + <value>&Go to...</value> </data> <data name="mNextTODOPhraseToolStripMenuItem.AccessibleName" xml:space="preserve"> <value>Next TODO phrase Ctrl+F9</value> @@ -939,18 +1116,6 @@ <data name="mPreviousTODOPhraseToolStripMenuItem.Text" xml:space="preserve"> <value>&Previous TODO phrase</value> </data> - <data name="mGoToToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>253, 22</value> - </data> - <data name="mGoToToolStripMenuItem.Text" xml:space="preserve"> - <value>&Go to...</value> - </data> - <data name="mPhrasesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>57, 20</value> - </data> - <data name="mPhrasesToolStripMenuItem.Text" xml:space="preserve"> - <value>&Phrases</value> - </data> <data name="mPlayAllToolStripMenuItem.AccessibleName" xml:space="preserve"> <value>Play all Ctrl+Shift+Space</value> </data> @@ -975,48 +1140,6 @@ <data name="mPlaySelectionToolStripMenuItem.Text" xml:space="preserve"> <value>Play &selection</value> </data> - <data name="playToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>172, 22</value> - </data> - <data name="playToolStripMenuItem.Text" xml:space="preserve"> - <value>&Play</value> - </data> - <data name="mPauseToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Pause Space</value> - </data> - <data name="mPauseToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve"> - <value>Space</value> - </data> - <data name="mPauseToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>172, 22</value> - </data> - <data name="mPauseToolStripMenuItem.Text" xml:space="preserve"> - <value>Pa&use</value> - </data> - <data name="mResumeToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Resume Space</value> - </data> - <data name="mResumeToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve"> - <value>Space</value> - </data> - <data name="mResumeToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>172, 22</value> - </data> - <data name="mResumeToolStripMenuItem.Text" xml:space="preserve"> - <value>Res&ume</value> - </data> - <data name="mStopToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Stop Ctrl+Space</value> - </data> - <data name="mStopToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> - <value>Ctrl+Space</value> - </data> - <data name="mStopToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>172, 22</value> - </data> - <data name="mStopToolStripMenuItem.Text" xml:space="preserve"> - <value>&Stop</value> - </data> <data name="NormalSpeedtoolStripMenuItem.AccessibleName" xml:space="preserve"> <value>Normal speed Ctrl+0</value> </data> @@ -1065,42 +1188,6 @@ <data name="mElapseBacktoolStripMenuItem.Text" xml:space="preserve"> <value>Normal speed with &elapse back</value> </data> - <data name="FastPlaytoolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>172, 22</value> - </data> - <data name="FastPlaytoolStripMenuItem.Text" xml:space="preserve"> - <value>Fast p&lay</value> - </data> - <data name="mPreviewFromtoolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Preview from... Ctrl+P</value> - </data> - <data name="mPreviewFromtoolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> - <value>Ctrl+P</value> - </data> - <data name="mPreviewFromtoolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>187, 22</value> - </data> - <data name="mPreviewFromtoolStripMenuItem.Text" xml:space="preserve"> - <value>Preview &from...</value> - </data> - <data name="PreviewUptotoolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>187, 22</value> - </data> - <data name="PreviewUptotoolStripMenuItem.Text" xml:space="preserve"> - <value>Preview &up to...</value> - </data> - <data name="PreviewSelectedAudiotoolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>187, 22</value> - </data> - <data name="PreviewSelectedAudiotoolStripMenuItem.Text" xml:space="preserve"> - <value>Preview &selected</value> - </data> - <data name="PlayPreviewtoolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>172, 22</value> - </data> - <data name="PlayPreviewtoolStripMenuItem.Text" xml:space="preserve"> - <value>Pre&view</value> - </data> <data name="mStartListeningToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Ctrl+R</value> </data> @@ -1125,15 +1212,6 @@ <data name="mAllowOverwriteToolStripMenuItem.Text" xml:space="preserve"> <value>Allow &overwrite</value> </data> - <data name="mRecordToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>172, 22</value> - </data> - <data name="mRecordToolStripMenuItem.Text" xml:space="preserve"> - <value>&Record</value> - </data> - <data name="toolStripSeparator5.Size" type="System.Drawing.Size, System.Drawing"> - <value>169, 6</value> - </data> <data name="mPreviousSectionToolStripMenuItem.AccessibleName" xml:space="preserve"> <value>Previous section Alt+Up</value> </data> @@ -1215,51 +1293,6 @@ <data name="mPlayOnNavigateToolStripMenuItem.Text" xml:space="preserve"> <value>Play on &navigate</value> </data> - <data name="navigationToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>172, 22</value> - </data> - <data name="navigationToolStripMenuItem.Text" xml:space="preserve"> - <value>&Navigation</value> - </data> - <data name="mRewindToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Rewind Ctrl+comma</value> - </data> - <data name="mRewindToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve"> - <value>Ctrl+,</value> - </data> - <data name="mRewindToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> - <value>Ctrl+Oemcomma</value> - </data> - <data name="mRewindToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>172, 22</value> - </data> - <data name="mRewindToolStripMenuItem.Text" xml:space="preserve"> - <value>Re&wind</value> - </data> - <data name="mFastForwardToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Fast forward Ctrl+.</value> - </data> - <data name="mFastForwardToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve"> - <value>Ctrl+.</value> - </data> - <data name="mFastForwardToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> - <value>Ctrl+OemPeriod</value> - </data> - <data name="mFastForwardToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>172, 22</value> - </data> - <data name="mFastForwardToolStripMenuItem.Text" xml:space="preserve"> - <value>&Fast forward</value> - </data> - <data name="transportToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>66, 20</value> - </data> - <data name="transportToolStripMenuItem.Text" xml:space="preserve"> - <value>Tr&ansport</value> - </data> - <data name="mToolsToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value /> - </data> <data name="preferencesToolStripMenuItem1.AccessibleName" xml:space="preserve"> <value>Preferences Ctrl+Alt+F</value> </data> @@ -1272,12 +1305,6 @@ <data name="preferencesToolStripMenuItem1.Text" xml:space="preserve"> <value>&Preferences</value> </data> - <data name="mToolsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>44, 20</value> - </data> - <data name="mToolsToolStripMenuItem.Text" xml:space="preserve"> - <value>&Tools</value> - </data> <data name="mContentsToolStripMenuItem.AccessibleName" xml:space="preserve"> <value>Contents F1</value> </data> @@ -1320,42 +1347,9 @@ <data name="aboutObiToolStripMenuItem.Text" xml:space="preserve"> <value>&About Obi</value> </data> - <data name="mHelpToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>40, 20</value> - </data> - <data name="mHelpToolStripMenuItem.Text" xml:space="preserve"> - <value>&Help</value> - </data> - <data name="mMenuStrip.Location" type="System.Drawing.Point, System.Drawing"> - <value>0, 0</value> - </data> - <data name="mMenuStrip.Size" type="System.Drawing.Size, System.Drawing"> - <value>958, 24</value> - </data> - <data name="mMenuStrip.TabIndex" type="System.Int32, mscorlib"> - <value>1</value> - </data> - <data name="mMenuStrip.Text" xml:space="preserve"> - <value>menuStrip1</value> - </data> - <data name=">>mMenuStrip.Name" xml:space="preserve"> - <value>mMenuStrip</value> - </data> - <data name=">>mMenuStrip.Type" xml:space="preserve"> - <value>System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>mMenuStrip.Parent" xml:space="preserve"> - <value>$this</value> - </data> - <data name=">>mMenuStrip.ZOrder" xml:space="preserve"> - <value>2</value> - </data> <metadata name="mStatusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>0, 606</value> </metadata> - <data name="mStatusLabel.Size" type="System.Drawing.Size, System.Drawing"> - <value>0, 17</value> - </data> <data name="mStatusStrip.Location" type="System.Drawing.Point, System.Drawing"> <value>0, 606</value> </data> @@ -1380,6 +1374,9 @@ <data name=">>mStatusStrip.ZOrder" xml:space="preserve"> <value>1</value> </data> + <data name="mStatusLabel.Size" type="System.Drawing.Size, System.Drawing"> + <value>0, 17</value> + </data> <data name="mProjectView.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <value>Fill</value> </data> @@ -1399,7 +1396,7 @@ <value>mProjectView</value> </data> <data name=">>mProjectView.Type" xml:space="preserve"> - <value>Obi.ProjectView.ProjectView, Obi, Version=0.10.8.30052, Culture=neutral, PublicKeyToken=null</value> + <value>Obi.ProjectView.ProjectView, Obi, Version=0.10.8.43039, Culture=neutral, PublicKeyToken=null</value> </data> <data name=">>mProjectView.Parent" xml:space="preserve"> <value>$this</value> @@ -2269,28 +2266,28 @@ <data name=">>mElapseBacktoolStripMenuItem.Type" xml:space="preserve"> <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </data> - <data name=">>PlayPreviewtoolStripMenuItem.Name" xml:space="preserve"> - <value>PlayPreviewtoolStripMenuItem</value> + <data name=">>mPreviewToolStripMenuItem.Name" xml:space="preserve"> + <value>mPreviewToolStripMenuItem</value> </data> - <data name=">>PlayPreviewtoolStripMenuItem.Type" xml:space="preserve"> + <data name=">>mPreviewToolStripMenuItem.Type" xml:space="preserve"> <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </data> - <data name=">>mPreviewFromtoolStripMenuItem.Name" xml:space="preserve"> - <value>mPreviewFromtoolStripMenuItem</value> + <data name=">>mPreviewFromToolStripMenuItem.Name" xml:space="preserve"> + <value>mPreviewFromToolStripMenuItem</value> </data> - <data name=">>mPreviewFromtoolStripMenuItem.Type" xml:space="preserve"> + <data name=">>mPreviewFromToolStripMenuItem.Type" xml:space="preserve"> <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </data> - <data name=">>PreviewUptotoolStripMenuItem.Name" xml:space="preserve"> - <value>PreviewUptotoolStripMenuItem</value> + <data name=">>mPreviewUpToToolStripMenuItem.Name" xml:space="preserve"> + <value>mPreviewUpToToolStripMenuItem</value> </data> - <data name=">>PreviewUptotoolStripMenuItem.Type" xml:space="preserve"> + <data name=">>mPreviewUpToToolStripMenuItem.Type" xml:space="preserve"> <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </data> - <data name=">>PreviewSelectedAudiotoolStripMenuItem.Name" xml:space="preserve"> - <value>PreviewSelectedAudiotoolStripMenuItem</value> + <data name=">>mPreviewSelectedToolStripMenuItem.Name" xml:space="preserve"> + <value>mPreviewSelectedToolStripMenuItem</value> </data> - <data name=">>PreviewSelectedAudiotoolStripMenuItem.Type" xml:space="preserve"> + <data name=">>mPreviewSelectedToolStripMenuItem.Type" xml:space="preserve"> <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </data> <data name=">>mRecordToolStripMenuItem.Name" xml:space="preserve"> Modified: trunk/urakawa/application/Obi/Obi/Playlist.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/Playlist.cs 2008-05-15 15:50:48 UTC (rev 3068) +++ trunk/urakawa/application/Obi/Obi/Playlist.cs 2008-05-15 23:03:22 UTC (rev 3069) @@ -865,31 +865,7 @@ - public void PreviewFromCurrentPosition( double StartTime , double duration) - { - AudioMediaData AudioData = mPhrases[mCurrentPhraseIndex].Audio.getMediaData(); - - double EndTime = StartTime + duration; - - if (EndTime > AudioData.getAudioDuration().getTimeDeltaAsMillisecondFloat()) - EndTime = AudioData.getAudioDuration().getTimeDeltaAsMillisecondFloat(); - - mPlayer.PlayPreview(AudioData, StartTime, EndTime, StartTime); - } - - public void PreviewUptoCurrentPosition( double EndTime , double duration) - { - AudioMediaData AudioData = mPhrases[mCurrentPhraseIndex].Audio.getMediaData(); - - double StartTime = EndTime - duration; - - if (StartTime < 0) - StartTime = 0; - - mPlayer.PlayPreview(AudioData, StartTime, EndTime, EndTime); - } - public void PreviewSelectedFragment(double StartTime , double EndTime ) { AudioMediaData AudioData = mPhrases[mCurrentPhraseIndex].Audio.getMediaData(); Modified: trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-15 15:50:48 UTC (rev 3068) +++ trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-15 23:03:22 UTC (rev 3069) @@ -210,6 +210,8 @@ public bool CanPause { get { return mTransportBar.CanPause; } } public bool CanPlay { get { return mTransportBar.CanPlay; } } public bool CanPlaySelection { get { return mTransportBar.CanPlay && mSelection != null; } } + public bool CanPreview { get { return mTransportBar.CanPreview; } } + public bool CanPreviewAudioSelection { get { return mTransportBar.CanPreviewAudioSelection; } } public bool CanRemoveAudio { get { return mStripsView.CanRemoveAudio; } } public bool CanRemoveBlock { get { return mStripsView.CanRemoveBlock; } } public bool CanRemoveMetadata { get { return mMetadataView.CanRemoveMetadata; } } Modified: trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs 2008-05-15 15:50:48 UTC (rev 3068) +++ trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs 2008-05-15 23:03:22 UTC (rev 3069) @@ -640,10 +640,11 @@ mShortcutKeys[Keys.OemCloseBrackets] = MarkSelectionEndTime; mShortcutKeys[Keys.Shift | Keys.OemOpenBrackets] = MarkSelectionFromCursor; mShortcutKeys[Keys.Shift | Keys.OemCloseBrackets] = MarkSelectionToCursor; - mShortcutKeys[Keys.X ] = PlayPreviewUptoCurrentPosition; - mShortcutKeys[Keys.C] = PlayPreviewSelectedFragment; - mShortcutKeys[Keys.V ] = PlayPreviewFromCurrentPosition; + mShortcutKeys[Keys.C] = delegate() { return mView.TransportBar.PreviewAudioSelection(); }; + mShortcutKeys[Keys.V] = delegate() { return mView.TransportBar.Preview(true); }; + mShortcutKeys[Keys.X] = delegate() { return mView.TransportBar.Preview(false); }; + // Strips navigation mShortcutKeys[Keys.Left] = SelectPrecedingBlock; mShortcutKeys[Keys.Right] = SelectFollowingBlock; @@ -653,8 +654,6 @@ mShortcutKeys[Keys.Control | Keys.PageUp] = SelectPrecedingPageNode; mShortcutKeys[Keys.F4] = SelectNextSpecialRoleNode ; mShortcutKeys[ Keys.Shift | Keys.F4] = SelectPreviousSpecialRoleNode ; - //mShortcutKeys[Keys.Control | Keys.F9 ] = SelectNextTo_DoNode ; - //mShortcutKeys[Keys.Control | Keys.Shift | Keys.F9] = SelectPreviousTo_DoNode; mShortcutKeys[Keys.Up] = SelectPreviousStrip; mShortcutKeys[Keys.Down] = SelectNextStrip; @@ -1092,21 +1091,7 @@ return mView.TransportBar.MarkSelectionWholePhrase(); } - private bool PlayPreviewFromCurrentPosition () - { - return mView.TransportBar.PlayPreviewFromCurrentPosition () ; - } - private bool PlayPreviewSelectedFragment() - { - return mView.TransportBar.PlayPreviewSelectedFra... [truncated message content] |