gtab-cvs Mailing List for gtab

Status: Alpha

Brought to you by: m0ta

gtab-cvs — CVS notifications

You can subscribe to this list here.

2005	_Jan	_Feb	_Mar (28)	_Apr (17)	_May (45)	_Jun (30)	_Jul (122)	_Aug (122)	_Sep (23)	_Oct (43)	_Nov (19)	_Dec (20)
2006	_Jan (26)	_Feb (69)	_Mar	_Apr (10)	_May	_Jun	_Jul	_Aug (3)	_Sep	_Oct	_Nov	_Dec

Flat | Threaded

1 2 3 .. 24 > >> (Page 1 of 24)

[Gtab-cvs] src/midi MidiStack.cpp,1.5,1.6

From: m0ta <m0...@us...> - 2006-08-03 15:35:00

Update of /cvsroot/gtab/src/midi
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv14599/midi

Modified Files:
	MidiStack.cpp 
Log Message:
* changes to reduce warnings

Index: MidiStack.cpp
===================================================================
RCS file: /cvsroot/gtab/src/midi/MidiStack.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MidiStack.cpp	28 Feb 2006 07:15:24 -0000	1.5
--- MidiStack.cpp	3 Aug 2006 15:34:56 -0000	1.6
***************
*** 23,27 ****
  MidiStack::MidiStack()
  {
!     
  }
  
--- 23,27 ----
  MidiStack::MidiStack()
  {
! 
  }
  
***************
*** 52,66 ****
  
      for(MidiStackList::iterator iStack = stacks.begin(); iStack != stacks.end(); ++iStack)
