[ingex-commits] ingex/studio/ace-tao/Ingexgui/src eventlist.cpp, 1.4, 1.5 ingexgui.cpp, 1.15, 1.16

[John F. <jo...@us...>]

Update of /cvsroot/ingex/ingex/studio/ace-tao/Ingexgui/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv14578

Modified Files:
	eventlist.cpp ingexgui.cpp 
Log Message:
Updates re. cue points

Index: eventlist.cpp
===================================================================
RCS file: /cvsroot/ingex/ingex/studio/ace-tao/Ingexgui/src/eventlist.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** eventlist.cpp	1 May 2009 13:41:34 -0000	1.4
--- eventlist.cpp	21 May 2009 10:22:36 -0000	1.5
***************
*** 388,392 ****
  /// Updates the other controls and the player.
  /// @param type The event type: START, CUE, CHUNK, STOP or [PROBLEM]-not fully implemented.
! /// @param timecode Timecode of the event, for START and optionally STOP and CHUNK events (for STOP and CHUNK events, assumed to be frame-accurate, unlike frameCount).
  /// @param frameCount The position in frames, for CUE, STOP and CHUNK events. (For STOP and CHUNK events, if timecode supplied, used to work out the number of days; otherwise, used as the frame-accurate length unless zero, which indicates unknown).
  /// @param description A description to display for events other than START (which uses the project name).
--- 388,392 ----
  /// Updates the other controls and the player.
  /// @param type The event type: START, CUE, CHUNK, STOP or [PROBLEM]-not fully implemented.
! /// @param timecode Timecode of the event, for START, CUE and optionally STOP and CHUNK events (for STOP and CHUNK events, assumed to be frame-accurate, unlike frameCount).
  /// @param frameCount The position in frames, for CUE, STOP and CHUNK events. (For STOP and CHUNK events, if timecode supplied, used to work out the number of days; otherwise, used as the frame-accurate length unless zero, which indicates unknown).
  /// @param description A description to display for events other than START (which uses the project name).

Index: ingexgui.cpp
===================================================================
RCS file: /cvsroot/ingex/ingex/studio/ace-tao/Ingexgui/src/ingexgui.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** ingexgui.cpp	14 May 2009 11:00:11 -0000	1.15
--- ingexgui.cpp	21 May 2009 10:22:36 -0000	1.16
***************
*** 1227,1231 ****
  				timecode.samples += frameCount; //will wrap automatically on display
  				if (wxID_OK == mCuePointsDlg->ShowModal(Timepos::FormatTimecode(timecode))) {
! 					mEventList->AddEvent(EventList::CUE, 0, frameCount, mCuePointsDlg->GetDescription(), mCuePointsDlg->GetColourIndex());
  					UpdatePlayerAndEventControls();
  					mSavedState.Save(mSavedStateFilename);
--- 1227,1231 ----
  				timecode.samples += frameCount; //will wrap automatically on display
  				if (wxID_OK == mCuePointsDlg->ShowModal(Timepos::FormatTimecode(timecode))) {
! 					mEventList->AddEvent(EventList::CUE, &timecode, frameCount, mCuePointsDlg->GetDescription(), mCuePointsDlg->GetColourIndex());
  					UpdatePlayerAndEventControls();
  					mSavedState.Save(mSavedStateFilename);
***************
*** 2236,2240 ****
  {
  //	mDeleteCueButton->Enable(canEdit);
! 	EnableButtonReliably(mDeleteCueButton);
  	mEventList->CanEdit(canEdit);
  }
--- 2236,2240 ----
  {
  //	mDeleteCueButton->Enable(canEdit);
! 	EnableButtonReliably(mDeleteCueButton, canEdit);
  	mEventList->CanEdit(canEdit);
  }