-     {
          (*iStack)->reset();
!     }
!     while( true )
!     {
!         size_t minDuration = -1;
          MidiEvent* currentEvent = new MidiEvent;
          if(stacks.empty())
-         {
              break;
-         }
          for(MidiStackList::iterator iStack = stacks.begin(); iStack != stacks.end(); ++iStack)
          {
--- 52,62 ----
  
      for(MidiStackList::iterator iStack = stacks.begin(); iStack != stacks.end(); ++iStack)
          (*iStack)->reset();
! 
!     while( true ) {
!         int minDuration = -1;
          MidiEvent* currentEvent = new MidiEvent;
          if(stacks.empty())
              break;
          for(MidiStackList::iterator iStack = stacks.begin(); iStack != stacks.end(); ++iStack)
          {
***************
*** 71,75 ****
              if( (*iStack)->currentTime() <= currentTime() ) {
                  MidiEvent* event = (*iStack)->leftMost();
!                 minDuration = std::min(minDuration, (size_t)event->duration());
                  (*iStack)->removeLeftMost();
                  currentEvent->combine( event );
--- 67,71 ----
              if( (*iStack)->currentTime() <= currentTime() ) {
                  MidiEvent* event = (*iStack)->leftMost();
!                 minDuration = std::min(minDuration, event->duration());
                  (*iStack)->removeLeftMost();
                  currentEvent->combine( event );
***************
*** 77,81 ****
              }
          }
!         if( minDuration == -1)
              minDuration = 0;
  
--- 73,77 ----
              }
          }
!         if (minDuration == -1)
              minDuration = 0;

[Gtab-cvs] src frame.cpp, 1.104, 1.105 playbackthrd.cpp, 1.15, 1.16 stdafx.h, 1.7, 1.8

From: m0ta <m0...@us...> - 2006-08-03 15:35:00

Update of /cvsroot/gtab/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv14599

Modified Files:
	frame.cpp playbackthrd.cpp stdafx.h 
Log Message:
* changes to reduce warnings

Index: stdafx.h
===================================================================
RCS file: /cvsroot/gtab/src/stdafx.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** stdafx.h	28 Feb 2006 07:15:24 -0000	1.7
--- stdafx.h	3 Aug 2006 15:34:56 -0000	1.8
***************
*** 6,10 ****
--- 6,12 ----
  #include <fstream>
  #include "dataobjects/documentdata.h"
+ #ifdef _MSC_VER
  #pragma hdrstop
+ #endif
  
  #define DEBUG_NEW new

Index: frame.cpp
===================================================================
RCS file: /cvsroot/gtab/src/frame.cpp,v
retrieving revision 1.104
retrieving revision 1.105
diff -C2 -d -r1.104 -r1.105
*** frame.cpp	15 Apr 2006 22:06:04 -0000	1.104
--- frame.cpp	3 Aug 2006 15:34:56 -0000	1.105
***************
*** 104,108 ****
  
  //	EVT_GTPS_CHANGE(ID_PAGE_SELECTOR, Frame::onFileOpen)
! 	
  	EVT_TOOL(XRCID("ID_WHOLE_NOTE"), Frame::onDurationTools)
  	EVT_TOOL(XRCID("ID_HALF_NOTE"), Frame::onDurationTools)
--- 104,108 ----
  
  //	EVT_GTPS_CHANGE(ID_PAGE_SELECTOR, Frame::onFileOpen)
! 
  	EVT_TOOL(XRCID("ID_WHOLE_NOTE"), Frame::onDurationTools)
  	EVT_TOOL(XRCID("ID_HALF_NOTE"), Frame::onDurationTools)
***************
*** 117,125 ****
  Frame::Frame()
      : wxFrame((wxFrame*) 0, 0, wxT("gtab"), wxDefaultPosition, wxDefaultSize,
!         wxDEFAULT_FRAME_STYLE|wxNO_FULL_REPAINT_ON_RESIZE|wxCLIP_CHILDREN), 
  	isPlaying_(false), isPaused_(false)
  {
  	wxConfigBase *config = wxConfigBase::Get();
!   
      xpos_ = config->Read(wxT("/xpos"), 50L);
      ypos_ = config->Read(wxT("/ypos"), 50L);
--- 117,125 ----
  Frame::Frame()
      : wxFrame((wxFrame*) 0, 0, wxT("gtab"), wxDefaultPosition, wxDefaultSize,
!         wxDEFAULT_FRAME_STYLE|wxNO_FULL_REPAINT_ON_RESIZE|wxCLIP_CHILDREN),
  	isPlaying_(false), isPaused_(false)
  {
  	wxConfigBase *config = wxConfigBase::Get();
! 
      xpos_ = config->Read(wxT("/xpos"), 50L);
      ypos_ = config->Read(wxT("/ypos"), 50L);
***************
*** 128,137 ****
      int maximized = config->Read(wxT("/maximized"), 0L),
      	device = config->Read(wxT("/mididevice"), -2);
!         
      SetSize(xpos_, ypos_, width_, height_);
      if (maximized) {
          Maximize(true);
      }
!     
      currentDirectory_ = config->Read(wxT("/currentdir"), wxT(""));
  
--- 128,137 ----
      int maximized = config->Read(wxT("/maximized"), 0L),
      	device = config->Read(wxT("/mididevice"), -2);
! 
      SetSize(xpos_, ypos_, width_, height_);
      if (maximized) {
          Maximize(true);
      }
! 
      currentDirectory_ = config->Read(wxT("/currentdir"), wxT(""));
  
***************
*** 147,151 ****
  	    }
  		choices[devices] = _("None");
! 		
  		wxSingleChoiceDialog dialog(this, _("Please select a MIDI device:"),
  			_("MIDI Settings"), devices+1, choices);
--- 147,151 ----
  	    }
  		choices[devices] = _("None");
! 
  		wxSingleChoiceDialog dialog(this, _("Please select a MIDI device:"),
  			_("MIDI Settings"), devices+1, choices);
***************
*** 166,186 ****
      wxImage::AddHandler(pngHandler);
      makeAccelerator();
!     
      SetMenuBar(wxXmlResource::Get()->LoadMenuBar(wxT("MainMenu")));
-     //SetToolBar(wxXmlResource::Get()->LoadToolBar(this, wxT("TopToolBar")));
      wxToolBar* topToolBar = wxXmlResource::Get()->LoadToolBar(this, wxT("TopToolBar"));
      SetIcon(wxIcon(wxT("icon.ico"), wxBITMAP_TYPE_ICO));
-     
-     //enableItem(wxID_SAVE, false);
-     //enableItem(wxID_SAVEAS, false);
-     /**enableItem(wxID_CUT, false);
-     enableItem(wxID_COPY, false);
-     enableItem(wxID_PASTE, false);		// FIXME: is useful data in clipboard?
-     enableItem(wxID_UNDO, false);
-     enableItem(wxID_REDO, false); **/
  
      wxBoxSizer* mainSizer = new wxBoxSizer(wxVERTICAL);
      Canvas* canvas = new Canvas(this, -1, wxPoint(10, 10), wxSize(50, 50));
!     
      gtPageSel* pageSelector = new gtPageSel(this, -1);
      controller_ = new Controller(canvas, this, pageSelector);
--- 166,177 ----
      wxImage::AddHandler(pngHandler);
      makeAccelerator();
! 
      SetMenuBar(wxXmlResource::Get()->LoadMenuBar(wxT("MainMenu")));
      wxToolBar* topToolBar = wxXmlResource::Get()->LoadToolBar(this, wxT("TopToolBar"));
      SetIcon(wxIcon(wxT("icon.ico"), wxBITMAP_TYPE_ICO));
  
      wxBoxSizer* mainSizer = new wxBoxSizer(wxVERTICAL);
      Canvas* canvas = new Canvas(this, -1, wxPoint(10, 10), wxSize(50, 50));
! 
      gtPageSel* pageSelector = new gtPageSel(this, -1);
      controller_ = new Controller(canvas, this, pageSelector);
***************
*** 214,218 ****
  	else
  		config->Write(wxT("/maximized"), static_cast<long>(0));
! 	
  	delete controller_;
  
--- 205,209 ----
  	else
  		config->Write(wxT("/maximized"), static_cast<long>(0));
! 
  	delete controller_;
  
***************
*** 275,279 ****
      	_("compressed gtabFiles (*.gtz)|*.gtz|gtab Files (*.gt)|*.gt|PowerTab Files (*.ptb)|*.ptb|Guitar Pro Files (*.gp*)|*.gp*|MIDI Files (*.mid)|*.mid"),
  		wxOPEN);
!     	
  	if (fileDialog.ShowModal() == wxID_OK) {
  		SetTitle(fileDialog.GetFilename() + _(" - gtab"));
--- 266,270 ----
      	_("compressed gtabFiles (*.gtz)|*.gtz|gtab Files (*.gt)|*.gt|PowerTab Files (*.ptb)|*.ptb|Guitar Pro Files (*.gp*)|*.gp*|MIDI Files (*.mid)|*.mid"),
  		wxOPEN);
! 
  	if (fileDialog.ShowModal() == wxID_OK) {
  		SetTitle(fileDialog.GetFilename() + _(" - gtab"));
***************
*** 281,288 ****
  			case GTABZ_FILES:
  				break;
! 				
  			case GTAB_FILES:
  				break;
! 				
  			case POWER_TAB_FILES: {
  				#ifndef __NOPTAB__
--- 272,279 ----
  			case GTABZ_FILES:
  				break;
! 
  			case GTAB_FILES:
  				break;
! 
  			case POWER_TAB_FILES: {
  				#ifndef __NOPTAB__
***************
*** 294,298 ****
  				break;
  			}
! 			
  			case GUITAR_PRO_FILES: {
  				#ifndef __NOPTAB__
--- 285,289 ----
  				break;
  			}
! 
  			case GUITAR_PRO_FILES: {
  				#ifndef __NOPTAB__
***************
*** 305,309 ****
  				break;
  			}
! 				
  			case MIDI_FILES:
  				wxMessageBox(_("Unable to open file; MIDI import not yet supported"), _("Error"), wxOK | wxICON_ERROR);
--- 296,300 ----
  				break;
  			}
! 
  			case MIDI_FILES:
  				wxMessageBox(_("Unable to open file; MIDI import not yet supported"), _("Error"), wxOK | wxICON_ERROR);
***************
*** 317,321 ****
  {
      enum FilterIndices { GTABZ_FILES, GTAB_FILES, POWER_TAB_FILES };
!     
  	wxFileDialog fileDialog(this, _("Choose a file"), currentDirectory_, wxT(""),
      	wxT("compressed Gtab Files (*.gtz)|*.gtz|gtab Files (*.gt)|*.gt"), wxSAVE);
--- 308,312 ----
  {
      enum FilterIndices { GTABZ_FILES, GTAB_FILES, POWER_TAB_FILES };
! 
  	wxFileDialog fileDialog(this, _("Choose a file"), currentDirectory_, wxT(""),
      	wxT("compressed Gtab Files (*.gtz)|*.gtz|gtab Files (*.gt)|*.gt"), wxSAVE);
***************
*** 328,332 ****
  				break;
              }
! 				
  			case GTAB_FILES: {
                  GtabFile gtf(fileDialog.GetPath());
--- 319,323 ----
  				break;
              }
! 
  			case GTAB_FILES: {
                  GtabFile gtf(fileDialog.GetPath());
***************
*** 360,364 ****
  		ColumnDataObject* cda = new ColumnDataObject();
  		cda->setColumns(columns);
! 		
  		if (!wxTheClipboard->SetData(cda))
  		    wxLogMessage(_("Couldn't set data to clipboard."));
--- 351,355 ----
  		ColumnDataObject* cda = new ColumnDataObject();
  		cda->setColumns(columns);
! 
  		if (!wxTheClipboard->SetData(cda))
  		    wxLogMessage(_("Couldn't set data to clipboard."));
***************
*** 402,406 ****
  {
  	SettingsDialog dialog(this);
! 	
  	if (dialog.ShowModal() == wxID_OK) {
  
--- 393,397 ----
  {
  	SettingsDialog dialog(this);
! 
  	if (dialog.ShowModal() == wxID_OK) {
  
***************
*** 423,433 ****
      	return;
      }
!     	
! #ifdef __WIN32__ 
      if (midiDevice_.getDevice() == MidiWinDevice::NO_MIDI_DEVICE)
          return;
!         
  	PlaybackThread* thread = new PlaybackThread(this, &midiDevice_);
! 	
  	if (thread->Create() != wxTHREAD_NO_ERROR) {
       	wxLogError(_("Couldn't create thread."));
--- 414,424 ----
      	return;
      }
! 
! #ifdef __WIN32__
      if (midiDevice_.getDevice() == MidiWinDevice::NO_MIDI_DEVICE)
          return;
! 
  	PlaybackThread* thread = new PlaybackThread(this, &midiDevice_);
! 
  	if (thread->Create() != wxTHREAD_NO_ERROR) {
       	wxLogError(_("Couldn't create thread."));
***************
*** 442,446 ****
    	enableItem(ID_LAST_PAGE, false);
    	enableItem(ID_NEXT_PAGE, false);
!   	
    	isPlaying_ = true;
    	thread->Run();
--- 433,437 ----
    	enableItem(ID_LAST_PAGE, false);
    	enableItem(ID_NEXT_PAGE, false);
! 
    	isPlaying_ = true;
    	thread->Run();
***************
*** 458,465 ****
          }
  #endif
!         
  	    wxCriticalSectionLocker lock(criticalSection_);
      	isPlaying_ = false;
!     	
   		enableItem(ID_TEMPO_MARKER, true);
   		enableItem(ID_ADD_REST, true);
--- 449,456 ----
          }
  #endif
! 
  	    wxCriticalSectionLocker lock(criticalSection_);
      	isPlaying_ = false;
! 
   		enableItem(ID_TEMPO_MARKER, true);
   		enableItem(ID_ADD_REST, true);
***************
*** 476,485 ****
      if (!isPlaying_)
          return;
!         
      if (isPaused_) {
          isPaused_ = false;
          return;
      }
!         
  #ifdef __WIN32__
      for (int i = 0; i < 16; i++) {
--- 467,476 ----
      if (!isPlaying_)
          return;
! 
      if (isPaused_) {
          isPaused_ = false;
          return;
      }
! 
  #ifdef __WIN32__
      for (int i = 0; i < 16; i++) {
***************
*** 488,492 ****
      }
  #endif
!     
      wxCriticalSectionLocker lock(criticalSection_);
      isPaused_ = true;
--- 479,483 ----
      }
  #endif
! 
      wxCriticalSectionLocker lock(criticalSection_);
      isPaused_ = true;
***************
*** 546,554 ****
  {
      wxToolBar* toolBar = GetToolBar();
!     
      if (!toolBar->GetToolState(ID_TEMPO_MARKER))
      	return;		// FIXXME: should remove the tempo marker!
  
!         
  	// FIXXXME: DO NOT INVOKE!!!
      TempoMarkerDialog dialog(this);
--- 537,545 ----
  {
      wxToolBar* toolBar = GetToolBar();
! 
      if (!toolBar->GetToolState(ID_TEMPO_MARKER))
      	return;		// FIXXME: should remove the tempo marker!
  
! 
  	// FIXXXME: DO NOT INVOKE!!!
      TempoMarkerDialog dialog(this);
***************
*** 572,585 ****
      // the translation of XRCIDs to durations sucks
      // any better idea?
!     
      if (event.GetId() == XRCID("ID_WHOLE_NOTE"))
          controller_->setDuration(WHOLE);
!         
      if (event.GetId() == XRCID("ID_HALF_NOTE"))
          controller_->setDuration(HALF);
!         
      if (event.GetId() == XRCID("ID_QUARTER_NOTE"))
          controller_->setDuration(QUARTER);
!         
      if (event.GetId() == XRCID("ID_EIGHTH_NOTE"))
          controller_->setDuration(EIGHTH);
--- 563,576 ----
      // the translation of XRCIDs to durations sucks
      // any better idea?
! 
      if (event.GetId() == XRCID("ID_WHOLE_NOTE"))
          controller_->setDuration(WHOLE);
! 
      if (event.GetId() == XRCID("ID_HALF_NOTE"))
          controller_->setDuration(HALF);
! 
      if (event.GetId() == XRCID("ID_QUARTER_NOTE"))
          controller_->setDuration(QUARTER);
! 
      if (event.GetId() == XRCID("ID_EIGHTH_NOTE"))
          controller_->setDuration(EIGHTH);
***************
*** 587,591 ****
      if (event.GetId() == XRCID("ID_SIXTEENTH_NOTE"))
          controller_->setDuration(SIXTEENTH);
!         
      if (event.GetId() == XRCID("ID_THIRTYSECOND_NOTE"))
          controller_->setDuration(THIRTYSECOND);
--- 578,582 ----
      if (event.GetId() == XRCID("ID_SIXTEENTH_NOTE"))
          controller_->setDuration(SIXTEENTH);
! 
      if (event.GetId() == XRCID("ID_THIRTYSECOND_NOTE"))
          controller_->setDuration(THIRTYSECOND);
***************
*** 605,609 ****
  	entries[7].Set(wxACCEL_CTRL, static_cast<int>('V'), wxID_PASTE);
  	entries[8].Set(wxACCEL_CTRL | wxACCEL_SHIFT, static_cast<int>('Z'), wxID_REDO);
! 	
  	wxAcceleratorTable table(9, entries);
  	SetAcceleratorTable(table);
--- 596,600 ----
  	entries[7].Set(wxACCEL_CTRL, static_cast<int>('V'), wxID_PASTE);
  	entries[8].Set(wxACCEL_CTRL | wxACCEL_SHIFT, static_cast<int>('Z'), wxID_REDO);
! 
  	wxAcceleratorTable table(9, entries);
  	SetAcceleratorTable(table);
***************
*** 613,624 ****
  void Frame::enableItem(int id, bool enable)
  {
!     wxToolBar* toolBar = GetToolBar();
      wxMenuBar* menuBar = GetMenuBar();
!     
      assert(menuBar);
  	if(menuBar->FindItem(id))
  		menuBar->Enable(id, enable);
- //	if(toolBar->FindItem(id))
- //		toolBar->EnableTool(id, enable);
  }
  
--- 604,614 ----
  void Frame::enableItem(int id, bool enable)
  {
!     // still need to update toolbar too
! 
      wxMenuBar* menuBar = GetMenuBar();
! 
      assert(menuBar);
  	if(menuBar->FindItem(id))
  		menuBar->Enable(id, enable);
  }
  

Index: playbackthrd.cpp
===================================================================
RCS file: /cvsroot/gtab/src/playbackthrd.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** playbackthrd.cpp	10 Apr 2006 17:01:24 -0000	1.15
--- playbackthrd.cpp	3 Aug 2006 15:34:56 -0000	1.16
***************
*** 65,69 ****
      MidiStack* ms = frame_->getMidiStack();
      ms->reset();
! 	
  	MidiEvent* event;
      int tempo = 120;
--- 65,69 ----
      MidiStack* ms = frame_->getMidiStack();
      ms->reset();
! 
  	MidiEvent* event;
      int tempo = 120;
***************
*** 74,82 ****
           	if (event->changeTempo())
                  timeMod = 60000.0F / event->getTempo() / QUARTER;
!                 
              const MidiMessageList& list = event->packMessage();
              for (MidiMessageList::const_iterator i = list.begin(); i != list.end(); ++i)
                  device_->sendPackedEvent((*i)->pack());
!     		Sleep( timeMod * event->duration() );
      	   	ms->next();
          }
--- 74,82 ----
           	if (event->changeTempo())
                  timeMod = 60000.0F / event->getTempo() / QUARTER;
! 
              const MidiMessageList& list = event->packMessage();
              for (MidiMessageList::const_iterator i = list.begin(); i != list.end(); ++i)
                  device_->sendPackedEvent((*i)->pack());
!     		Sleep(static_cast<long>(timeMod * event->duration()));
      	   	ms->next();
          }
***************
*** 88,97 ****
      if (frame_->isPlaying())		// tools need to get revitalized
      	frame_->onStop(commandEvent);
!     	
      return NULL;
  }
  
  //------------------------------------------------------------------------------
! // 
  //
  void PlaybackThread::OnExit()
--- 88,97 ----
      if (frame_->isPlaying())		// tools need to get revitalized
      	frame_->onStop(commandEvent);
! 
      return NULL;
  }
  
  //------------------------------------------------------------------------------
! //
  //
  void PlaybackThread::OnExit()

[Gtab-cvs] src/factory DefaultDrawerFactory.cpp,1.46,1.47

From: m0ta <m0...@us...> - 2006-08-03 15:34:59

Update of /cvsroot/gtab/src/factory
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv14599/factory

Modified Files:
	DefaultDrawerFactory.cpp 
Log Message:
* changes to reduce warnings

Index: DefaultDrawerFactory.cpp
===================================================================
RCS file: /cvsroot/gtab/src/factory/DefaultDrawerFactory.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** DefaultDrawerFactory.cpp	5 Apr 2006 15:01:18 -0000	1.46
--- DefaultDrawerFactory.cpp	3 Aug 2006 15:34:56 -0000	1.47
***************
*** 64,72 ****
  
  	if (rootXML() == NULL) {
!  		wxMessageBox(wxT("Error loading resource file layout.xml"), 
  						  wxT("ERROR!"), wxOK | wxICON_EXCLAMATION, NULL);
  		exit(1);
  	}
! }    
  
  DefaultDrawerFactory::~DefaultDrawerFactory(void)
--- 64,72 ----
  
  	if (rootXML() == NULL) {
!  		wxMessageBox(wxT("Error loading resource file layout.xml"),
  						  wxT("ERROR!"), wxOK | wxICON_EXCLAMATION, NULL);
  		exit(1);
  	}
! }
  
  DefaultDrawerFactory::~DefaultDrawerFactory(void)
***************
*** 98,107 ****
      TabColumnDrawer* pTabColumnDrawer = new TabColumnDrawer( rootXML() );
      TabFretDrawer* pTabFretDrawer = new TabFretDrawer( rootXML() );
!     
      *pTabColumnDrawer << pTabFretDrawer;
      *pTabMeasureDrawer << pTabColumnDrawer;
  
      *pTabStaffDrawer << pTabMeasureDrawer;
!     
      *pNoteMeasureDrawer << pNoteColumnDrawer;
      *pNoteStaffDrawer << pNoteMeasureDrawer;
--- 98,107 ----
      TabColumnDrawer* pTabColumnDrawer = new TabColumnDrawer( rootXML() );
      TabFretDrawer* pTabFretDrawer = new TabFretDrawer( rootXML() );
! 
      *pTabColumnDrawer << pTabFretDrawer;
      *pTabMeasureDrawer << pTabColumnDrawer;
  
      *pTabStaffDrawer << pTabMeasureDrawer;
! 
      *pNoteMeasureDrawer << pNoteColumnDrawer;
      *pNoteStaffDrawer << pNoteMeasureDrawer;
***************
*** 129,138 ****
  {
      DocumentData* pDocumentData = new DocumentData;
!     PageData* pPageData = new PageData(wxT(""), 6);
      *pDocumentData << pPageData;
      pDocumentData->current();
      SectionData* pSectionData = new SectionData;
      *pPageData << pSectionData;
!     
      StaffData* pStaffData = new StaffData(6);
  
--- 129,138 ----
  {
      DocumentData* pDocumentData = new DocumentData;
!     PageData* pPageData = new PageData(wxT("Default"), 6);
      *pDocumentData << pPageData;
      pDocumentData->current();
      SectionData* pSectionData = new SectionData;
      *pPageData << pSectionData;
! 
      StaffData* pStaffData = new StaffData(6);
  
***************
*** 148,157 ****
  }
  
! PageData* DefaultDrawerFactory::createPage(DocumentData* dd, const wxString& descr, 
      int strings, int key, int clef, TimeSignature ts)
  {
      PageData* pd = new PageData(descr, strings);
      *dd << pd;
!     
      SectionData* sectd = new SectionData;
      *pd << sectd;
--- 148,157 ----
  }
  
! PageData* DefaultDrawerFactory::createPage(DocumentData* dd, const wxString& descr,
      int strings, int key, int clef, TimeSignature ts)
  {
      PageData* pd = new PageData(descr, strings);
      *dd << pd;
! 
      SectionData* sectd = new SectionData;
      *pd << sectd;
***************
*** 163,169 ****
      measd->setKeySignature(key);
      *staffd << measd;
!     
      *measd << new ColumnData(strings, EIGHTH);
!     
      return pd;
  }
--- 163,169 ----
      measd->setKeySignature(key);
      *staffd << measd;
! 
      *measd << new ColumnData(strings, EIGHTH);
! 
      return pd;
  }

[Gtab-cvs] src gtfile.cpp,1.1,1.2 gtfile.h,1.1,1.2

From: m0ta <m0...@us...> - 2006-04-16 12:24:48

Update of /cvsroot/gtab/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14897

Modified Files:
	gtfile.cpp gtfile.h 
Log Message:
* testing some xml-saving
* MusicXML doesn't seem appropriate (anyone seen GuitarPro's output?)

Index: gtfile.cpp
===================================================================
RCS file: /cvsroot/gtab/src/gtfile.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** gtfile.cpp	15 Apr 2006 22:06:04 -0000	1.1
--- gtfile.cpp	16 Apr 2006 12:24:36 -0000	1.2
***************
*** 31,34 ****
--- 31,35 ----
  #include "gtfile.h"
  #include <wx/file.h>
+ #include <wx/datetime.h>
   
  GtabFile::GtabFile(const wxString& filename) : filename_(filename)
***************
*** 44,48 ****
  {
      wxFile file(filename_.c_str(), wxFile::write);
!     file.Write(wxT("test"));
      file.Close();
  	return true;
--- 45,69 ----
  {
      wxFile file(filename_.c_str(), wxFile::write);
!     file.Write(wxT("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n"));
!     file.Write(wxT("<!DOCTYPE score-partwise PUBLIC \"-//Recordare//DTD MusicXML 1.1 Partwise//EN\""));
!     file.Write(wxT("\"http://www.musicxml.org/dtds/partwise.dtd\">"));
!     file.Write(wxT("<score-partwise version=\"1.1\">\n"));
!     
!     file.Write(wxT("<work>\n"));
!         file.Write(wxT("<work-number></work-number>\n"));
!         file.Write(wxT("<work-title></work-title>\n"));
!     file.Write(wxT("</work>\n"));
!     
!     file.Write(wxT("<identification>\n"));
!         file.Write(wxT("<encoding>\n"));
!             file.Write(wxT("<software>gtab</software>\n"));
!             wxDateTime now = wxDateTime::Now();
!             file.Write(wxT("<encoding-date>"));
!             // now.FormatISODate() crashes
!             file.Write(wxT("</encoding-date>\n"));
!         file.Write(wxT("</encoding>\n"));
!     file.Write(wxT("</identification>\n"));
!     
!     file.Write(wxT("</score-partwise>"));
      file.Close();
  	return true;

Index: gtfile.h
===================================================================
RCS file: /cvsroot/gtab/src/gtfile.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** gtfile.h	15 Apr 2006 22:06:04 -0000	1.1
--- gtfile.h	16 Apr 2006 12:24:36 -0000	1.2
***************
*** 52,55 ****
--- 52,57 ----
  
  private:
+     void writeWorkPart();
+     
  	wxString filename_;
  };

[Gtab-cvs] src gtfile.cpp,NONE,1.1 gtfile.h,NONE,1.1 gtzfile.cpp,NONE,1.1 gtzfile.h,NONE,1.1 frame.cpp,1.103,1.104

From: m0ta <m0...@us...> - 2006-04-15 22:06:09

Update of /cvsroot/gtab/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15346

Modified Files:
	frame.cpp 
Added Files:
	gtfile.cpp gtfile.h gtzfile.cpp gtzfile.h 
Log Message:
* some file stuff

--- NEW FILE: gtzfile.h ---
/*
    gtab: A tablature authoring tool for Windows.
    Copyright (C) 2004, 2005 Matthias Vogelgesang

    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

	Samvel Avanesov <se...@ya...>
	Jean-Sebastien Valette <jea...@fr...>
	Jelmer Vernooij <je...@sa...>
	Matthias Vogelgesang <you...@gm...>
*/

/**
 * @file gtzfile.h
 * @author Matthias Vogelgesang
 * @date 04-15-06
 */
 
#ifndef GTAB_GTZFILE_H
#define GTAB_GTZFILE_H

#include "file.h"

class GtabZlibFile : public AbstractFile {
public:
	GtabZlibFile(const wxString& filename);
	~GtabZlibFile() {}

	/**
	 * @brief Load data from gtabFile into the given model.
	 * @param model The place to store the data.
	 */
	bool load(Controller *);

	/**
	 * @brief Save data in gtab format.
	 * @param model Which data to save.
	 */
	bool save(Controller *);

private:
	wxString filename_;
};

#endif

--- NEW FILE: gtzfile.cpp ---
/*
    gtab: A tablature authoring tool for Windows.
    Copyright (C) 2004, 2005 Matthias Vogelgesang

    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

	Samvel Avanesov <se...@ya...>
	Jean-Sebastien Valette <jea...@fr...>
	Jelmer Vernooij <je...@sa...>
	Matthias Vogelgesang <you...@gm...>
*/

/**
 * @file gtzfile.cpp
 * @author Matthias Vogelgesang
 * @date 04-15-06
 */
 
#include "gtzfile.h"
#include "gtfile.h"
#include <wx/wx.h>
#include <wx/wfstream.h>
#include <wx/zstream.h>
 
GtabZlibFile::GtabZlibFile(const wxString& filename) : filename_(filename)
{
}

bool GtabZlibFile::load(Controller *ctrl)
{
	return true;
}

bool GtabZlibFile::save(Controller *ctrl)
{
    // add error handling!
    GtabFile gf(filename_);
    if (!gf.save(ctrl))
        return false;
        
    wxString tmpFileName = filename_ + wxT(".tmp");
    wxRenameFile(filename_, tmpFileName);
    wxFileInputStream inStream(tmpFileName);
    wxFileOutputStream outStream(filename_);
    wxZlibOutputStream zStream(outStream, 9);
    
    const int bufferSize = 1024;
    char* buffer = new char[bufferSize];
    
    while (!inStream.Eof()) {
        inStream.Read(buffer, bufferSize);
        int size = inStream.LastRead();
        if (size > 0)
            zStream.Write(buffer, size);
        else
            break;
    }
    
    delete[] buffer;
    zStream.Close();
    outStream.Close();
    wxRemoveFile(tmpFileName);      // doesnt yet remove, maybe stream still
                                    // associated with file
	return true;
}

Index: frame.cpp
===================================================================
RCS file: /cvsroot/gtab/src/frame.cpp,v
retrieving revision 1.103
retrieving revision 1.104
diff -C2 -d -r1.103 -r1.104
*** frame.cpp	5 Apr 2006 15:01:15 -0000	1.103
--- frame.cpp	15 Apr 2006 22:06:04 -0000	1.104
***************
*** 69,73 ****
  #include "ptbfile.h"
  #include "gpfile.h"
! #include "musicxmlfile.h"
  
  #ifdef _DEBUG
--- 69,74 ----
  #include "ptbfile.h"
  #include "gpfile.h"
! #include "gtfile.h"
! #include "gtzfile.h"
  
  #ifdef _DEBUG
***************
*** 269,276 ****
  void Frame::onFileOpen(wxCommandEvent& WXUNUSED(event))
  {
! 	enum FilterIndices { GTAB_FILES, POWER_TAB_FILES, GUITAR_PRO_FILES, MIDI_FILES };
  
      wxFileDialog fileDialog(this, _("Choose a file"), currentDirectory_, wxT(""),
!     	_("gtab Files (*.gtb)|*.gtb|PowerTab Files (*.ptb)|*.ptb|Guitar Pro Files (*.gp*)|*.gp*|MIDI Files (*.mid)|*.mid"),
  		wxOPEN);
      	
--- 270,277 ----
  void Frame::onFileOpen(wxCommandEvent& WXUNUSED(event))
  {
! 	enum FilterIndices { GTABZ_FILES, GTAB_FILES, POWER_TAB_FILES, GUITAR_PRO_FILES, MIDI_FILES };
  
      wxFileDialog fileDialog(this, _("Choose a file"), currentDirectory_, wxT(""),
!     	_("compressed gtabFiles (*.gtz)|*.gtz|gtab Files (*.gt)|*.gt|PowerTab Files (*.ptb)|*.ptb|Guitar Pro Files (*.gp*)|*.gp*|MIDI Files (*.mid)|*.mid"),
  		wxOPEN);
      	
***************
*** 278,281 ****
--- 279,285 ----
  		SetTitle(fileDialog.GetFilename() + _(" - gtab"));
  		switch (fileDialog.GetFilterIndex()) {
+ 			case GTABZ_FILES:
+ 				break;
+ 				
  			case GTAB_FILES:
  				break;
***************
*** 312,321 ****
  void Frame::onFileSaveAs(wxCommandEvent& WXUNUSED(event))
  {
  	wxFileDialog fileDialog(this, _("Choose a file"), currentDirectory_, wxT(""),
!     	_("MusicXML Files (*.xml)|*.xml"), wxSAVE);
  
  	if (fileDialog.ShowModal() == wxID_OK) {
! 		//MusicXMLFile xf(fileDialog.GetPath().c_str());
! 		//controller_->saveFile(xf);
  	}
  }
--- 316,338 ----
  void Frame::onFileSaveAs(wxCommandEvent& WXUNUSED(event))
  {
+     enum FilterIndices { GTABZ_FILES, GTAB_FILES, POWER_TAB_FILES };
+     
  	wxFileDialog fileDialog(this, _("Choose a file"), currentDirectory_, wxT(""),
!     	wxT("compressed Gtab Files (*.gtz)|*.gtz|gtab Files (*.gt)|*.gt"), wxSAVE);
  
  	if (fileDialog.ShowModal() == wxID_OK) {
!         switch (fileDialog.GetFilterIndex()) {
! 			case GTABZ_FILES: {
!                 GtabZlibFile gtf(fileDialog.GetPath());
!                 gtf.save(controller_);
! 				break;
!             }
! 				
! 			case GTAB_FILES: {
!                 GtabFile gtf(fileDialog.GetPath());
!                 gtf.save(controller_);
! 				break;
! 			}
!         }
  	}
  }

--- NEW FILE: gtfile.cpp ---
/*
    gtab: A tablature authoring tool for Windows.
    Copyright (C) 2004, 2005 Matthias Vogelgesang

    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

	Samvel Avanesov <se...@ya...>
	Jean-Sebastien Valette <jea...@fr...>
	Jelmer Vernooij <je...@sa...>
	Matthias Vogelgesang <you...@gm...>
*/

/**
 * @file gtfile.cpp
 * @author Matthias Vogelgesang
 * @date 04-15-06
 */
 
#include "gtfile.h"
#include <wx/file.h>
 
GtabFile::GtabFile(const wxString& filename) : filename_(filename)
{
}

bool GtabFile::load(Controller *ctrl)
{
	return true;
}

bool GtabFile::save(Controller *ctrl)
{
    wxFile file(filename_.c_str(), wxFile::write);
    file.Write(wxT("test"));
    file.Close();
	return true;
}

--- NEW FILE: gtfile.h ---
/*
    gtab: A tablature authoring tool for Windows.
    Copyright (C) 2004, 2005 Matthias Vogelgesang

    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

	Samvel Avanesov <se...@ya...>
	Jean-Sebastien Valette <jea...@fr...>
	Jelmer Vernooij <je...@sa...>
	Matthias Vogelgesang <you...@gm...>
*/

/**
 * @file gtfile.h
 * @author Matthias Vogelgesang
 * @date 04-15-06
 */
 
#ifndef GTAB_GTFILE_H
#define GTAB_GTFILE_H

#include "file.h"

class GtabFile : public AbstractFile {
public:
	GtabFile(const wxString& filename);
	~GtabFile() {}

	/**
	 * @brief Load data from gtabFile into the given model.
	 * @param model The place to store the data.
	 */
	bool load(Controller *);

	/**
	 * @brief Save data in gtab format.
	 * @param model Which data to save.
	 */
	bool save(Controller *);

private:
	wxString filename_;
};

#endif

[Gtab-cvs] src musicxmlfile.cpp,1.8,NONE musicxmlfile.h,1.6,NONE

From: m0ta <m0...@us...> - 2006-04-15 20:21:37

Update of /cvsroot/gtab/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8773

Removed Files:
	musicxmlfile.cpp musicxmlfile.h 
Log Message:


--- musicxmlfile.cpp DELETED ---

--- musicxmlfile.h DELETED ---

[Gtab-cvs] src playbackthrd.cpp,1.14,1.15

From: m0ta <m0...@us...> - 2006-04-10 17:01:35

Update of /cvsroot/gtab/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16559

Modified Files:
	playbackthrd.cpp 
Log Message:
* preparations for tempo sign

Index: playbackthrd.cpp
===================================================================
RCS file: /cvsroot/gtab/src/playbackthrd.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** playbackthrd.cpp	28 Feb 2006 07:15:24 -0000	1.14
--- playbackthrd.cpp	10 Apr 2006 17:01:24 -0000	1.15
***************
*** 67,76 ****
  	
  	MidiEvent* event;
!     int tempo = 200;
      float timeMod = 60000.0F / tempo / QUARTER;
  	while (ms->current() && frame_->isPlaying()) {
- 
          if (!frame_->isPaused()) {
           	event = ms->current();
              const MidiMessageList& list = event->packMessage();
              for (MidiMessageList::const_iterator i = list.begin(); i != list.end(); ++i)
--- 67,78 ----
  	
  	MidiEvent* event;
!     int tempo = 120;
      float timeMod = 60000.0F / tempo / QUARTER;
  	while (ms->current() && frame_->isPlaying()) {
          if (!frame_->isPaused()) {
           	event = ms->current();
+          	if (event->changeTempo())
+                 timeMod = 60000.0F / event->getTempo() / QUARTER;
+                 
              const MidiMessageList& list = event->packMessage();
              for (MidiMessageList::const_iterator i = list.begin(); i != list.end(); ++i)

[Gtab-cvs] src/midi MidiEvent.cpp,1.2,1.3 MidiEvent.h,1.1,1.2

From: m0ta <m0...@us...> - 2006-04-10 17:01:32

Update of /cvsroot/gtab/src/midi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16559/midi

Modified Files:
	MidiEvent.cpp MidiEvent.h 
Log Message:
* preparations for tempo sign

Index: MidiEvent.cpp
===================================================================
RCS file: /cvsroot/gtab/src/midi/MidiEvent.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MidiEvent.cpp	28 Feb 2006 07:15:24 -0000	1.2
--- MidiEvent.cpp	10 Apr 2006 17:01:23 -0000	1.3
***************
*** 21,31 ****
  
  
! MidiEvent::MidiEvent(int duration)
  {
-     duration_ = duration;
  }
  
- 
- 
  MidiEvent::~MidiEvent()
  {
--- 21,28 ----
  
  
! MidiEvent::MidiEvent(int duration) : duration_(duration), changeTempo_(false)
  {
  }
  
  MidiEvent::~MidiEvent()
  {
***************
*** 68,72 ****
      duration_ = duration;
  }
! 
  
  const MidiMessageList& MidiEvent::packMessage()
--- 65,74 ----
      duration_ = duration;
  }
!     
! void MidiEvent::setTempo(int tempo)
! {
!     tempo_ = tempo;
!     changeTempo_ = true;
! }
  
  const MidiMessageList& MidiEvent::packMessage()

Index: MidiEvent.h
===================================================================
RCS file: /cvsroot/gtab/src/midi/MidiEvent.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MidiEvent.h	26 Feb 2006 12:17:31 -0000	1.1
--- MidiEvent.h	10 Apr 2006 17:01:23 -0000	1.2
***************
*** 20,29 ****
  
      // midi message creation
!         void patchChange(int patch);
! 	    void noteOn(int pitch, int velocity, int channel);
! 	    void noteOff(int pitch, int channel);
      // duration stuff
  	void setDuration(int duration);
!     int duration() const;
  
      /**
--- 20,34 ----
  
      // midi message creation
!     void patchChange(int patch);
! 	void noteOn(int pitch, int velocity, int channel);
! 	void noteOff(int pitch, int channel);
! 	
      // duration stuff
  	void setDuration(int duration);
!     int  duration() const;
!     
!     void setTempo(int tempo);
!     int  getTempo() { return tempo_; }
!     bool changeTempo() { return changeTempo_; }
  
      /**
***************
*** 41,44 ****
--- 46,52 ----
      MidiMessageList messages_;
      int duration_;
+     
+     bool changeTempo_;
+     int  tempo_;
  };

[Gtab-cvs] src addpagedlg.cpp,1.19,1.20 controller.cpp,1.78,1.79 controller.h,1.42,1.43 frame.cpp,1.102,1.103 timesig.cpp,1.12,1.13 timesig.h,1.8,1.9 gui.xrc,1.14,NONE

From: m0ta <m0...@us...> - 2006-04-05 15:02:00

Update of /cvsroot/gtab/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25877

Modified Files:
	addpagedlg.cpp controller.cpp controller.h frame.cpp 
	timesig.cpp timesig.h 
Removed Files:
	gui.xrc 
Log Message:
* midi stack takes all pages into account, though 2nd page plays one quarter after the other
* time signature is used, now everything works even the common time symbols
* clef works

Index: addpagedlg.cpp
===================================================================
RCS file: /cvsroot/gtab/src/addpagedlg.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** addpagedlg.cpp	28 Feb 2006 07:15:23 -0000	1.19
--- addpagedlg.cpp	5 Apr 2006 15:01:15 -0000	1.20
***************
*** 284,290 ****
      long beatvalue = -1;
      str.ToLong(&beatvalue);
!     TimeSignature t(spinControlBeats_->GetValue(), beatvalue,
!     	checkBoxCommonTime_->GetValue(), checkBoxCutTime_->GetValue());
! 	return t;
  }
  
--- 284,293 ----
      long beatvalue = -1;
      str.ToLong(&beatvalue);
!     TimeSignature ts;
!     ts.setBeats(spinControlBeats_->GetValue());
!     ts.setBeatValue(beatvalue);
!     ts.setUseCommonTime(checkBoxCommonTime_->GetValue());
!     ts.setUseCutTime(checkBoxCutTime_->GetValue());
! 	return ts;
  }
  

--- gui.xrc DELETED ---

Index: frame.cpp
===================================================================
RCS file: /cvsroot/gtab/src/frame.cpp,v
retrieving revision 1.102
retrieving revision 1.103
diff -C2 -d -r1.102 -r1.103
*** frame.cpp	28 Feb 2006 07:15:24 -0000	1.102
--- frame.cpp	5 Apr 2006 15:01:15 -0000	1.103
***************
*** 481,485 ****
      AddPageDialog dialog(this);
      if (dialog.ShowModal() == wxID_OK) {
! 		controller_->addPage(dialog.getCaption(), dialog.getStrings(), dialog.getKeySig());
  	}
  }
--- 481,486 ----
      AddPageDialog dialog(this);
      if (dialog.ShowModal() == wxID_OK) {
!         TimeSignature ts = dialog.getTimeSig();
! 		controller_->addPage(dialog.getCaption(), dialog.getStrings(), dialog.getKeySig(), dialog.getClef(), dialog.getTimeSig());
  	}
  }

Index: controller.h
===================================================================
RCS file: /cvsroot/gtab/src/controller.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** controller.h	26 Feb 2006 13:46:08 -0000	1.42
--- controller.h	5 Apr 2006 15:01:15 -0000	1.43
***************
*** 64,68 ****
      // creation
      DocumentData* createEmptyDocument();
! 	void addPage(const wxString& descr, int strings, int key);	
  	void addSection();					
  	void attachStaff(int where);
--- 64,68 ----
      // creation
      DocumentData* createEmptyDocument();
! 	void addPage(const wxString& descr, int strings, int key, int clef, TimeSignature ts);	
  	void addSection();					
  	void attachStaff(int where);

Index: controller.cpp
===================================================================
RCS file: /cvsroot/gtab/src/controller.cpp,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -d -r1.78 -r1.79
*** controller.cpp	28 Feb 2006 07:15:23 -0000	1.78
--- controller.cpp	5 Apr 2006 15:01:15 -0000	1.79
***************
*** 141,148 ****
  
  //------------------------------------------------------------------------------
! void Controller::addPage(const wxString& descr, int strings, int key)
  {
      wxASSERT(getDocument());
!     FACTORY->createPage(getDocument(), descr, strings, key);
      Reflect();
  }
--- 141,148 ----
  
  //------------------------------------------------------------------------------
! void Controller::addPage(const wxString& descr, int strings, int key, int clef, TimeSignature ts)
  {
      wxASSERT(getDocument());
!     FACTORY->createPage(getDocument(), descr, strings, key, clef, ts);
      Reflect();
  }

Index: timesig.cpp
===================================================================
RCS file: /cvsroot/gtab/src/timesig.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** timesig.cpp	28 Feb 2006 07:15:24 -0000	1.12
--- timesig.cpp	5 Apr 2006 15:01:15 -0000	1.13
***************
*** 40,56 ****
  #endif
  
! TimeSignature::TimeSignature(int beats, int beatvalue, bool useCommonTime, bool useCutTime)
! 	: beats_(beats), beatvalue_(beatvalue)
  {
-  	checkCommonTime(useCommonTime);
- 	checkCutTime(useCutTime);
  }
  
! TimeSignature::TimeSignature(const TimeSignature& ref) :
! 	beats_(ref.beats_), beatvalue_(ref.beatvalue_),
! 	useCommonTime_(ref.useCommonTime_), useCutTime_(ref.useCutTime_)
  {
  }
  
  void TimeSignature::setUseCommonTime(bool use)
  {
--- 40,64 ----
  #endif
  
! TimeSignature::TimeSignature() : beats_(4), beatvalue_(4), useCommonTime_(false),
!     useCutTime_(false)
  {
  }
  
! TimeSignature::TimeSignature(const TimeSignature& rh) :
! 	beats_(rh.beats_), beatvalue_(rh.beatvalue_),
! 	useCommonTime_(rh.useCommonTime_), useCutTime_(rh.useCutTime_)
  {
  }
  
+ const TimeSignature& TimeSignature::operator=(const TimeSignature& rh) {
+     if (this != &rh) {
+         beats_ = rh.beats_;
+         beatvalue_ = rh.beatvalue_;
+         useCommonTime_ = rh.useCommonTime_;
+         useCutTime_ = rh.useCutTime_;
+     }
+     return *this;
+ }
+ 
  void TimeSignature::setUseCommonTime(bool use)
  {
***************
*** 65,79 ****
  void TimeSignature::checkCommonTime(bool useCommonTime)
  {
!     if ((beats_ == 4) && (beatvalue_ == 4) && (useCommonTime))
!     	useCommonTime_ = true;
! 	else
! 		useCommonTime_ = false;
  }
  
  void TimeSignature::checkCutTime(bool useCutTime)
  {
!     if ((beats_ == 2) && (beatvalue_ == 2) && (useCutTime))
!     	useCutTime_ = true;
! 	else
! 		useCutTime_ = false;
  }
--- 73,81 ----
  void TimeSignature::checkCommonTime(bool useCommonTime)
  {
!     useCommonTime_ = (beats_ == 4) && (beatvalue_ == 4) && (useCommonTime);
  }
  
  void TimeSignature::checkCutTime(bool useCutTime)
  {
!    	useCutTime_ = (beats_ == 2) && (beatvalue_ == 2) && (useCutTime);
  }

Index: timesig.h
===================================================================
RCS file: /cvsroot/gtab/src/timesig.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** timesig.h	20 Aug 2005 15:37:46 -0000	1.8
--- timesig.h	5 Apr 2006 15:01:15 -0000	1.9
***************
*** 35,47 ****
  class TimeSignature {
  public:
!     /**
!      * @param beats Number of beats per measure.
!      * @param beatvalue Pulse per beat.
!      * @param useCommonTime Set if the common time symbol should be drawn for 4/4.
!      * @param useCutTime Set if cut time symbol should be drawn.
!      */
!     TimeSignature(int beats, int beatvalue, bool useCommonTime, bool useCutTime);
      TimeSignature(const TimeSignature& ref);
      
      void setBeats(int beats) { beats_ = beats; }
      void setBeatValue(int beatvalue) { beatvalue_ = beatvalue; }
--- 35,42 ----
  class TimeSignature {
  public:
!     TimeSignature();
      TimeSignature(const TimeSignature& ref);
      
+     const TimeSignature& TimeSignature::operator=(const TimeSignature& rh);
      void setBeats(int beats) { beats_ = beats; }
      void setBeatValue(int beatvalue) { beatvalue_ = beatvalue; }

[Gtab-cvs] src/factory DefaultDrawerFactory.cpp,1.45,1.46 DefaultDrawerFactory.h,1.15,1.16

From: m0ta <m0...@us...> - 2006-04-05 15:01:33

Update of /cvsroot/gtab/src/factory
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25877/factory

Modified Files:
	DefaultDrawerFactory.cpp DefaultDrawerFactory.h 
Log Message:
* midi stack takes all pages into account, though 2nd page plays one quarter after the other
* time signature is used, now everything works even the common time symbols
* clef works

Index: DefaultDrawerFactory.cpp
===================================================================
RCS file: /cvsroot/gtab/src/factory/DefaultDrawerFactory.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** DefaultDrawerFactory.cpp	28 Feb 2006 07:15:24 -0000	1.45
--- DefaultDrawerFactory.cpp	5 Apr 2006 15:01:18 -0000	1.46
***************
*** 35,38 ****
--- 35,39 ----
  // -- memory leak detection
  #include "DefaultDrawerFactory.h"
+ #include "timesig.h"
  #include "../drawobjects/CursorDrawer.h"
  #include "../dataobjects/documentdata.h"
***************
*** 147,151 ****
  }
  
! PageData* DefaultDrawerFactory::createPage(DocumentData* dd, const wxString& descr, int strings, int key)
  {
      PageData* pd = new PageData(descr, strings);
--- 148,153 ----
  }
  
! PageData* DefaultDrawerFactory::createPage(DocumentData* dd, const wxString& descr, 
!     int strings, int key, int clef, TimeSignature ts)
  {
      PageData* pd = new PageData(descr, strings);
***************
*** 154,161 ****
      SectionData* sectd = new SectionData;
      *pd << sectd;
!     StaffData* staffd = new StaffData(strings);
      *sectd << staffd;
      MeasureData* measd = new MeasureData;
      measd->setShowKeySignature(true);
      measd->setKeySignature(key);
      *staffd << measd;
--- 156,164 ----
      SectionData* sectd = new SectionData;
      *pd << sectd;
!     StaffData* staffd = new StaffData(strings, clef);
      *sectd << staffd;
      MeasureData* measd = new MeasureData;
      measd->setShowKeySignature(true);
+     measd->setTimeSignature(ts);
      measd->setKeySignature(key);
      *staffd << measd;

Index: DefaultDrawerFactory.h
===================================================================
RCS file: /cvsroot/gtab/src/factory/DefaultDrawerFactory.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** DefaultDrawerFactory.h	7 Jan 2006 17:52:21 -0000	1.15
--- DefaultDrawerFactory.h	5 Apr 2006 15:01:18 -0000	1.16
***************
*** 41,44 ****
--- 41,45 ----
  class PageData;
  class DrawObject;
+ class TimeSignature;
  
  class DefaultDrawerFactory :
***************
*** 64,68 ****
      
      // add description, maybe initial values
!     virtual PageData* createPage(DocumentData*, const wxString& descr, int strings, int key);
      // 
  /*    virtual SectionData* createSection(PageData*); 
--- 65,70 ----
      
      // add description, maybe initial values
!     virtual PageData* createPage(DocumentData*, const wxString& descr, 
!                 int strings, int key, int clef, TimeSignature ts);
      // 
  /*    virtual SectionData* createSection(PageData*);

[Gtab-cvs] src/drawobjects NoteMeasureDrawer.cpp,1.13,1.14 NoteStaffDrawer.cpp,1.22,1.23

From: m0ta <m0...@us...> - 2006-04-05 15:01:32

Update of /cvsroot/gtab/src/drawobjects
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25877/drawobjects

Modified Files:
	NoteMeasureDrawer.cpp NoteStaffDrawer.cpp 
Log Message:
* midi stack takes all pages into account, though 2nd page plays one quarter after the other
* time signature is used, now everything works even the common time symbols
* clef works

Index: NoteMeasureDrawer.cpp
===================================================================
RCS file: /cvsroot/gtab/src/drawobjects/NoteMeasureDrawer.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** NoteMeasureDrawer.cpp	28 Feb 2006 07:15:24 -0000	1.13
--- NoteMeasureDrawer.cpp	5 Apr 2006 15:01:17 -0000	1.14
***************
*** 64,74 ****
      if (data->showTimeSignature()) {
          wxString str;
!         int beats, beatvalue;
!         data->getTimeSignature(beats, beatvalue);
!         str << beatvalue;
          wxCoord charHeight, charWidth;
          dc_->GetTextExtent(str, &charWidth, &charHeight);
          dc_->DrawText(str, keypadding_, -16);
!         str = wxT(""); str << beats;
          dc_->DrawText(str, keypadding_, -32);
      }
--- 64,84 ----
      if (data->showTimeSignature()) {
          wxString str;
!         
!         TimeSignature ts = data->getTimeSignature();
!         if (ts.useCommonTime()) {
!             str << wxChar(0x63);
!             dc_->DrawText(str, keypadding_, -24);
!             return;
!         }
!         if (ts.useCutTime()) {
!             str << wxChar(0x43);
!             dc_->DrawText(str, keypadding_, -24);
!             return;
!         }
!         str << ts.getBeatValue();
          wxCoord charHeight, charWidth;
          dc_->GetTextExtent(str, &charWidth, &charHeight);
          dc_->DrawText(str, keypadding_, -16);
!         str = wxT(""); str << ts.getBeats();
          dc_->DrawText(str, keypadding_, -32);
      }

Index: NoteStaffDrawer.cpp
===================================================================
RCS file: /cvsroot/gtab/src/drawobjects/NoteStaffDrawer.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** NoteStaffDrawer.cpp	28 Feb 2006 07:15:24 -0000	1.22
--- NoteStaffDrawer.cpp	5 Apr 2006 15:01:17 -0000	1.23
***************
*** 65,69 ****
              wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("MusicalSymbols")));
  
! 	if (data->getClefType() == F_CLEF)	
  		dc_->DrawText(wxT("?"), 0, 0);
  	else
--- 65,69 ----
              wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("MusicalSymbols")));
  
! 	if (data->getClefType() == F_CLEF)
  		dc_->DrawText(wxT("?"), 0, 0);
  	else

[Gtab-cvs] src/midi MidiMessage.cpp,1.6,1.7 MidiParser.cpp,1.8,1.9

From: m0ta <m0...@us...> - 2006-04-05 15:01:32

Update of /cvsroot/gtab/src/midi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25877/midi

Modified Files:
	MidiMessage.cpp MidiParser.cpp 
Log Message:
* midi stack takes all pages into account, though 2nd page plays one quarter after the other
* time signature is used, now everything works even the common time symbols
* clef works

Index: MidiParser.cpp
===================================================================
RCS file: /cvsroot/gtab/src/midi/MidiParser.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** MidiParser.cpp	28 Feb 2006 07:32:31 -0000	1.8
--- MidiParser.cpp	5 Apr 2006 15:01:18 -0000	1.9
***************
*** 35,39 ****
  MidiStack* MidiParser::parse(DocumentData* pData)
  {
!     return parsePage( pData->getConcrete(0) );
  }
  
--- 35,45 ----
  MidiStack* MidiParser::parse(DocumentData* pData)
  {
!     MidiStack* result = new MidiStack;
!     for (size_t i = 0; i < pData->size(); i++) {
!         MidiStack* stack = parsePage(pData->getConcrete(i));
!         result->pushStack(stack);
!         delete stack;
!     }
!     return result;
  }
  

Index: MidiMessage.cpp
===================================================================
RCS file: /cvsroot/gtab/src/midi/MidiMessage.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MidiMessage.cpp	28 Feb 2006 07:15:24 -0000	1.6
--- MidiMessage.cpp	5 Apr 2006 15:01:18 -0000	1.7
***************
*** 28,35 ****
          u_char	singleData[4];
  	} midiMessage;    
!     if(status_ & MSG_NOTE_OFF )
      {
          int i = 0;
      }
  	midiMessage.singleData[0] = status_;
  	midiMessage.singleData[1] = data1_;
--- 28,36 ----
          u_char	singleData[4];
  	} midiMessage;    
! /*    if(status_ & MSG_NOTE_OFF )
      {
          int i = 0;
      }
+     */
  	midiMessage.singleData[0] = status_;
  	midiMessage.singleData[1] = data1_;

[Gtab-cvs] src/dataobjects MeasureData.cpp,1.18,1.19 MeasureData.h,1.13,1.14

From: m0ta <m0...@us...> - 2006-04-05 15:01:31

Update of /cvsroot/gtab/src/dataobjects
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25877/dataobjects

Modified Files:
	MeasureData.cpp MeasureData.h 
Log Message:
* midi stack takes all pages into account, though 2nd page plays one quarter after the other
* time signature is used, now everything works even the common time symbols
* clef works

Index: MeasureData.cpp
===================================================================
RCS file: /cvsroot/gtab/src/dataobjects/MeasureData.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** MeasureData.cpp	28 Feb 2006 07:15:24 -0000	1.18
--- MeasureData.cpp	5 Apr 2006 15:01:16 -0000	1.19
***************
*** 43,47 ****
  
  MeasureData::MeasureData()
!  :  MeasureDataAncestor(), keySignature_(0), showKeySignature_(false), beats_(4), beatValue_(4),
      showTimeSignature_(true)
  {
--- 43,47 ----
  
  MeasureData::MeasureData()
!  :  MeasureDataAncestor(), keySignature_(0), showKeySignature_(false),
      showTimeSignature_(true)
  {
***************
*** 49,58 ****
  
  MeasureData::MeasureData(int keySignature, bool showKeySignature)
!  :  MeasureDataAncestor(), keySignature_(keySignature), showKeySignature_(showKeySignature), beats_(4), beatValue_(4)
! {
! }
! 
! MeasureData::MeasureData(int beats, int beatValue, bool showTimeSignature)
!  :  MeasureDataAncestor(), beats_(beats), beatValue_(beatValue), showTimeSignature_(showTimeSignature)
  {
  }
--- 49,53 ----
  
  MeasureData::MeasureData(int keySignature, bool showKeySignature)
!  :  MeasureDataAncestor(), keySignature_(keySignature), showKeySignature_(showKeySignature)
  {
  }
***************
*** 62,69 ****
  }
  
! void MeasureData::getTimeSignature(int& beats, int& beatValue) const 
  { 
!     beats = beats_; 
!     beatValue = beatValue_;
  }
  
--- 57,68 ----
  }
  
! void MeasureData::setTimeSignature(TimeSignature ts)
! {
!     timeSignature_ = ts;
! }
! 
! TimeSignature& MeasureData::getTimeSignature()
  { 
!     return timeSignature_;
  }
  

Index: MeasureData.h
===================================================================
RCS file: /cvsroot/gtab/src/dataobjects/MeasureData.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** MeasureData.h	24 Feb 2006 14:31:01 -0000	1.13
--- MeasureData.h	5 Apr 2006 15:01:16 -0000	1.14
***************
*** 34,37 ****
--- 34,38 ----
  #include "dataobject.h"
  #include "ColumnData.h"
+ #include "timesig.h"
  
  extern const int TIMESIG_SPACE;
***************
*** 50,54 ****
      MeasureData();
  	MeasureData(int keySignature, bool showKeySignature = false);
- 	MeasureData(int beats, int beatValue, bool showTimeSignature = false);
  	virtual ~MeasureData();
  	
--- 51,54 ----
***************
*** 57,62 ****
  	void setShowKeySignature(bool show) { showKeySignature_ = show; }
  	bool showKeySignature() const { return showKeySignature_; }
! 	void setTimeSignature(int beats, int beatValue);
! 	void getTimeSignature(int& beats, int& beatValue) const;
  	bool showTimeSignature() const { return showTimeSignature_; }
      ColumnData* newColumn();
--- 57,62 ----
  	void setShowKeySignature(bool show) { showKeySignature_ = show; }
  	bool showKeySignature() const { return showKeySignature_; }
! 	void setTimeSignature(TimeSignature ts);
! 	TimeSignature& getTimeSignature();
  	bool showTimeSignature() const { return showTimeSignature_; }
      ColumnData* newColumn();
***************
*** 68,75 ****
      int  keySignature_;
      bool showKeySignature_;
-     
-     int  beats_;
-     int  beatValue_;
      bool showTimeSignature_;
  };
  
--- 68,74 ----
      int  keySignature_;
      bool showKeySignature_;
      bool showTimeSignature_;
+     
+     TimeSignature timeSignature_;
  };

[Gtab-cvs] src ptbfile.cpp,1.36,1.37

From: Jelmer V. <ctr...@us...> - 2006-02-28 18:04:58

Update of /cvsroot/gtab/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18216

Modified Files:
	ptbfile.cpp 
Log Message:
Unicode fix


Index: ptbfile.cpp
===================================================================
RCS file: /cvsroot/gtab/src/ptbfile.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** ptbfile.cpp	28 Feb 2006 07:15:24 -0000	1.36
--- ptbfile.cpp	28 Feb 2006 18:04:50 -0000	1.37
***************
*** 186,191 ****
  void PowerTabFile::convertPostition(ColumnData*c, ptb_position *p)
  {
! 	wxASSERT_MSG(c, "No ColumnData to be updated");
! 	wxASSERT_MSG(p, "No position to be red");
  		
  	// Duration
--- 186,191 ----
  void PowerTabFile::convertPostition(ColumnData*c, ptb_position *p)
  {
! 	wxASSERT_MSG(c, wxT("No ColumnData to be updated"));
! 	wxASSERT_MSG(p, wxT("No position to be red"));
  		
  	// Duration

[Gtab-cvs] src/midi MidiParser.cpp,1.7,1.8

From: Seavan <se...@us...> - 2006-02-28 07:32:34

Update of /cvsroot/gtab/src/midi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13220/midi

Modified Files:
	MidiParser.cpp 
Log Message:
* memory leaks workaround. still som of them, particularly when opening ptb files, and some MidiEvents are undeleted ( haven't figured why )

Index: MidiParser.cpp
===================================================================
RCS file: /cvsroot/gtab/src/midi/MidiParser.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** MidiParser.cpp	28 Feb 2006 07:15:24 -0000	1.7
--- MidiParser.cpp	28 Feb 2006 07:32:31 -0000	1.8
***************
*** 45,48 ****
--- 45,49 ----
          MidiStack* stack = parseSection( pData->getConcrete(i) );
          result->pushStack(stack);
+         delete stack;
      }
      return result;

[Gtab-cvs] src/commands CommandStorage.cpp,1.13,1.14

From: Seavan <se...@us...> - 2006-02-28 07:32:34

Update of /cvsroot/gtab/src/commands
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13220/commands

Modified Files:
	CommandStorage.cpp 
Log Message:
* memory leaks workaround. still som of them, particularly when opening ptb files, and some MidiEvents are undeleted ( haven't figured why )

Index: CommandStorage.cpp
===================================================================
RCS file: /cvsroot/gtab/src/commands/CommandStorage.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** CommandStorage.cpp	28 Feb 2006 07:15:24 -0000	1.13
--- CommandStorage.cpp	28 Feb 2006 07:32:31 -0000	1.14
***************
*** 91,94 ****
--- 91,98 ----
  CommandStorage::~CommandStorage()
  {
+     for(DocumentCommandI i = historyList_.begin(); i != historyList_.end(); ++i)
+     {
+         delete i->second;
+     }
  }

[Gtab-cvs] src/drawobjects BoundsHelper.cpp,1.3,1.4 FloatingTextDrawer.cpp,1.3,1.4 NoteColumnDrawer.cpp,1.25,1.26 NoteMeasureDrawer.cpp,1.12,1.13 NoteStaffDrawer.cpp,1.21,1.22 RehSignDrawer.cpp,1.3,1.4 TabColumnDrawer.cpp,1.16,1.17 TabFretDrawer.cpp,1.12,1.13 TabMeasureDrawer.cpp,1.13,1.14 TabStaffDrawer.cpp,1.20,1.21 TempoMarkerDrawer.cpp,1.3,1.4 drawobject.cpp,1.51,1.52 pagedrawer.cpp,1.10,1.11 sectiondrawer.cpp,1.9,1.10

From: Seavan <se...@us...> - 2006-02-28 07:15:29

Update of /cvsroot/gtab/src/drawobjects
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4121/drawobjects

Modified Files:
	BoundsHelper.cpp FloatingTextDrawer.cpp NoteColumnDrawer.cpp 
	NoteMeasureDrawer.cpp NoteStaffDrawer.cpp RehSignDrawer.cpp 
	TabColumnDrawer.cpp TabFretDrawer.cpp TabMeasureDrawer.cpp 
	TabStaffDrawer.cpp TempoMarkerDrawer.cpp drawobject.cpp 
	pagedrawer.cpp sectiondrawer.cpp 
Log Message:
* memory leaks workaround

Index: RehSignDrawer.cpp
===================================================================
RCS file: /cvsroot/gtab/src/drawobjects/RehSignDrawer.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** RehSignDrawer.cpp	26 Feb 2006 12:13:44 -0000	1.3
--- RehSignDrawer.cpp	28 Feb 2006 07:15:24 -0000	1.4
***************
*** 28,32 ****
--- 28,38 ----
  * @date 06-xx-05
  */
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  #include "RehSignDrawer.h"
  

Index: sectiondrawer.cpp
===================================================================
RCS file: /cvsroot/gtab/src/drawobjects/sectiondrawer.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** sectiondrawer.cpp	26 Feb 2006 12:13:44 -0000	1.9
--- sectiondrawer.cpp	28 Feb 2006 07:15:24 -0000	1.10
***************
*** 28,32 ****
--- 28,38 ----
  * @date 06-xx-05
  */
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  #include "sectiondrawer.h"
  

Index: NoteColumnDrawer.cpp
===================================================================
RCS file: /cvsroot/gtab/src/drawobjects/NoteColumnDrawer.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** NoteColumnDrawer.cpp	26 Feb 2006 12:13:44 -0000	1.25
--- NoteColumnDrawer.cpp	28 Feb 2006 07:15:24 -0000	1.26
***************
*** 28,32 ****
--- 28,38 ----
  * @date 06-xx-05
  */
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  #include "NoteColumnDrawer.h"
  #include "../dataobjects/ColumnData.h"

Index: NoteStaffDrawer.cpp
===================================================================
RCS file: /cvsroot/gtab/src/drawobjects/NoteStaffDrawer.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** NoteStaffDrawer.cpp	26 Feb 2006 12:13:44 -0000	1.21
--- NoteStaffDrawer.cpp	28 Feb 2006 07:15:24 -0000	1.22
***************
*** 28,32 ****
--- 28,38 ----
  * @date 06-xx-05
  */
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  #include "NoteStaffDrawer.h"
  #include "../dataobjects/staffdata.h"

Index: TempoMarkerDrawer.cpp
===================================================================
RCS file: /cvsroot/gtab/src/drawobjects/TempoMarkerDrawer.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TempoMarkerDrawer.cpp	26 Feb 2006 12:13:44 -0000	1.3
--- TempoMarkerDrawer.cpp	28 Feb 2006 07:15:24 -0000	1.4
***************
*** 28,32 ****
--- 28,38 ----
  * @date 06-xx-05
  */
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  #include "TempoMarkerDrawer.h"
  

Index: TabColumnDrawer.cpp
===================================================================
RCS file: /cvsroot/gtab/src/drawobjects/TabColumnDrawer.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** TabColumnDrawer.cpp	26 Feb 2006 12:13:44 -0000	1.16
--- TabColumnDrawer.cpp	28 Feb 2006 07:15:24 -0000	1.17
***************
*** 28,32 ****
--- 28,38 ----
  * @date 06-xx-05
  */
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  #include "TabColumnDrawer.h"
  

Index: NoteMeasureDrawer.cpp
===================================================================
RCS file: /cvsroot/gtab/src/drawobjects/NoteMeasureDrawer.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** NoteMeasureDrawer.cpp	26 Feb 2006 12:13:44 -0000	1.12
--- NoteMeasureDrawer.cpp	28 Feb 2006 07:15:24 -0000	1.13
***************
*** 28,32 ****
--- 28,44 ----
  * @date 07-25-05
  */
+ // PCH file
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  #include "NoteMeasureDrawer.h"
  

Index: TabStaffDrawer.cpp
===================================================================
RCS file: /cvsroot/gtab/src/drawobjects/TabStaffDrawer.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** TabStaffDrawer.cpp	26 Feb 2006 12:13:44 -0000	1.20
--- TabStaffDrawer.cpp	28 Feb 2006 07:15:24 -0000	1.21
***************
*** 28,32 ****
--- 28,38 ----
  * @date 06-xx-05
  */
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  #include "TabStaffDrawer.h"
  

Index: BoundsHelper.cpp
===================================================================
RCS file: /cvsroot/gtab/src/drawobjects/BoundsHelper.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** BoundsHelper.cpp	26 Feb 2006 12:13:44 -0000	1.3
--- BoundsHelper.cpp	28 Feb 2006 07:15:24 -0000	1.4
***************
*** 28,32 ****
--- 28,44 ----
  * @date 04-13-05
  */
+ // PCH file
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  #include "drawobjects/BoundsHelper.h"
  

Index: pagedrawer.cpp
===================================================================
RCS file: /cvsroot/gtab/src/drawobjects/pagedrawer.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** pagedrawer.cpp	26 Feb 2006 12:13:44 -0000	1.10
--- pagedrawer.cpp	28 Feb 2006 07:15:24 -0000	1.11
***************
*** 28,32 ****
--- 28,38 ----
  * @date 06-xx-05
  */
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  #include "pagedrawer.h"
  

Index: TabFretDrawer.cpp
===================================================================
RCS file: /cvsroot/gtab/src/drawobjects/TabFretDrawer.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** TabFretDrawer.cpp	26 Feb 2006 12:13:44 -0000	1.12
--- TabFretDrawer.cpp	28 Feb 2006 07:15:24 -0000	1.13
***************
*** 5,9 ****
--- 5,15 ----
   *	@author S. Avanesov se...@gm...
  **********************************************************/
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  #include "TabFretDrawer.h"
  

Index: FloatingTextDrawer.cpp
===================================================================
RCS file: /cvsroot/gtab/src/drawobjects/FloatingTextDrawer.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FloatingTextDrawer.cpp	26 Feb 2006 12:13:44 -0000	1.3
--- FloatingTextDrawer.cpp	28 Feb 2006 07:15:24 -0000	1.4
***************
*** 28,32 ****
--- 28,44 ----
  * @date 06-xx-05
  */
+ // PCH file
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  #include "FloatingTextDrawer.h"
  

Index: drawobject.cpp
===================================================================
RCS file: /cvsroot/gtab/src/drawobjects/drawobject.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** drawobject.cpp	27 Feb 2006 17:24:56 -0000	1.51
--- drawobject.cpp	28 Feb 2006 07:15:24 -0000	1.52
***************
*** 28,32 ****
--- 28,38 ----
  * @date 06-xx-05
  */
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  #include <cstring>
  #include "drawobject.h"

Index: TabMeasureDrawer.cpp
===================================================================
RCS file: /cvsroot/gtab/src/drawobjects/TabMeasureDrawer.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** TabMeasureDrawer.cpp	26 Feb 2006 12:13:44 -0000	1.13
--- TabMeasureDrawer.cpp	28 Feb 2006 07:15:24 -0000	1.14
***************
*** 28,32 ****
--- 28,38 ----
  * @date 07-25-05
  */
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  #include "TabMeasureDrawer.h"

[Gtab-cvs] src AboutDlg.cpp,1.4,1.5 addpagedlg.cpp,1.18,1.19 application.cpp,1.17,1.18 attstaffdlg.cpp,1.10,1.11 bardlg.cpp,1.7,1.8 canvas.cpp,1.133,1.134 configmgr.cpp,1.13,1.14 controller.cpp,1.77,1.78 frame.cpp,1.101,1.102 gpfile.cpp,1.9,1.10 instrument.cpp,1.8,1.9 pagemandlg.cpp,1.16,1.17 pagesel.cpp,1.16,1.17 playbackthrd.cpp,1.13,1.14 ptbfile.cpp,1.35,1.36 rehsigndlg.cpp,1.4,1.5 settingsdlg.cpp,1.6,1.7 stdafx.cpp,1.1,1.2 stdafx.h,1.6,1.7 tempodlg.cpp,1.5,1.6 timesig.cpp,1.11,1.12 tuning.cpp,1.13,1.14 utils.cpp,1.7,1.8

From: Seavan <se...@us...> - 2006-02-28 07:15:29

Update of /cvsroot/gtab/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4121

Modified Files:
	AboutDlg.cpp addpagedlg.cpp application.cpp attstaffdlg.cpp 
	bardlg.cpp canvas.cpp configmgr.cpp controller.cpp frame.cpp 
	gpfile.cpp instrument.cpp pagemandlg.cpp pagesel.cpp 
	playbackthrd.cpp ptbfile.cpp rehsigndlg.cpp settingsdlg.cpp 
	stdafx.cpp stdafx.h tempodlg.cpp timesig.cpp tuning.cpp 
	utils.cpp 
Log Message:
* memory leaks workaround

Index: playbackthrd.cpp
===================================================================
RCS file: /cvsroot/gtab/src/playbackthrd.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** playbackthrd.cpp	27 Feb 2006 17:48:57 -0000	1.13
--- playbackthrd.cpp	28 Feb 2006 07:15:24 -0000	1.14
***************
*** 27,31 ****
--- 27,43 ----
   */
  
+ // PCH file
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  
  #include "playbackthrd.h"

Index: ptbfile.cpp
===================================================================
RCS file: /cvsroot/gtab/src/ptbfile.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** ptbfile.cpp	26 Feb 2006 12:13:44 -0000	1.35
--- ptbfile.cpp	28 Feb 2006 07:15:24 -0000	1.36
***************
*** 28,32 ****
--- 28,38 ----
   */
  
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  
  #ifndef __NOPTAB__
***************
*** 40,49 ****
  #endif
  
- #ifndef _MSVC
  #include <ptb.h>
- #endif
- #ifdef _MSVC
- #include "gtab_src/ptb.h"
- #endif
  
  #include "ptbfile.h"
--- 46,50 ----

Index: tuning.cpp
===================================================================
RCS file: /cvsroot/gtab/src/tuning.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** tuning.cpp	20 Aug 2005 15:56:58 -0000	1.13
--- tuning.cpp	28 Feb 2006 07:15:24 -0000	1.14
***************
*** 35,39 ****
--- 35,45 ----
  #endif
  
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  #include "tuning.h"
  #ifdef _DEBUG

Index: attstaffdlg.cpp
===================================================================
RCS file: /cvsroot/gtab/src/attstaffdlg.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** attstaffdlg.cpp	26 Feb 2006 12:13:44 -0000	1.10
--- attstaffdlg.cpp	28 Feb 2006 07:15:23 -0000	1.11
***************
*** 28,32 ****
--- 28,38 ----
   * @date 01-20-04
   */
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  #include <wx/wx.h>
  #include <wx/xrc/xmlres.h>

Index: tempodlg.cpp
===================================================================
RCS file: /cvsroot/gtab/src/tempodlg.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tempodlg.cpp	28 Feb 2005 20:22:01 -0000	1.5
--- tempodlg.cpp	28 Feb 2006 07:15:24 -0000	1.6
***************
*** 27,31 ****
--- 27,37 ----
   */
  
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  
  #include "tempodlg.h"

Index: utils.cpp
===================================================================
RCS file: /cvsroot/gtab/src/utils.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** utils.cpp	9 Nov 2005 12:54:37 -0000	1.7
--- utils.cpp	28 Feb 2006 07:15:24 -0000	1.8
***************
*** 28,32 ****
--- 28,38 ----
   */
  
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  
  #include "utils.h"

Index: configmgr.cpp
===================================================================
RCS file: /cvsroot/gtab/src/configmgr.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** configmgr.cpp	9 Mar 2005 21:17:54 -0000	1.13
--- configmgr.cpp	28 Feb 2006 07:15:23 -0000	1.14
***************
*** 29,33 ****
--- 29,39 ----
   */
  
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
   
  #include "configmgr.h"

Index: pagesel.cpp
===================================================================
RCS file: /cvsroot/gtab/src/pagesel.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** pagesel.cpp	26 Feb 2006 12:13:44 -0000	1.16
--- pagesel.cpp	28 Feb 2006 07:15:24 -0000	1.17
***************
*** 27,31 ****
--- 27,37 ----
   * @date 11-05-04
   */
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  #include "pagesel.h"
  #include "canvas.h"

Index: stdafx.h
===================================================================
RCS file: /cvsroot/gtab/src/stdafx.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** stdafx.h	27 Feb 2006 17:24:56 -0000	1.6
--- stdafx.h	28 Feb 2006 07:15:24 -0000	1.7
***************
*** 13,16 ****
--- 13,17 ----
  
  #ifdef _MSC_VER
+ #define CRTDBG_MAP_ALLOC
  #include <crtdbg.h>
  #undef DEBUG_NEW

Index: stdafx.cpp
===================================================================
RCS file: /cvsroot/gtab/src/stdafx.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** stdafx.cpp	20 Jan 2005 13:52:44 -0000	1.1
--- stdafx.cpp	28 Feb 2006 07:15:24 -0000	1.2
***************
*** 1,2 ****
--- 1,14 ----
+ // PCH file
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  

Index: instrument.cpp
===================================================================
RCS file: /cvsroot/gtab/src/instrument.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** instrument.cpp	28 Feb 2005 20:22:01 -0000	1.8
--- instrument.cpp	28 Feb 2006 07:15:24 -0000	1.9
***************
*** 27,31 ****
--- 27,37 ----
   */
  
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
   
  #include "instrument.h"

Index: addpagedlg.cpp
===================================================================
RCS file: /cvsroot/gtab/src/addpagedlg.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** addpagedlg.cpp	29 Aug 2005 16:35:54 -0000	1.18
--- addpagedlg.cpp	28 Feb 2006 07:15:23 -0000	1.19
***************
*** 27,31 ****
--- 27,37 ----
   */
  
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  
  #include <wx/wx.h>

Index: pagemandlg.cpp
===================================================================
RCS file: /cvsroot/gtab/src/pagemandlg.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** pagemandlg.cpp	26 Feb 2006 12:13:44 -0000	1.16
--- pagemandlg.cpp	28 Feb 2006 07:15:24 -0000	1.17
***************
*** 28,32 ****
--- 28,38 ----
   * @date 22-01-04
   */
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  #include <wx/wx.h>
  #include <wx/xrc/xmlres.h>

Index: canvas.cpp
===================================================================
RCS file: /cvsroot/gtab/src/canvas.cpp,v
retrieving revision 1.133
retrieving revision 1.134
diff -C2 -d -r1.133 -r1.134
*** canvas.cpp	12 Jan 2006 17:51:32 -0000	1.133
--- canvas.cpp	28 Feb 2006 07:15:23 -0000	1.134
***************
*** 29,33 ****
--- 29,39 ----
   */
  
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
   
  #include <algorithm>

Index: bardlg.cpp
===================================================================
RCS file: /cvsroot/gtab/src/bardlg.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** bardlg.cpp	26 Feb 2006 12:13:44 -0000	1.7
--- bardlg.cpp	28 Feb 2006 07:15:23 -0000	1.8
***************
*** 26,30 ****
--- 26,36 ----
   * @date 11-16-04
   */
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
   
  #include "bardlg.h"

Index: controller.cpp
===================================================================
RCS file: /cvsroot/gtab/src/controller.cpp,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** controller.cpp	26 Feb 2006 13:46:07 -0000	1.77
--- controller.cpp	28 Feb 2006 07:15:23 -0000	1.78
***************
*** 28,32 ****
--- 28,38 ----
   * @date 02-xx-05
   */
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  #include "controller.h"
  #include "frame.h"

Index: timesig.cpp
===================================================================
RCS file: /cvsroot/gtab/src/timesig.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** timesig.cpp	20 Aug 2005 15:37:46 -0000	1.11
--- timesig.cpp	28 Feb 2006 07:15:24 -0000	1.12
***************
*** 27,31 ****
--- 27,37 ----
   */
  
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
   
  #include "timesig.h"

Index: rehsigndlg.cpp
===================================================================
RCS file: /cvsroot/gtab/src/rehsigndlg.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** rehsigndlg.cpp	26 Feb 2006 12:13:44 -0000	1.4
--- rehsigndlg.cpp	28 Feb 2006 07:15:24 -0000	1.5
***************
*** 27,31 ****
--- 27,37 ----
   * @date 24-01-04
   */
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  #include <wx/wx.h>
  #include <wx/statline.h>

Index: gpfile.cpp
===================================================================
RCS file: /cvsroot/gtab/src/gpfile.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** gpfile.cpp	26 Feb 2006 12:13:44 -0000	1.9
--- gpfile.cpp	28 Feb 2006 07:15:24 -0000	1.10
***************
*** 27,31 ****
--- 27,37 ----
   * @date 02-26-05
   */
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  #ifndef __NOPTAB__
  

Index: frame.cpp
===================================================================
RCS file: /cvsroot/gtab/src/frame.cpp,v
retrieving revision 1.101
retrieving revision 1.102
diff -C2 -d -r1.101 -r1.102
*** frame.cpp	27 Feb 2006 18:24:46 -0000	1.101
--- frame.cpp	28 Feb 2006 07:15:24 -0000	1.102
***************
*** 28,32 ****
--- 28,44 ----
   * @date xx-xx-04
   */
+ // PCH file
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  
  #include <wx/xrc/xmlres.h>

Index: application.cpp
===================================================================
RCS file: /cvsroot/gtab/src/application.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** application.cpp	26 Feb 2006 12:13:44 -0000	1.17
--- application.cpp	28 Feb 2006 07:15:23 -0000	1.18
***************
*** 28,32 ****
--- 28,38 ----
   * @date 11-04-04
   */
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  
  #include <wx/xrc/xmlres.h>

Index: AboutDlg.cpp
===================================================================
RCS file: /cvsroot/gtab/src/AboutDlg.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** AboutDlg.cpp	26 Feb 2006 12:13:44 -0000	1.4
--- AboutDlg.cpp	28 Feb 2006 07:15:23 -0000	1.5
***************
*** 26,30 ****
--- 26,36 ----
   * @date 20-08-04
   */
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  #include <wx/wx.h>
  #include <wx/xrc/xmlres.h>

Index: settingsdlg.cpp
===================================================================
RCS file: /cvsroot/gtab/src/settingsdlg.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** settingsdlg.cpp	4 Feb 2005 09:05:34 -0000	1.6
--- settingsdlg.cpp	28 Feb 2006 07:15:24 -0000	1.7
***************
*** 27,31 ****
--- 27,37 ----
   */
  
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  
  #include "settingsdlg.h"

[Gtab-cvs] src/midi MidiEvent.cpp,1.1,1.2 MidiHandler.cpp,1.1,1.2 MidiMessage.cpp,1.5,1.6 MidiParser.cpp,1.6,1.7 MidiStack.cpp,1.4,1.5 MidiWinDevice.cpp,1.2,1.3

From: Seavan <se...@us...> - 2006-02-28 07:15:29

Update of /cvsroot/gtab/src/midi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4121/midi

Modified Files:
	MidiEvent.cpp MidiHandler.cpp MidiMessage.cpp MidiParser.cpp 
	MidiStack.cpp MidiWinDevice.cpp 
Log Message:
* memory leaks workaround

Index: MidiStack.cpp
===================================================================
RCS file: /cvsroot/gtab/src/midi/MidiStack.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MidiStack.cpp	27 Feb 2006 17:47:43 -0000	1.4
--- MidiStack.cpp	28 Feb 2006 07:15:24 -0000	1.5
***************
*** 1,3 ****
--- 1,15 ----
+ // PCH file
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  /**********************************************************
   *  MidiStack.h

Index: MidiParser.cpp
===================================================================
RCS file: /cvsroot/gtab/src/midi/MidiParser.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MidiParser.cpp	27 Feb 2006 17:47:43 -0000	1.6
--- MidiParser.cpp	28 Feb 2006 07:15:24 -0000	1.7
***************
*** 1,3 ****
--- 1,15 ----
+ // PCH file
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  /**********************************************************
   *  MidiParser.h

Index: MidiMessage.cpp
===================================================================
RCS file: /cvsroot/gtab/src/midi/MidiMessage.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MidiMessage.cpp	27 Feb 2006 17:48:22 -0000	1.5
--- MidiMessage.cpp	28 Feb 2006 07:15:24 -0000	1.6
***************
*** 5,9 ****
--- 5,15 ----
   *	@author S. Avanesov se...@gm...
  **********************************************************/
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  #include "MidiMessage.h"
  

Index: MidiWinDevice.cpp
===================================================================
RCS file: /cvsroot/gtab/src/midi/MidiWinDevice.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MidiWinDevice.cpp	26 Feb 2006 13:46:08 -0000	1.2
--- MidiWinDevice.cpp	28 Feb 2006 07:15:24 -0000	1.3
***************
*** 26,30 ****
--- 26,36 ----
   * @date xx-xx-04
   */
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  
  #include "midi/MidiWinDevice.h"

Index: MidiEvent.cpp
===================================================================
RCS file: /cvsroot/gtab/src/midi/MidiEvent.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MidiEvent.cpp	26 Feb 2006 12:17:30 -0000	1.1
--- MidiEvent.cpp	28 Feb 2006 07:15:24 -0000	1.2
***************
*** 5,9 ****
--- 5,21 ----
   *	@author S. Avanesov se...@gm...
  **********************************************************/
+ // PCH file
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  #include "MidiEvent.h"
  

Index: MidiHandler.cpp
===================================================================
RCS file: /cvsroot/gtab/src/midi/MidiHandler.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MidiHandler.cpp	26 Feb 2006 12:55:21 -0000	1.1
--- MidiHandler.cpp	28 Feb 2006 07:15:24 -0000	1.2
***************
*** 26,30 ****
--- 26,36 ----
   * @date xx-xx-04
   */
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  
  #include "midi/MidiDevice.h"

[Gtab-cvs] src/tinyxml nodehandler.cpp,1.4,1.5 tinystr.cpp,1.2,1.3 tinyxml.cpp,1.2,1.3 tinyxmlerror.cpp,1.2,1.3 tinyxmlparser.cpp,1.2,1.3

From: Seavan <se...@us...> - 2006-02-28 07:15:29

Update of /cvsroot/gtab/src/tinyxml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4121/tinyxml

Modified Files:
	nodehandler.cpp tinystr.cpp tinyxml.cpp tinyxmlerror.cpp 
	tinyxmlparser.cpp 
Log Message:
* memory leaks workaround

Index: tinyxmlerror.cpp
===================================================================
RCS file: /cvsroot/gtab/src/tinyxml/tinyxmlerror.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tinyxmlerror.cpp	26 Feb 2006 12:13:45 -0000	1.2
--- tinyxmlerror.cpp	28 Feb 2006 07:15:25 -0000	1.3
***************
*** 22,26 ****
--- 22,32 ----
  distribution.
  */
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  #include "tinyxml.h"
  

Index: tinyxmlparser.cpp
===================================================================
RCS file: /cvsroot/gtab/src/tinyxml/tinyxmlparser.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tinyxmlparser.cpp	26 Feb 2006 12:13:45 -0000	1.2
--- tinyxmlparser.cpp	28 Feb 2006 07:15:25 -0000	1.3
***************
*** 22,26 ****
--- 22,32 ----
  distribution.
  */
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  #include "tinyxml.h"
  #include <ctype.h>

Index: tinystr.cpp
===================================================================
RCS file: /cvsroot/gtab/src/tinyxml/tinystr.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tinystr.cpp	26 Feb 2006 12:13:45 -0000	1.2
--- tinystr.cpp	28 Feb 2006 07:15:25 -0000	1.3
***************
*** 22,26 ****
--- 22,32 ----
  distribution.
  */
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  #include "tinyxml.h"
  

Index: nodehandler.cpp
===================================================================
RCS file: /cvsroot/gtab/src/tinyxml/nodehandler.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** nodehandler.cpp	26 Feb 2006 12:13:45 -0000	1.4
--- nodehandler.cpp	28 Feb 2006 07:15:25 -0000	1.5
***************
*** 28,32 ****
--- 28,38 ----
  * @date 05-08-05
  */
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  #include "nodehandler.h"
  

Index: tinyxml.cpp
===================================================================
RCS file: /cvsroot/gtab/src/tinyxml/tinyxml.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tinyxml.cpp	26 Feb 2006 12:13:45 -0000	1.2
--- tinyxml.cpp	28 Feb 2006 07:15:25 -0000	1.3
***************
*** 22,26 ****
--- 22,32 ----
  distribution.
  */
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  #include <ctype.h>
  #include "tinyxml.h"

[Gtab-cvs] src/dataobjects CachedData.cpp,1.2,1.3 ColumnData.cpp,1.19,1.20 DocumentData.cpp,1.2,1.3 FretData.cpp,1.13,1.14 MeasureData.cpp,1.17,1.18 SectionData.cpp,1.9,1.10 StaffData.cpp,1.6,1.7 dataobject.cpp,1.6,1.7 pagedata.cpp,1.9,1.10

From: Seavan <se...@us...> - 2006-02-28 07:15:28

Update of /cvsroot/gtab/src/dataobjects
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4121/dataobjects

Modified Files:
	CachedData.cpp ColumnData.cpp DocumentData.cpp FretData.cpp 
	MeasureData.cpp SectionData.cpp StaffData.cpp dataobject.cpp 
	pagedata.cpp 
Log Message:
* memory leaks workaround

Index: DocumentData.cpp
===================================================================
RCS file: /cvsroot/gtab/src/dataobjects/DocumentData.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DocumentData.cpp	26 Feb 2006 12:13:44 -0000	1.2
--- DocumentData.cpp	28 Feb 2006 07:15:24 -0000	1.3
***************
*** 28,32 ****
--- 28,44 ----
  * @date 02-xx-06
  */
+ // PCH file
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  #include "documentdata.h"
  

Index: MeasureData.cpp
===================================================================
RCS file: /cvsroot/gtab/src/dataobjects/MeasureData.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** MeasureData.cpp	26 Feb 2006 12:13:44 -0000	1.17
--- MeasureData.cpp	28 Feb 2006 07:15:24 -0000	1.18
***************
*** 28,32 ****
--- 28,38 ----
  * @date 06-xx-05
  */
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  #include "MeasureData.h"
  #include "staffdata.h"

Index: dataobject.cpp
===================================================================
RCS file: /cvsroot/gtab/src/dataobjects/dataobject.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** dataobject.cpp	26 Feb 2006 12:13:44 -0000	1.6
--- dataobject.cpp	28 Feb 2006 07:15:24 -0000	1.7
***************
*** 28,32 ****
--- 28,38 ----
  * @date 21-08-05
  */
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  #include "dataobject.h"
  

Index: SectionData.cpp
===================================================================
RCS file: /cvsroot/gtab/src/dataobjects/SectionData.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** SectionData.cpp	26 Feb 2006 12:13:44 -0000	1.9
--- SectionData.cpp	28 Feb 2006 07:15:24 -0000	1.10
***************
*** 28,32 ****
--- 28,38 ----
  * @date 06-xx-05
  */
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  #include "sectiondata.h"
  #include "staffdata.h"

Index: FretData.cpp
===================================================================
RCS file: /cvsroot/gtab/src/dataobjects/FretData.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** FretData.cpp	26 Feb 2006 12:13:44 -0000	1.13
--- FretData.cpp	28 Feb 2006 07:15:24 -0000	1.14
***************
*** 28,32 ****
--- 28,44 ----
  * @date 06-xx-05
  */
+ // PCH file
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  #include "FretData.h"
  #include "pagedata.h"

Index: StaffData.cpp
===================================================================
RCS file: /cvsroot/gtab/src/dataobjects/StaffData.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** StaffData.cpp	26 Feb 2006 12:13:44 -0000	1.6
--- StaffData.cpp	28 Feb 2006 07:15:24 -0000	1.7
***************
*** 28,32 ****
--- 28,38 ----
  * @date 06-xx-05
  */
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  #include "staffdata.h"
  

Index: CachedData.cpp
===================================================================
RCS file: /cvsroot/gtab/src/dataobjects/CachedData.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CachedData.cpp	26 Feb 2006 12:13:44 -0000	1.2
--- CachedData.cpp	28 Feb 2006 07:15:24 -0000	1.3
***************
*** 1,3 ****
--- 1,15 ----
+ // PCH file
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  #include "CachedData.h"
  #include <wx/wx.h>

Index: pagedata.cpp
===================================================================
RCS file: /cvsroot/gtab/src/dataobjects/pagedata.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** pagedata.cpp	26 Feb 2006 12:13:44 -0000	1.9
--- pagedata.cpp	28 Feb 2006 07:15:24 -0000	1.10
***************
*** 27,31 ****
--- 27,37 ----
  * @author Samvel Avanesov
  */
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  #include "pagedata.h"
  #include "sectiondata.h"

Index: ColumnData.cpp
===================================================================
RCS file: /cvsroot/gtab/src/dataobjects/ColumnData.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** ColumnData.cpp	27 Feb 2006 14:05:55 -0000	1.19
--- ColumnData.cpp	28 Feb 2006 07:15:24 -0000	1.20
***************
*** 28,32 ****
--- 28,44 ----
  * @date 06-xx-05
  */
+ // PCH file
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  #include "ColumnData.h"
  #include "FretData.h"

[Gtab-cvs] src/tests testdc.cpp,1.8,1.9 testparse.cpp,1.3,1.4

From: Seavan <se...@us...> - 2006-02-28 07:15:28

Update of /cvsroot/gtab/src/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4121/tests

Modified Files:
	testdc.cpp testparse.cpp 
Log Message:
* memory leaks workaround

Index: testparse.cpp
===================================================================
RCS file: /cvsroot/gtab/src/tests/testparse.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** testparse.cpp	26 Feb 2006 12:13:44 -0000	1.3
--- testparse.cpp	28 Feb 2006 07:15:25 -0000	1.4
***************
*** 1,3 ****
--- 1,15 ----
+ // PCH file
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  #include <iostream>
  #include <string>

Index: testdc.cpp
===================================================================
RCS file: /cvsroot/gtab/src/tests/testdc.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** testdc.cpp	26 Feb 2006 12:13:44 -0000	1.8
--- testdc.cpp	28 Feb 2006 07:15:25 -0000	1.9
***************
*** 1,3 ****
--- 1,9 ----
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  #include "easyunit/test.h"
  #include "../datacontainer.h"

[Gtab-cvs] src/resource objectstrings.cpp,1.16,1.17

From: Seavan <se...@us...> - 2006-02-28 07:15:28

Update of /cvsroot/gtab/src/resource
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4121/resource

Modified Files:
	objectstrings.cpp 
Log Message:
* memory leaks workaround

Index: objectstrings.cpp
===================================================================
RCS file: /cvsroot/gtab/src/resource/objectstrings.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** objectstrings.cpp	26 Feb 2006 12:13:44 -0000	1.16
--- objectstrings.cpp	28 Feb 2006 07:15:24 -0000	1.17
***************
*** 28,32 ****
--- 28,38 ----
  * @date 06-xx-05
  */
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  #include "objectstrings.h"

[Gtab-cvs] src/factory DefaultDrawerFactory.cpp,1.44,1.45 DrawerFactory.cpp,1.4,1.5

From: Seavan <se...@us...> - 2006-02-28 07:15:27

Update of /cvsroot/gtab/src/factory
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4121/factory

Modified Files:
	DefaultDrawerFactory.cpp DrawerFactory.cpp 
Log Message:
* memory leaks workaround

Index: DrawerFactory.cpp
===================================================================
RCS file: /cvsroot/gtab/src/factory/DrawerFactory.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DrawerFactory.cpp	26 Feb 2006 12:13:44 -0000	1.4
--- DrawerFactory.cpp	28 Feb 2006 07:15:24 -0000	1.5
***************
*** 27,31 ****
--- 27,37 ----
  * @author Samvel Avanesov
  */
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  #include "DrawerFactory.h"
  

Index: DefaultDrawerFactory.cpp
===================================================================
RCS file: /cvsroot/gtab/src/factory/DefaultDrawerFactory.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** DefaultDrawerFactory.cpp	27 Feb 2006 18:52:33 -0000	1.44
--- DefaultDrawerFactory.cpp	28 Feb 2006 07:15:24 -0000	1.45
***************
*** 27,31 ****
--- 27,37 ----
  * @author Samvel Avanesov
  */
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  #include "DefaultDrawerFactory.h"
  #include "../drawobjects/CursorDrawer.h"
***************
*** 162,166 ****
  DefaultDrawerFactory* DefaultDrawerFactory::instance()
  {
!     static DefaultDrawerFactory *factory = new DefaultDrawerFactory();
!     return factory;
  }
--- 168,172 ----
  DefaultDrawerFactory* DefaultDrawerFactory::instance()
  {
!     static DefaultDrawerFactory factory;;
!     return &factory;
  }

[Gtab-cvs] src/commands ChangeAttribute.cpp,1.4,1.5 Command.cpp,1.6,1.7 CommandStorage.cpp,1.12,1.13 EnterNote.cpp,1.7,1.8 SetDurationCommand.cpp,1.4,1.5

From: Seavan <se...@us...> - 2006-02-28 07:15:27

Update of /cvsroot/gtab/src/commands
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4121/commands

Modified Files:
	ChangeAttribute.cpp Command.cpp CommandStorage.cpp 
	EnterNote.cpp SetDurationCommand.cpp 
Log Message:
* memory leaks workaround

Index: SetDurationCommand.cpp
===================================================================
RCS file: /cvsroot/gtab/src/commands/SetDurationCommand.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SetDurationCommand.cpp	26 Feb 2006 12:13:44 -0000	1.4
--- SetDurationCommand.cpp	28 Feb 2006 07:15:24 -0000	1.5
***************
*** 28,32 ****
--- 28,38 ----
   * @date 10-14-05
   */
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  #include "SetDurationCommand.h"
  

Index: EnterNote.cpp
===================================================================
RCS file: /cvsroot/gtab/src/commands/EnterNote.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** EnterNote.cpp	26 Feb 2006 12:13:44 -0000	1.7
--- EnterNote.cpp	28 Feb 2006 07:15:24 -0000	1.8
***************
*** 28,32 ****
--- 28,38 ----
   * @date 10-14-05
   */
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  #include "EnterNote.h"
  

Index: CommandStorage.cpp
===================================================================
RCS file: /cvsroot/gtab/src/commands/CommandStorage.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** CommandStorage.cpp	26 Feb 2006 12:13:44 -0000	1.12
--- CommandStorage.cpp	28 Feb 2006 07:15:24 -0000	1.13
***************
*** 1,3 ****
--- 1,9 ----
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  #include "CommandStorage.h"
  

Index: ChangeAttribute.cpp
===================================================================
RCS file: /cvsroot/gtab/src/commands/ChangeAttribute.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ChangeAttribute.cpp	26 Feb 2006 12:13:44 -0000	1.4
--- ChangeAttribute.cpp	28 Feb 2006 07:15:24 -0000	1.5
***************
*** 28,32 ****
--- 28,38 ----
   * @date 10-14-05
   */
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  #include "ChangeAttribute.h"
  

Index: Command.cpp
===================================================================
RCS file: /cvsroot/gtab/src/commands/Command.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Command.cpp	26 Feb 2006 12:13:44 -0000	1.6
--- Command.cpp	28 Feb 2006 07:15:24 -0000	1.7
***************
*** 1,3 ****
--- 1,9 ----
+ // PCH file
  #include "stdafx.h"
+ // Memory leak detection
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
+ // -- memory leak detection
  #include "Command.h"

Flat | Threaded

1 2 3 .. 24 > >> (Page 1 of 24)

2005	Jan	Feb	Mar (28)	Apr (17)	May (45)	Jun (30)	Jul (122)	Aug (122)	Sep (23)	Oct (43)	Nov (19)	Dec (20)
2006	Jan (26)	Feb (69)	Mar	Apr (10)	May	Jun	Jul	Aug (3)	Sep	Oct	Nov	Dec