Menu
▾
▴
jazzplusplus-updates — SVN commit message list
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
(58) |
Apr
(100) |
May
(92) |
Jun
(12) |
Jul
|
Aug
|
Sep
(5) |
Oct
(1) |
Nov
(26) |
Dec
(29) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(31) |
Feb
(20) |
Mar
(1) |
Apr
|
May
(5) |
Jun
(10) |
Jul
|
Aug
(2) |
Sep
|
Oct
(2) |
Nov
|
Dec
(1) |
| 2010 |
Jan
(1) |
Feb
(1) |
Mar
|
Apr
(36) |
May
(10) |
Jun
|
Jul
(38) |
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
(6) |
Mar
(8) |
Apr
|
May
|
Jun
|
Jul
(14) |
Aug
(56) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(13) |
Dec
(2) |
| 2013 |
Jan
(30) |
Feb
|
Mar
(43) |
Apr
(28) |
May
|
Jun
|
Jul
(2) |
Aug
|
Sep
|
Oct
(10) |
Nov
(2) |
Dec
|
| 2014 |
Jan
|
Feb
(2) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <pst...@us...> - 2010-04-04 20:31:05
|
Revision: 743
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=743&view=rev
Author: pstieber
Date: 2010-04-04 20:30:59 +0000 (Sun, 04 Apr 2010)
Log Message:
-----------
1. Changed ID_AUDIO_GLOBAL to ID_AUDIO_GLOBAL_SETTINGS.
2. Prepared a handler for this event.
Modified Paths:
--------------
trunk/jazz/src/Audio.cpp
trunk/jazz/src/Resources.h
trunk/jazz/src/TrackFrame.cpp
trunk/jazz/src/TrackFrame.h
Modified: trunk/jazz/src/Audio.cpp
===================================================================
--- trunk/jazz/src/Audio.cpp 2010-04-03 14:50:50 UTC (rev 742)
+++ trunk/jazz/src/Audio.cpp 2010-04-04 20:30:59 UTC (rev 743)
@@ -3,7 +3,7 @@
//
// Copyright (C) 1994-2000 Andreas Voss and Per Sigmond, all rights reserved.
// Modifications Copyright (C) 2004 Patrick Earl
-// Modifications Copyright (C) 2008 Peter J. Stieber
+// Modifications Copyright (C) 2008-2010 Peter J. Stieber
//
// 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
@@ -1354,7 +1354,7 @@
return 1;
}
- case ID_AUDIO_GLOBAL:
+ case ID_AUDIO_GLOBAL_SETTINGS:
GlobalSettingsDlg();
break;
Modified: trunk/jazz/src/Resources.h
===================================================================
--- trunk/jazz/src/Resources.h 2010-04-03 14:50:50 UTC (rev 742)
+++ trunk/jazz/src/Resources.h 2010-04-04 20:30:59 UTC (rev 743)
@@ -3,7 +3,7 @@
//
// Copyright (C) 1994-2000 Andreas Voss and Per Sigmond, all rights reserved.
// Modifications Copyright (C) 2004 Patrick Earl
-// Modifications Copyright (C) 2008 Peter J. Stieber
+// Modifications Copyright (C) 2008-2010 Peter J. Stieber
//
// 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
@@ -37,7 +37,7 @@
#define ID_SETTINGS_SYNTHESIZER wxID_HIGHEST + 11
#define ID_SETTINGS_MIDI_DEVICE wxID_HIGHEST + 12
-#define ID_AUDIO_GLOBAL wxID_HIGHEST + 20
+#define ID_AUDIO_GLOBAL_SETTINGS wxID_HIGHEST + 20
#define ID_AUDIO_SAMPLES wxID_HIGHEST + 21
#define ID_AUDIO_LOAD wxID_HIGHEST + 22
#define ID_AUDIO_SAVE wxID_HIGHEST + 23
Modified: trunk/jazz/src/TrackFrame.cpp
===================================================================
--- trunk/jazz/src/TrackFrame.cpp 2010-04-03 14:50:50 UTC (rev 742)
+++ trunk/jazz/src/TrackFrame.cpp 2010-04-04 20:30:59 UTC (rev 743)
@@ -3,7 +3,7 @@
//
// Copyright (C) 1994-2000 Andreas Voss and Per Sigmond, all rights reserved.
// Modifications Copyright (C) 2004 Patrick Earl
-// Modifications Copyright (C) 2008-2009 Peter J. Stieber
+// Modifications Copyright (C) 2008-2010 Peter J. Stieber
//
// 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
@@ -107,6 +107,8 @@
EVT_MENU(ID_SETTINGS_MIDI_DEVICE, JZTrackFrame::OnSettingsMidiDevice)
+ EVT_MENU(ID_AUDIO_GLOBAL_SETTINGS, JZTrackFrame::OnAudioGlobalSettings)
+
EVT_MENU(wxID_HELP_CONTENTS, JZTrackFrame::OnHelpContents)
EVT_MENU(wxID_ABOUT, JZTrackFrame::OnHelpAbout)
@@ -399,7 +401,7 @@
pMenuBar->Append(pSettingMenu, "&Settings");
wxMenu* pAudioMenu = new wxMenu;
- pAudioMenu->Append(ID_AUDIO_GLOBAL, "&Global Settings...");
+ pAudioMenu->Append(ID_AUDIO_GLOBAL_SETTINGS, "&Global Settings...");
pAudioMenu->Append(ID_AUDIO_SAMPLES, "Sample Se&ttings... ");
pAudioMenu->Append(ID_AUDIO_LOAD, "&Load Set...");
pAudioMenu->Append(ID_AUDIO_SAVE, "&Save Set");
@@ -640,6 +642,13 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
+void JZTrackFrame::OnAudioGlobalSettings(wxCommandEvent& Event)
+{
+// mpTrackWindow->EditAudioGlobalSettings(*this);
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
void JZTrackFrame::OnHelpContents(wxCommandEvent& Event)
{
::wxGetApp().DisplayHelpContents();
Modified: trunk/jazz/src/TrackFrame.h
===================================================================
--- trunk/jazz/src/TrackFrame.h 2010-04-03 14:50:50 UTC (rev 742)
+++ trunk/jazz/src/TrackFrame.h 2010-04-04 20:30:59 UTC (rev 743)
@@ -3,7 +3,7 @@
//
// Copyright (C) 1994-2000 Andreas Voss and Per Sigmond, all rights reserved.
// Modifications Copyright (C) 2004 Patrick Earl
-// Modifications Copyright (C) 2008-2009 Peter J. Stieber
+// Modifications Copyright (C) 2008-2010 Peter J. Stieber
//
// 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
@@ -98,6 +98,8 @@
void OnSettingsMidiDevice(wxCommandEvent& Event);
+ void OnAudioGlobalSettings(wxCommandEvent& Event);
+
void OnHelpContents(wxCommandEvent& Event);
void OnHelpAbout(wxCommandEvent& Event);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2010-04-03 14:50:56
|
Revision: 742
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=742&view=rev
Author: pstieber
Date: 2010-04-03 14:50:50 +0000 (Sat, 03 Apr 2010)
Log Message:
-----------
Removed some unneeded include files.
Modified Paths:
--------------
trunk/jazz/src/Dialogs.cpp
trunk/jazz/src/EventWindow.cpp
Modified: trunk/jazz/src/Dialogs.cpp
===================================================================
--- trunk/jazz/src/Dialogs.cpp 2010-04-03 02:35:53 UTC (rev 741)
+++ trunk/jazz/src/Dialogs.cpp 2010-04-03 14:50:50 UTC (rev 742)
@@ -37,7 +37,6 @@
#include "PianoWindow.h"
#include "Player.h"
#include "ProjectManager.h"
-#include "PropertyListDialog.h"
#include "Song.h"
#include "Synth.h"
#include "Track.h"
Modified: trunk/jazz/src/EventWindow.cpp
===================================================================
--- trunk/jazz/src/EventWindow.cpp 2010-04-03 02:35:53 UTC (rev 741)
+++ trunk/jazz/src/EventWindow.cpp 2010-04-03 14:50:50 UTC (rev 742)
@@ -39,7 +39,6 @@
#include "Song.h"
#include "Help.h"
#include "ProjectManager.h"
-#include "PropertyListDialog.h"
#include <wx/dc.h>
#include <wx/msgdlg.h>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2010-04-03 02:35:59
|
Revision: 741
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=741&view=rev
Author: pstieber
Date: 2010-04-03 02:35:53 +0000 (Sat, 03 Apr 2010)
Log Message:
-----------
Added a new sysex dialog.
Modified Paths:
--------------
trunk/jazz/src/Makefile.am
trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj
Added Paths:
-----------
trunk/jazz/src/Dialogs/SysexDialog.cpp
trunk/jazz/src/Dialogs/SysexDialog.h
Added: trunk/jazz/src/Dialogs/SysexDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/SysexDialog.cpp (rev 0)
+++ trunk/jazz/src/Dialogs/SysexDialog.cpp 2010-04-03 02:35:53 UTC (rev 741)
@@ -0,0 +1,278 @@
+//*****************************************************************************
+// The JAZZ++ Midi Sequencer
+//
+// Copyright (C) 2009 Peter J. Stieber, all rights reserved.
+//
+// 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+//*****************************************************************************
+
+#include "SysexDialog.h"
+
+#include "../Events.h"
+#include "../Globals.h"
+#include "../KeyStringConverters.h"
+#include "../Knob.h"
+#include "../Project.h"
+#include "../Resources.h"
+
+#include <wx/button.h>
+#include <wx/sizer.h>
+#include <wx/stattext.h>
+#include <wx/textctrl.h>
+
+#include <sstream>
+
+using namespace std;
+
+//*****************************************************************************
+//*****************************************************************************
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+BEGIN_EVENT_TABLE(JZSysexDialog, wxDialog)
+
+ EVT_KNOB_CHANGED(IDC_KB_VELOCITY, JZSysexDialog::OnVelocityChange)
+
+ EVT_KNOB_CHANGED(IDC_KB_OFF_VELOCITY, JZSysexDialog::OnOffVelocityChange)
+
+ EVT_KNOB_CHANGED(IDC_KB_CHANNEL, JZSysexDialog::OnChannelChange)
+
+ EVT_BUTTON(wxID_HELP, JZSysexDialog::OnHelp)
+
+END_EVENT_TABLE()
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+JZSysexDialog::JZSysexDialog(tKeyOn* pEvent, wxWindow* pParent)
+ : wxDialog(pParent, wxID_ANY, wxString("Key On")),
+ mpEvent(pEvent),
+ mpPitchEdit(0),
+ mpVelocityValue(0),
+ mpVelocityKnob(0),
+ mpOffVelocityValue(0),
+ mpOffVelocityKnob(0),
+ mpLengthEdit(0),
+ mpChannelValue(0),
+ mpChannelKnob(0),
+ mpClockEdit(0)
+{
+ mpPitchEdit = new wxTextCtrl(this, wxID_ANY);
+
+ mpVelocityValue = new wxStaticText(this, wxID_ANY, "000");
+
+ mpVelocityKnob = new JZKnob(this, IDC_KB_VELOCITY, 0, 0, 127);
+
+ mpOffVelocityValue = new wxStaticText(this, wxID_ANY, "000");
+
+ mpOffVelocityKnob = new JZKnob(this, IDC_KB_OFF_VELOCITY, 0, 0, 127);
+
+ mpLengthEdit = new wxTextCtrl(this, wxID_ANY);
+
+ mpChannelValue = new wxStaticText(this, wxID_ANY, "00");
+
+ mpChannelKnob = new JZKnob(this, IDC_KB_CHANNEL, 0, 1, 16);
+
+ mpClockEdit = new wxTextCtrl(this, wxID_ANY);
+
+ wxButton* pOkButton = new wxButton(this, wxID_OK, "&OK");
+ wxButton* pCancelButton = new wxButton(this, wxID_CANCEL, "Cancel");
+ wxButton* pHelpButton = new wxButton(this, wxID_HELP, "Help");
+ pOkButton->SetDefault();
+
+ wxBoxSizer* pTopSizer = new wxBoxSizer(wxVERTICAL);
+
+ wxFlexGridSizer* pFlexGridSizer;
+
+ pFlexGridSizer = new wxFlexGridSizer(1, 2, 4, 2);
+
+ pFlexGridSizer->Add(
+ new wxStaticText(this, wxID_ANY, "Pitch:"),
+ 0,
+ wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL);
+ pFlexGridSizer->Add(mpPitchEdit, 0, wxALIGN_CENTER_VERTICAL);
+
+ pTopSizer->Add(pFlexGridSizer, 0, wxCENTER | wxALL, 2);
+
+ pFlexGridSizer = new wxFlexGridSizer(2, 3, 4, 2);
+
+ pFlexGridSizer->Add(
+ new wxStaticText(this, wxID_ANY, "Velocity:"),
+ 0,
+ wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL);
+ pFlexGridSizer->Add(
+ mpVelocityValue,
+ 0,
+ wxALIGN_CENTER_VERTICAL | wxFIXED_MINSIZE);
+ pFlexGridSizer->Add(mpVelocityKnob, 0, wxALIGN_CENTER_VERTICAL);
+
+ pFlexGridSizer->Add(
+ new wxStaticText(this, wxID_ANY, "Off Velocity:"),
+ 0,
+ wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL);
+ pFlexGridSizer->Add(
+ mpOffVelocityValue,
+ 0,
+ wxALIGN_CENTER_VERTICAL | wxFIXED_MINSIZE);
+ pFlexGridSizer->Add(mpOffVelocityKnob, 0, wxALIGN_CENTER_VERTICAL);
+
+ pTopSizer->Add(pFlexGridSizer, 0, wxALIGN_CENTER);
+
+ pFlexGridSizer = new wxFlexGridSizer(1, 2, 4, 2);
+
+ pFlexGridSizer->Add(
+ new wxStaticText(this, wxID_ANY, "Length:"),
+ 0,
+ wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL);
+ pFlexGridSizer->Add(mpLengthEdit, 0, wxALIGN_CENTER_VERTICAL);
+
+ pTopSizer->Add(pFlexGridSizer, 0, wxCENTER | wxALL, 2);
+
+ pFlexGridSizer = new wxFlexGridSizer(1, 3, 4, 2);
+
+ pFlexGridSizer->Add(
+ new wxStaticText(this, wxID_ANY, "Channel:"),
+ 0,
+ wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL);
+ pFlexGridSizer->Add(
+ mpChannelValue,
+ 0,
+ wxALIGN_CENTER_VERTICAL | wxFIXED_MINSIZE);
+ pFlexGridSizer->Add(mpChannelKnob, 0, wxALIGN_CENTER_VERTICAL);
+
+ pTopSizer->Add(pFlexGridSizer, 0, wxCENTER | wxALL, 2);
+
+ pFlexGridSizer = new wxFlexGridSizer(1, 2, 4, 2);
+
+ pFlexGridSizer->Add(
+ new wxStaticText(this, wxID_ANY, "Clock:"),
+ 0,
+ wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL);
+ pFlexGridSizer->Add(mpClockEdit, 0, wxALIGN_CENTER_VERTICAL);
+
+ pTopSizer->Add(pFlexGridSizer, 0, wxCENTER | wxALL, 2);
+
+ wxBoxSizer* pButtonSizer = new wxBoxSizer(wxHORIZONTAL);
+ pButtonSizer->Add(pOkButton, 0, wxALL, 5);
+ pButtonSizer->Add(pCancelButton, 0, wxALL, 5);
+ pButtonSizer->Add(pHelpButton, 0, wxALL, 5);
+
+ pTopSizer->Add(pButtonSizer, 0, wxALIGN_CENTER | wxBOTTOM, 6);
+
+ SetAutoLayout(true);
+ SetSizer(pTopSizer);
+
+ pTopSizer->SetSizeHints(this);
+ pTopSizer->Fit(this);
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+bool JZSysexDialog::TransferDataToWindow()
+{
+ string KeyString;
+ KeyToString(mpEvent->GetKey(), KeyString);
+ mpPitchEdit->ChangeValue(KeyString.c_str());
+
+ ostringstream Oss;
+
+ Oss << (int)mpEvent->GetVelocity();
+ mpVelocityValue->SetLabel(Oss.str().c_str());
+
+ mpVelocityKnob->SetValue(mpEvent->GetVelocity());
+
+ Oss.str("");
+ Oss << (int)mpEvent->GetOffVelocity();
+ mpOffVelocityValue->SetLabel(Oss.str().c_str());
+
+ mpOffVelocityKnob->SetValue(mpEvent->GetOffVelocity());
+
+ wxString LengthString;
+ LengthString << mpEvent->GetEventLength();
+ mpLengthEdit->ChangeValue(LengthString);
+
+ Oss.str("");
+ Oss << (int)mpEvent->GetChannel() + 1;
+ mpChannelValue->SetLabel(Oss.str().c_str());
+
+ mpChannelKnob->SetValue(mpEvent->GetChannel() + 1);
+
+ string ClockString;
+ gpProject->ClockToString(mpEvent->GetClock(), ClockString);
+ mpClockEdit->ChangeValue(ClockString.c_str());
+
+ return true;
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+bool JZSysexDialog::TransferDataFromWindow()
+{
+ wxString KeyString = mpPitchEdit->GetValue();
+ mpEvent->SetKey(StringToKey(KeyString.c_str()));
+
+ mpEvent->SetVelocity(mpVelocityKnob->GetValue());
+
+ mpEvent->SetOffVelocity(mpOffVelocityKnob->GetValue());
+
+ wxString LengthString = mpLengthEdit->GetValue();
+ istringstream Iss(LengthString.c_str());
+ unsigned short Length;
+ Iss >> Length;
+ mpEvent->SetLength(Length);
+
+ mpEvent->SetChannel(mpChannelKnob->GetValue() - 1);
+
+ wxString ClockString = mpClockEdit->GetValue();
+ int Clock = gpProject->StringToClock(ClockString.c_str());
+ mpEvent->SetClock(Clock);
+
+ return true;
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+void JZSysexDialog::OnVelocityChange(JZKnobEvent& Event)
+{
+ int Value = Event.GetValue();
+ ostringstream Oss;
+ Oss << Value;
+ mpVelocityValue->SetLabel(Oss.str().c_str());
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+void JZSysexDialog::OnOffVelocityChange(JZKnobEvent& Event)
+{
+ int Value = Event.GetValue();
+ ostringstream Oss;
+ Oss << Value;
+ mpOffVelocityValue->SetLabel(Oss.str().c_str());
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+void JZSysexDialog::OnChannelChange(JZKnobEvent& Event)
+{
+ int Value = Event.GetValue();
+ ostringstream Oss;
+ Oss << Value;
+ mpChannelValue->SetLabel(Oss.str().c_str());
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+void JZSysexDialog::OnHelp(wxCommandEvent& Event)
+{
+// gpHelpInstance->ShowTopic("Sysex Dialog");
+}
Property changes on: trunk/jazz/src/Dialogs/SysexDialog.cpp
___________________________________________________________________
Added: svn:eol-style
+ native
Added: trunk/jazz/src/Dialogs/SysexDialog.h
===================================================================
--- trunk/jazz/src/Dialogs/SysexDialog.h (rev 0)
+++ trunk/jazz/src/Dialogs/SysexDialog.h 2010-04-03 02:35:53 UTC (rev 741)
@@ -0,0 +1,71 @@
+//*****************************************************************************
+// The JAZZ++ Midi Sequencer
+//
+// Copyright (C) 2009 Peter J. Stieber, all rights reserved.
+//
+// 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+//*****************************************************************************
+
+#ifndef JZ_SYSEXDIALOG_H
+#define JZ_SYSEXDIALOG_H
+
+#include <wx/dialog.h>
+
+class JZKnob;
+class JZKnobEvent;
+class tKeyOn;
+class wxStaticText;
+class wxTextCtrl;
+
+//*****************************************************************************
+//*****************************************************************************
+class JZSysexDialog : public wxDialog
+{
+ public:
+
+ JZSysexDialog(tKeyOn* pEvent, wxWindow* pParent);
+
+ private:
+
+ virtual bool TransferDataToWindow();
+
+ virtual bool TransferDataFromWindow();
+
+ void OnVelocityChange(JZKnobEvent& Event);
+
+ void OnOffVelocityChange(JZKnobEvent& Event);
+
+ void OnChannelChange(JZKnobEvent& Event);
+
+ void OnHelp(wxCommandEvent& Event);
+
+ private:
+
+ tKeyOn* mpEvent;
+
+ wxTextCtrl* mpPitchEdit;
+ wxStaticText* mpVelocityValue;
+ JZKnob* mpVelocityKnob;
+ wxStaticText* mpOffVelocityValue;
+ JZKnob* mpOffVelocityKnob;
+ wxTextCtrl* mpLengthEdit;
+ wxStaticText* mpChannelValue;
+ JZKnob* mpChannelKnob;
+ wxTextCtrl* mpClockEdit;
+
+ DECLARE_EVENT_TABLE();
+};
+
+#endif // !defined(JZ_SYSEXDIALOG_H)
Property changes on: trunk/jazz/src/Dialogs/SysexDialog.h
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: trunk/jazz/src/Makefile.am
===================================================================
--- trunk/jazz/src/Makefile.am 2010-02-21 17:41:53 UTC (rev 740)
+++ trunk/jazz/src/Makefile.am 2010-04-03 02:35:53 UTC (rev 741)
@@ -35,6 +35,7 @@
Dialogs/ShiftDialog.cpp \
Dialogs/SnapDialog.cpp \
Dialogs/SynthesizerSettingsDialog.cpp \
+Dialogs/SysexDialog.cpp \
Dialogs/TrackDialog.cpp \
Dialogs/TransposeDialog.cpp \
Dialogs/VelocityDialog.cpp \
@@ -123,6 +124,7 @@
Dialogs/ShiftDialog.cpp \
Dialogs/SnapDialog.cpp \
Dialogs/SynthesizerSettingsDialog.cpp \
+Dialogs/SysexDialog.cpp \
Dialogs/TrackDialog.cpp \
Dialogs/TransposeDialog.cpp \
Dialogs/VelocityDialog.cpp \
@@ -216,6 +218,7 @@
Dialogs/ShiftDialog.h \
Dialogs/SnapDialog.h \
Dialogs/SynthesizerSettingsDialog.h \
+Dialogs/SysexDialog.h \
Dialogs/TrackDialog.h \
Dialogs/TransposeDialog.h \
Dialogs/VelocityDialog.h \
Modified: trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj
===================================================================
--- trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2010-02-21 17:41:53 UTC (rev 740)
+++ trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2010-04-03 02:35:53 UTC (rev 741)
@@ -951,6 +951,14 @@
>
</File>
<File
+ RelativePath="..\src\Dialogs\SysexDialog.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\src\Dialogs\SysexDialog.h"
+ >
+ </File>
+ <File
RelativePath="..\src\Dialogs\TrackDialog.cpp"
>
</File>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2010-02-21 17:42:00
|
Revision: 740
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=740&view=rev
Author: pstieber
Date: 2010-02-21 17:41:53 +0000 (Sun, 21 Feb 2010)
Log Message:
-----------
Updated to a newer version.
Modified Paths:
--------------
tex2rtf/config/ltmain.sh
tex2rtf/m4/ltversion.m4
Modified: tex2rtf/config/ltmain.sh
===================================================================
--- tex2rtf/config/ltmain.sh 2010-01-07 15:14:24 UTC (rev 739)
+++ tex2rtf/config/ltmain.sh 2010-02-21 17:41:53 UTC (rev 740)
@@ -1,6 +1,6 @@
# Generated from ltmain.m4sh.
-# ltmain.sh (GNU libtool) 2.2.6
+# ltmain.sh (GNU libtool) 2.2.6b
# Written by Gordon Matzigkeit <go...@gn...>, 1996
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
@@ -65,7 +65,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.2.6
+# $progname: (GNU libtool) 2.2.6b
# automake: $automake_version
# autoconf: $autoconf_version
#
@@ -73,9 +73,9 @@
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION=2.2.6
+VERSION=2.2.6b
TIMESTAMP=""
-package_revision=1.3012
+package_revision=1.3017
# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
Modified: tex2rtf/m4/ltversion.m4
===================================================================
--- tex2rtf/m4/ltversion.m4 2010-01-07 15:14:24 UTC (rev 739)
+++ tex2rtf/m4/ltversion.m4 2010-02-21 17:41:53 UTC (rev 740)
@@ -9,15 +9,15 @@
# Generated from ltversion.in.
-# serial 3012 ltversion.m4
+# serial 3017 ltversion.m4
# This file is part of GNU Libtool
-m4_define([LT_PACKAGE_VERSION], [2.2.6])
-m4_define([LT_PACKAGE_REVISION], [1.3012])
+m4_define([LT_PACKAGE_VERSION], [2.2.6b])
+m4_define([LT_PACKAGE_REVISION], [1.3017])
AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.2.6'
-macro_revision='1.3012'
+[macro_version='2.2.6b'
+macro_revision='1.3017'
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
_LT_DECL(, macro_revision, 0)
])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2010-01-07 15:14:34
|
Revision: 739
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=739&view=rev
Author: pstieber
Date: 2010-01-07 15:14:24 +0000 (Thu, 07 Jan 2010)
Log Message:
-----------
Updated the autotools files.
Modified Paths:
--------------
trunk/jazz/Makefile.am
trunk/jazz/config/ltmain.sh
trunk/jazz/configure.ac
Added Paths:
-----------
trunk/jazz/m4/
trunk/jazz/m4/acinclude.m4
trunk/jazz/m4/libtool.m4
trunk/jazz/m4/ltoptions.m4
trunk/jazz/m4/ltsugar.m4
trunk/jazz/m4/ltversion.m4
trunk/jazz/m4/lt~obsolete.m4
Removed Paths:
-------------
trunk/jazz/config/acinclude.m4
Modified: trunk/jazz/Makefile.am
===================================================================
--- trunk/jazz/Makefile.am 2009-12-03 14:43:42 UTC (rev 738)
+++ trunk/jazz/Makefile.am 2010-01-07 15:14:24 UTC (rev 739)
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-ACLOCAL_FLAGS=-I config
+ACLOCAL_AMFLAGS=-I m4
SUBDIRS = src conf
Deleted: trunk/jazz/config/acinclude.m4
===================================================================
--- trunk/jazz/config/acinclude.m4 2009-12-03 14:43:42 UTC (rev 738)
+++ trunk/jazz/config/acinclude.m4 2010-01-07 15:14:24 UTC (rev 739)
@@ -1,370 +0,0 @@
-dnl ---------------------------------------------------------------------------
-dnl Macros for the Jazz++ application configure.ac
-dnl ---------------------------------------------------------------------------
-
-dnl ---------------------------------------------------------------------------
-dnl Macros for wxWidgets detection. Typically used in configure.in as:
-dnl
-dnl AC_ARG_ENABLE(...)
-dnl AC_ARG_WITH(...)
-dnl ...
-dnl AM_OPTIONS_WXCONFIG
-dnl ...
-dnl ...
-dnl AM_PATH_WXCONFIG(2.6.0, wxWin=1)
-dnl if test "$wxWin" != 1; then
-dnl AC_MSG_ERROR([
-dnl wxWidgets must be installed on your system
-dnl but wx-config script couldn't be found.
-dnl
-dnl Please check that wx-config is in path, the directory
-dnl where wxWidgets libraries are installed (returned by
-dnl 'wx-config --libs' command) is in LD_LIBRARY_PATH or
-dnl equivalent variable and wxWidgets version is 2.3.4 or above.
-dnl ])
-dnl fi
-dnl CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
-dnl CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY"
-dnl CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
-dnl
-dnl LIBS="$LIBS $WX_LIBS"
-dnl ---------------------------------------------------------------------------
-
-dnl ---------------------------------------------------------------------------
-dnl AM_OPTIONS_WXCONFIG
-dnl
-dnl adds support for --wx-prefix, --wx-exec-prefix, --with-wxdir and
-dnl --wx-config command line options
-dnl ---------------------------------------------------------------------------
-
-AC_DEFUN([AM_OPTIONS_WXCONFIG],
-[
- AC_ARG_WITH(wxdir,
- [ --with-wxdir=PATH Use uninstalled version of wxWidgets in PATH],
- [ wx_config_name="$withval/wx-config"
- wx_config_args="--inplace"])
- AC_ARG_WITH(wx-config,
- [ --with-wx-config=CONFIG wx-config script to use (optional)],
- wx_config_name="$withval" )
- AC_ARG_WITH(wx-prefix,
- [ --with-wx-prefix=PREFIX Prefix where wxWidgets is installed (optional)],
- wx_config_prefix="$withval", wx_config_prefix="")
- AC_ARG_WITH(wx-exec-prefix,
- [ --with-wx-exec-prefix=PREFIX
- Exec prefix where wxWidgets is installed (optional)],
- wx_config_exec_prefix="$withval", wx_config_exec_prefix="")
-])
-
-dnl Helper macro for checking if wx version is at least $1.$2.$3, set's
-dnl wx_ver_ok=yes if it is:
-AC_DEFUN([_WX_PRIVATE_CHECK_VERSION],
-[
- wx_ver_ok=""
- if test "x$WX_VERSION" != x ; then
- if test $wx_config_major_version -gt $1; then
- wx_ver_ok=yes
- else
- if test $wx_config_major_version -eq $1; then
- if test $wx_config_minor_version -gt $2; then
- wx_ver_ok=yes
- else
- if test $wx_config_minor_version -eq $2; then
- if test $wx_config_micro_version -ge $3; then
- wx_ver_ok=yes
- fi
- fi
- fi
- fi
- fi
- fi
-])
-
-dnl ---------------------------------------------------------------------------
-dnl AM_PATH_WXCONFIG(VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND
-dnl [, WX-LIBS [, ADDITIONAL-WX-CONFIG-FLAGS]]]])
-dnl
-dnl Test for wxWidgets, and define WX_C*FLAGS, WX_LIBS and WX_LIBS_STATIC
-dnl (the latter is for static linking against wxWidgets). Set WX_CONFIG_NAME
-dnl environment variable to override the default name of the wx-config script
-dnl to use. Set WX_CONFIG_PATH to specify the full path to wx-config - in this
-dnl case the macro won't even waste time on tests for its existence.
-dnl
-dnl Optional WX-LIBS argument contains comma- or space-separated list of
-dnl wxWidgets libraries to link against (it may include contrib libraries). If
-dnl it is not specified then WX_LIBS and WX_LIBS_STATIC will contain flags to
-dnl link with all of the core wxWidgets libraries.
-dnl
-dnl Optional ADDITIONAL-WX-CONFIG-FLAGS argument is appended to wx-config
-dnl invocation command in present. It can be used to fine-tune lookup of
-dnl best wxWidgets build available.
-dnl
-dnl Example use:
-dnl AM_PATH_WXCONFIG([2.6.0], [wxWin=1], [wxWin=0], [html,core,net]
-dnl [--unicode --debug])
-dnl ---------------------------------------------------------------------------
-
-dnl
-dnl Get the cflags and libraries from the wx-config script
-dnl
-AC_DEFUN([AM_PATH_WXCONFIG],
-[
- dnl do we have wx-config name: it can be wx-config or wxd-config or ...
- if test x${WX_CONFIG_NAME+set} != xset ; then
- WX_CONFIG_NAME=wx-config
- fi
-
- if test "x$wx_config_name" != x ; then
- WX_CONFIG_NAME="$wx_config_name"
- fi
-
- dnl deal with optional prefixes
- if test x$wx_config_exec_prefix != x ; then
- wx_config_args="$wx_config_args --exec-prefix=$wx_config_exec_prefix"
- WX_LOOKUP_PATH="$wx_config_exec_prefix/bin"
- fi
- if test x$wx_config_prefix != x ; then
- wx_config_args="$wx_config_args --prefix=$wx_config_prefix"
- WX_LOOKUP_PATH="$WX_LOOKUP_PATH:$wx_config_prefix/bin"
- fi
- if test "$cross_compiling" = "yes"; then
- wx_config_args="$wx_config_args --host=$host_alias"
- fi
-
- dnl don't search the PATH if WX_CONFIG_NAME is absolute filename
- if test -x "$WX_CONFIG_NAME" ; then
- AC_MSG_CHECKING(for wx-config)
- WX_CONFIG_PATH="$WX_CONFIG_NAME"
- AC_MSG_RESULT($WX_CONFIG_PATH)
- else
- AC_PATH_PROG(WX_CONFIG_PATH, $WX_CONFIG_NAME, no, "$WX_LOOKUP_PATH:$PATH")
- fi
-
- if test "$WX_CONFIG_PATH" != "no" ; then
- WX_VERSION=""
-
- min_wx_version=ifelse([$1], ,2.2.1,$1)
- if test -z "$5" ; then
- AC_MSG_CHECKING([for wxWidgets version >= $min_wx_version])
- else
- AC_MSG_CHECKING([for wxWidgets version >= $min_wx_version ($5)])
- fi
-
- WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args $5 $4"
-
- WX_VERSION=`$WX_CONFIG_WITH_ARGS --version 2>/dev/null`
- wx_config_major_version=`echo $WX_VERSION | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
- wx_config_minor_version=`echo $WX_VERSION | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
- wx_config_micro_version=`echo $WX_VERSION | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-
- wx_requested_major_version=`echo $min_wx_version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
- wx_requested_minor_version=`echo $min_wx_version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
- wx_requested_micro_version=`echo $min_wx_version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-
- _WX_PRIVATE_CHECK_VERSION([$wx_requested_major_version],
- [$wx_requested_minor_version],
- [$wx_requested_micro_version])
-
- if test -n "$wx_ver_ok"; then
-
- AC_MSG_RESULT(yes (version $WX_VERSION))
- WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs`
-
- dnl is this even still appropriate? --static is a real option now
- dnl and WX_CONFIG_WITH_ARGS is likely to contain it if that is
- dnl what the user actually wants, making this redundant at best.
- dnl For now keep it in case anyone actually used it in the past.
- AC_MSG_CHECKING([for wxWidgets static library])
- WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs 2>/dev/null`
- if test "x$WX_LIBS_STATIC" = "x"; then
- AC_MSG_RESULT(no)
- else
- AC_MSG_RESULT(yes)
- fi
-
- dnl starting with version 2.2.6 wx-config has --cppflags argument
- wx_has_cppflags=""
- if test $wx_config_major_version -gt 2; then
- wx_has_cppflags=yes
- else
- if test $wx_config_major_version -eq 2; then
- if test $wx_config_minor_version -gt 2; then
- wx_has_cppflags=yes
- else
- if test $wx_config_minor_version -eq 2; then
- if test $wx_config_micro_version -ge 6; then
- wx_has_cppflags=yes
- fi
- fi
- fi
- fi
- fi
-
- dnl starting with version 2.7.0 wx-config has --rescomp option
- wx_has_rescomp=""
- if test $wx_config_major_version -gt 2; then
- wx_has_rescomp=yes
- else
- if test $wx_config_major_version -eq 2; then
- if test $wx_config_minor_version -ge 7; then
- wx_has_rescomp=yes
- fi
- fi
- fi
- if test "x$wx_has_rescomp" = x ; then
- dnl cannot give any useful info for resource compiler
- WX_RESCOMP=
- else
- WX_RESCOMP=`$WX_CONFIG_WITH_ARGS --rescomp`
- fi
-
- if test "x$wx_has_cppflags" = x ; then
- dnl no choice but to define all flags like CFLAGS
- WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags`
- WX_CPPFLAGS=$WX_CFLAGS
- WX_CXXFLAGS=$WX_CFLAGS
-
- WX_CFLAGS_ONLY=$WX_CFLAGS
- WX_CXXFLAGS_ONLY=$WX_CFLAGS
- else
- dnl we have CPPFLAGS included in CFLAGS included in CXXFLAGS
- WX_CPPFLAGS=`$WX_CONFIG_WITH_ARGS --cppflags`
- WX_CXXFLAGS=`$WX_CONFIG_WITH_ARGS --cxxflags`
- WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags`
-
- WX_CFLAGS_ONLY=`echo $WX_CFLAGS | sed "s@^$WX_CPPFLAGS *@@"`
- WX_CXXFLAGS_ONLY=`echo $WX_CXXFLAGS | sed "s@^$WX_CFLAGS *@@"`
- fi
-
- ifelse([$2], , :, [$2])
-
- else
-
- if test "x$WX_VERSION" = x; then
- dnl no wx-config at all
- AC_MSG_RESULT(no)
- else
- AC_MSG_RESULT(no (version $WX_VERSION is not new enough))
- fi
-
- WX_CFLAGS=""
- WX_CPPFLAGS=""
- WX_CXXFLAGS=""
- WX_LIBS=""
- WX_LIBS_STATIC=""
- WX_RESCOMP=""
- ifelse([$3], , :, [$3])
-
- fi
- else
-
- WX_CFLAGS=""
- WX_CPPFLAGS=""
- WX_CXXFLAGS=""
- WX_LIBS=""
- WX_LIBS_STATIC=""
- WX_RESCOMP=""
-
- ifelse([$3], , :, [$3])
-
- fi
-
- AC_SUBST(WX_CPPFLAGS)
- AC_SUBST(WX_CFLAGS)
- AC_SUBST(WX_CXXFLAGS)
- AC_SUBST(WX_CFLAGS_ONLY)
- AC_SUBST(WX_CXXFLAGS_ONLY)
- AC_SUBST(WX_LIBS)
- AC_SUBST(WX_LIBS_STATIC)
- AC_SUBST(WX_VERSION)
- AC_SUBST(WX_RESCOMP)
-])
-
-dnl ---------------------------------------------------------------------------
-dnl Get information on the wxrc program for making C++, Python and xrs
-dnl resource files.
-dnl
-dnl AC_ARG_ENABLE(...)
-dnl AC_ARG_WITH(...)
-dnl ...
-dnl AM_OPTIONS_WXCONFIG
-dnl ...
-dnl AM_PATH_WXCONFIG(2.6.0, wxWin=1)
-dnl if test "$wxWin" != 1; then
-dnl AC_MSG_ERROR([
-dnl wxWidgets must be installed on your system
-dnl but wx-config script couldn't be found.
-dnl
-dnl Please check that wx-config is in path, the directory
-dnl where wxWidgets libraries are installed (returned by
-dnl 'wx-config --libs' command) is in LD_LIBRARY_PATH or
-dnl equivalent variable and wxWidgets version is 2.6.0 or above.
-dnl ])
-dnl fi
-dnl
-dnl AM_PATH_WXRC([HAVE_WXRC=1], [HAVE_WXRC=0])
-dnl if test "x$HAVE_WXRC" != x1; then
-dnl AC_MSG_ERROR([
-dnl The wxrc program was not installed or not found.
-dnl
-dnl Please check the wxWidgets installation.
-dnl ])
-dnl fi
-dnl
-dnl CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
-dnl CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY"
-dnl CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
-dnl
-dnl LDFLAGS="$LDFLAGS $WX_LIBS"
-dnl ---------------------------------------------------------------------------
-
-
-
-dnl ---------------------------------------------------------------------------
-dnl AM_PATH_WXRC([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl
-dnl Test for wxWidgets' wxrc program for creating either C++, Python or XRS
-dnl resources. The variable WXRC will be set and substituted in the configure
-dnl script and Makefiles.
-dnl
-dnl Example use:
-dnl AM_PATH_WXRC([wxrc=1], [wxrc=0])
-dnl ---------------------------------------------------------------------------
-
-dnl
-dnl wxrc program from the wx-config script
-dnl
-AC_DEFUN([AM_PATH_WXRC],
-[
- AC_ARG_VAR([WXRC], [Path to wxWidget's wxrc resource compiler])
-
- if test "x$WX_CONFIG_NAME" = x; then
- AC_MSG_ERROR([The wxrc tests must run after wxWidgets test.])
- else
-
- AC_MSG_CHECKING([for wxrc])
-
- if test "x$WXRC" = x ; then
- dnl wx-config --utility is a new addition to wxWidgets:
- _WX_PRIVATE_CHECK_VERSION(2,5,3)
- if test -n "$wx_ver_ok"; then
- WXRC=`$WX_CONFIG_WITH_ARGS --utility=wxrc`
- fi
- fi
-
- if test "x$WXRC" = x ; then
- AC_MSG_RESULT([not found])
- ifelse([$2], , :, [$2])
- else
- AC_MSG_RESULT([$WXRC])
- ifelse([$1], , :, [$1])
- fi
-
- AC_SUBST(WXRC)
- fi
-])
Modified: trunk/jazz/config/ltmain.sh
===================================================================
--- trunk/jazz/config/ltmain.sh 2009-12-03 14:43:42 UTC (rev 738)
+++ trunk/jazz/config/ltmain.sh 2010-01-07 15:14:24 UTC (rev 739)
@@ -1,52 +1,83 @@
-# ltmain.sh - Provide generalized library-building support services.
-# NOTE: Changing this file will not affect anything until you rerun configure.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007 Free Software Foundation, Inc.
-# Originally by Gordon Matzigkeit <go...@gn...>, 1996
-#
-# This program is free software; you can redistribute it and/or modify
+# Generated from ltmain.m4sh.
+
+# ltmain.sh (GNU libtool) 2.2.6b
+# Written by Gordon Matzigkeit <go...@gn...>, 1996
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions. There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool 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
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with GNU Libtool; see the file COPYING. If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html,
+# or obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+# Usage: $progname [OPTION]... [MODE-ARG]...
#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
+# Provide generalized library-building support services.
+#
+# --config show all configuration variables
+# --debug enable verbose shell tracing
+# -n, --dry-run display commands without modifying any files
+# --features display basic configuration information and exit
+# --mode=MODE use operation mode MODE
+# --preserve-dup-deps don't remove duplicate dependency libraries
+# --quiet, --silent don't print informational messages
+# --tag=TAG use configuration variables from tag TAG
+# -v, --verbose print informational messages (default)
+# --version print version information
+# -h, --help print short or long help message
+#
+# MODE must be one of the following:
+#
+# clean remove files from the build directory
+# compile compile a source file into a libtool object
+# execute automatically set library path, then run a program
+# finish complete the installation of libtool libraries
+# install install libraries or executables
+# link create a library or an executable
+# uninstall remove libraries from an installed directory
+#
+# MODE-ARGS vary depending on the MODE.
+# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
+#
+# When reporting a bug, please describe a test case to reproduce it and
+# include the following information:
+#
+# host-triplet: $host
+# shell: $SHELL
+# compiler: $LTCC
+# compiler flags: $LTCFLAGS
+# linker: $LD (gnu? $with_gnu_ld)
+# $progname: (GNU libtool) 2.2.6b
+# automake: $automake_version
+# autoconf: $autoconf_version
+#
+# Report bugs to <bug...@gn...>.
-basename="s,^.*/,,g"
-
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
-# the _XPG environment variable is not equal to 1 (one), the special
-# positional parameter $0, within a function call, is the name of the
-# function.
-progpath="$0"
-
-# The name of this program:
-progname=`echo "$progpath" | $SED $basename`
-modename="$progname"
-
-# Global variables:
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
-
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION=1.5.24
-TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
+VERSION=2.2.6b
+TIMESTAMP=""
+package_revision=1.3017
-# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
@@ -60,99 +91,262 @@
BIN_SH=xpg4; export BIN_SH # for Tru64
DUALCASE=1; export DUALCASE # for MKS sh
-# Check that we have a working $echo.
-if test "X$1" = X--no-reexec; then
- # Discard the --no-reexec flag, and continue.
- shift
-elif test "X$1" = X--fallback-echo; then
- # Avoid inline document here, it may be left over
- :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
- # Yippee, $echo works!
- :
-else
- # Restart under the correct shell, and then maybe $echo will work.
- exec $SHELL "$progpath" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
- # used as fallback echo
- shift
- cat <<EOF
-$*
-EOF
- exit $EXIT_SUCCESS
-fi
-
-default_mode=
-help="Try \`$progname --help' for more information."
-magic="%%%MAGIC variable%%%"
-mkdir="mkdir"
-mv="mv -f"
-rm="rm -f"
-
-# Sed substitution that helps us do robust quoting. It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed="${SED}"' -e 1s/^X//'
-sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
- # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
- SP2NL='tr \040 \012'
- NL2SP='tr \015\012 \040\040'
- ;;
- *) # EBCDIC based system
- SP2NL='tr \100 \n'
- NL2SP='tr \r\n \100\100'
- ;;
-esac
-
-# NLS nuisances.
+# NLS nuisances: We save the old values to restore during execute mode.
# Only set LANG and LC_ALL to C if already set.
# These must not be set unconditionally because not all systems understand
# e.g. LANG=C (notably SCO).
-# We save the old values to restore during execute mode.
-for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+lt_user_locale=
+lt_safe_locale=
+for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
do
eval "if test \"\${$lt_var+set}\" = set; then
- save_$lt_var=\$$lt_var
- $lt_var=C
+ save_$lt_var=\$$lt_var
+ $lt_var=C
export $lt_var
+ lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"
+ lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
fi"
done
+$lt_unset CDPATH
+
+
+
+
+
+: ${CP="cp -f"}
+: ${ECHO="echo"}
+: ${EGREP="/bin/grep -E"}
+: ${FGREP="/bin/grep -F"}
+: ${GREP="/bin/grep"}
+: ${LN_S="ln -s"}
+: ${MAKE="make"}
+: ${MKDIR="mkdir"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+: ${SED="/bin/sed"}
+: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
+: ${Xsed="$SED -e 1s/^X//"}
+
+# Global variables:
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing.
+EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake.
+
+exit_status=$EXIT_SUCCESS
+
# Make sure IFS has a sensible default
lt_nl='
'
IFS=" $lt_nl"
-if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
- $echo "$modename: not configured to build any kind of library" 1>&2
- $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
- exit $EXIT_FAILURE
-fi
+dirname="s,/[^/]*$,,"
+basename="s,^.*/,,"
-# Global variables.
-mode=$default_mode
-nonopt=
-prev=
-prevopt=
-run=
-show="$echo"
-show_help=
-execute_dlfiles=
-duplicate_deps=no
-preserve_args=
-lo2o="s/\\.lo\$/.${objext}/"
-o2lo="s/\\.${objext}\$/.lo/"
-extracted_archives=
-extracted_serial=0
+# func_dirname_and_basename file append nondir_replacement
+# perform func_basename and func_dirname in a single function
+# call:
+# dirname: Compute the dirname of FILE. If nonempty,
+# add APPEND to the result, otherwise set result
+# to NONDIR_REPLACEMENT.
+# value returned in "$func_dirname_result"
+# basename: Compute filename of FILE.
+# value retuned in "$func_basename_result"
+# Implementation must be kept synchronized with func_dirname
+# and func_basename. For efficiency, we do not delegate to
+# those functions but instead duplicate the functionality here.
+func_dirname_and_basename ()
+{
+ # Extract subdirectory from the argument.
+ func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+ if test "X$func_dirname_result" = "X${1}"; then
+ func_dirname_result="${3}"
+ else
+ func_dirname_result="$func_dirname_result${2}"
+ fi
+ func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+}
-#####################################
-# Shell function definitions:
-# This seems to be the best place for them
+# Generated shell functions inserted here.
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath="$0"
+
+# The name of this program:
+# In the unlikely event $progname began with a '-', it would play havoc with
+# func_echo (imagine progname=-n), so we prepend ./ in that case:
+func_dirname_and_basename "$progpath"
+progname=$func_basename_result
+case $progname in
+ -*) progname=./$progname ;;
+esac
+
+# Make sure we have an absolute path for reexecution:
+case $progpath in
+ [\\/]*|[A-Za-z]:\\*) ;;
+ *[\\/]*)
+ progdir=$func_dirname_result
+ progdir=`cd "$progdir" && pwd`
+ progpath="$progdir/$progname"
+ ;;
+ *)
+ save_IFS="$IFS"
+ IFS=:
+ for progdir in $PATH; do
+ IFS="$save_IFS"
+ test -x "$progdir/$progname" && break
+ done
+ IFS="$save_IFS"
+ test -n "$progdir" || progdir=`pwd`
+ progpath="$progdir/$progname"
+ ;;
+esac
+
+# Sed substitution that helps us do robust quoting. It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed="${SED}"' -e 1s/^X//'
+sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Re-`\' parameter expansions in output of double_quote_subst that were
+# `\'-ed in input to the same. If an odd number of `\' preceded a '$'
+# in input to double_quote_subst, that '$' was protected from expansion.
+# Since each input `\' is now two `\'s, look for any number of runs of
+# four `\'s followed by two `\'s and then a '$'. `\' that '$'.
+bs='\\'
+bs2='\\\\'
+bs4='\\\\\\\\'
+dollar='\$'
+sed_double_backslash="\
+ s/$bs4/&\\
+/g
+ s/^$bs2$dollar/$bs&/
+ s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g
+ s/\n//g"
+
+# Standard options:
+opt_dry_run=false
+opt_help=false
+opt_quiet=false
+opt_verbose=false
+opt_warning=:
+
+# func_echo arg...
+# Echo program name prefixed message, along with the current mode
+# name if it has been set yet.
+func_echo ()
+{
+ $ECHO "$progname${mode+: }$mode: $*"
+}
+
+# func_verbose arg...
+# Echo program name prefixed message in verbose mode only.
+func_verbose ()
+{
+ $opt_verbose && func_echo ${1+"$@"}
+
+ # A bug in bash halts the script if the last line of a function
+ # fails when set -e is in force, so we need another command to
+ # work around that:
+ :
+}
+
+# func_error arg...
+# Echo program name prefixed message to standard error.
+func_error ()
+{
+ $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
+}
+
+# func_warning arg...
+# Echo program name prefixed warning message to standard error.
+func_warning ()
+{
+ $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
+
+ # bash bug again:
+ :
+}
+
+# func_fatal_error arg...
+# Echo program name prefixed message to standard error, and exit.
+func_fatal_error ()
+{
+ func_error ${1+"$@"}
+ exit $EXIT_FAILURE
+}
+
+# func_fatal_help arg...
+# Echo program name prefixed message to standard error, followed by
+# a help hint, and exit.
+func_fatal_help ()
+{
+ func_error ${1+"$@"}
+ func_fatal_error "$help"
+}
+help="Try \`$progname --help' for more information." ## default
+
+
+# func_grep expression filename
+# Check whether EXPRESSION matches any line of FILENAME, without output.
+func_grep ()
+{
+ $GREP "$1" "$2" >/dev/null 2>&1
+}
+
+
+# func_mkdir_p directory-path
+# Make sure the entire path to DIRECTORY-PATH is available.
+func_mkdir_p ()
+{
+ my_directory_path="$1"
+ my_dir_list=
+
+ if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
+
+ # Protect directory names starting with `-'
+ case $my_directory_path in
+ -*) my_directory_path="./$my_directory_path" ;;
+ esac
+
+ # While some portion of DIR does not yet exist...
+ while test ! -d "$my_directory_path"; do
+ # ...make a list in topmost first order. Use a colon delimited
+ # list incase some portion of path contains whitespace.
+ my_dir_list="$my_directory_path:$my_dir_list"
+
+ # If the last portion added has no slash in it, the list is done
+ case $my_directory_path in */*) ;; *) break ;; esac
+
+ # ...otherwise throw away the child directory and loop
+ my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`
+ done
+ my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`
+
+ save_mkdir_p_IFS="$IFS"; IFS=':'
+ for my_dir in $my_dir_list; do
+ IFS="$save_mkdir_p_IFS"
+ # mkdir can fail with a `File exist' error if two processes
+ # try to create one of the directories concurrently. Don't
+ # stop in that case!
+ $MKDIR "$my_dir" 2>/dev/null || :
+ done
+ IFS="$save_mkdir_p_IFS"
+
+ # Bail out if we (or some other process) failed to create a directory.
+ test -d "$my_directory_path" || \
+ func_fatal_error "Failed to create \`$1'"
+ fi
+}
+
+
# func_mktempdir [string]
# Make a temporary directory that won't clash with other running
# libtool processes, and avoids race conditions if possible. If
@@ -161,7 +355,7 @@
{
my_template="${TMPDIR-/tmp}/${1-$progname}"
- if test "$run" = ":"; then
+ if test "$opt_dry_run" = ":"; then
# Return a directory name, but don't create it in dry-run mode
my_tmpdir="${my_template}-$$"
else
@@ -170,486 +364,743 @@
my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
if test ! -d "$my_tmpdir"; then
- # Failing that, at least try and use $RANDOM to avoid a race
- my_tmpdir="${my_template}-${RANDOM-0}$$"
+ # Failing that, at least try and use $RANDOM to avoid a race
+ my_tmpdir="${my_template}-${RANDOM-0}$$"
- save_mktempdir_umask=`umask`
- umask 0077
- $mkdir "$my_tmpdir"
- umask $save_mktempdir_umask
+ save_mktempdir_umask=`umask`
+ umask 0077
+ $MKDIR "$my_tmpdir"
+ umask $save_mktempdir_umask
fi
# If we're not in dry-run mode, bomb out on failure
- test -d "$my_tmpdir" || {
- $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2
- exit $EXIT_FAILURE
- }
+ test -d "$my_tmpdir" || \
+ func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
fi
- $echo "X$my_tmpdir" | $Xsed
+ $ECHO "X$my_tmpdir" | $Xsed
}
-# func_win32_libid arg
-# return the library type of file 'arg'
-#
-# Need a lot of goo to handle *both* DLLs and import libs
-# Has to be a shell function in order to 'eat' the argument
-# that is supplied when $file_magic_command is called.
-func_win32_libid ()
+# func_quote_for_eval arg
+# Aesthetically quote ARG to be evaled later.
+# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT
+# is double-quoted, suitable for a subsequent eval, whereas
+# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters
+# which are still active within double quotes backslashified.
+func_quote_for_eval ()
{
- win32_libid_type="unknown"
- win32_fileres=`file -L $1 2>/dev/null`
- case $win32_fileres in
- *ar\ archive\ import\ library*) # definitely import
- win32_libid_type="x86 archive import"
- ;;
- *ar\ archive*) # could be an import, or static
- if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
- $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
- win32_nmres=`eval $NM -f posix -A $1 | \
- $SED -n -e '1,100{
- / I /{
- s,.*,import,
- p
- q
- }
- }'`
- case $win32_nmres in
- import*) win32_libid_type="x86 archive import";;
- *) win32_libid_type="x86 archive static";;
- esac
- fi
- ;;
- *DLL*)
- win32_libid_type="x86 DLL"
- ;;
- *executable*) # but shell scripts are "executable" too...
- case $win32_fileres in
- *MS\ Windows\ PE\ Intel*)
- win32_libid_type="x86 DLL"
- ;;
+ case $1 in
+ *[\\\`\"\$]*)
+ func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;
+ *)
+ func_quote_for_eval_unquoted_result="$1" ;;
esac
- ;;
- esac
- $echo $win32_libid_type
+
+ case $func_quote_for_eval_unquoted_result in
+ # Double-quote args containing shell metacharacters to delay
+ # word splitting, command substitution and and variable
+ # expansion for a subsequent eval.
+ # Many Bourne shells cannot handle close brackets correctly
+ # in scan sets, so we specify it separately.
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""
+ ;;
+ *)
+ func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"
+ esac
}
-# func_infer_tag arg
-# Infer tagged configuration to use if any are available and
-# if one wasn't chosen via the "--tag" command line option.
-# Only attempt this if the compiler in the base compile
-# command doesn't match the default compiler.
-# arg is usually of the form 'gcc ...'
-func_infer_tag ()
+# func_quote_for_expand arg
+# Aesthetically quote ARG to be evaled later; same as above,
+# but do not quote variable references.
+func_quote_for_expand ()
{
- if test -n "$available_tags" && test -z "$tagname"; then
- CC_quoted=
- for arg in $CC; do
- case $arg in
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
- arg="\"$arg\""
- ;;
- esac
- CC_quoted="$CC_quoted $arg"
- done
- case $@ in
- # Blanks in the command may have been stripped by the calling shell,
- # but not from the CC environment variable when configure was run.
- " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
- # Blanks at the start of $base_compile will cause this to fail
- # if we don't check for them as well.
+ case $1 in
+ *[\\\`\"]*)
+ my_arg=`$ECHO "X$1" | $Xsed \
+ -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
*)
- for z in $available_tags; do
- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
- # Evaluate the configuration.
- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
- CC_quoted=
- for arg in $CC; do
- # Double-quote args containing other shell metacharacters.
- case $arg in
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
- arg="\"$arg\""
- ;;
- esac
- CC_quoted="$CC_quoted $arg"
- done
- case "$@ " in
- " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
- # The compiler in the base compile command matches
- # the one in the tagged configuration.
- # Assume this is the tagged configuration we want.
- tagname=$z
- break
- ;;
- esac
- fi
- done
- # If $tagname still isn't set, then no tagged configuration
- # was found and let the user know that the "--tag" command
- # line option must be used.
- if test -z "$tagname"; then
- $echo "$modename: unable to infer tagged configuration"
- $echo "$modename: specify a tag with \`--tag'" 1>&2
- exit $EXIT_FAILURE
-# else
-# $echo "$modename: using $tagname tagged configuration"
- fi
- ;;
- esac
- fi
+ my_arg="$1" ;;
+ esac
+
+ case $my_arg in
+ # Double-quote args containing shell metacharacters to delay
+ # word splitting and command substitution for a subsequent eval.
+ # Many Bourne shells cannot handle close brackets correctly
+ # in scan sets, so we specify it separately.
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ my_arg="\"$my_arg\""
+ ;;
+ esac
+
+ func_quote_for_expand_result="$my_arg"
}
-# func_extract_an_archive dir oldlib
-func_extract_an_archive ()
+# func_show_eval cmd [fail_exp]
+# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is
+# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it.
+func_show_eval ()
{
- f_ex_an_ar_dir="$1"; shift
- f_ex_an_ar_oldlib="$1"
+ my_cmd="$1"
+ my_fail_exp="${2-:}"
- $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
- $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
- if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
- :
- else
- $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
- exit $EXIT_FAILURE
+ ${opt_silent-false} || {
+ func_quote_for_expand "$my_cmd"
+ eval "func_echo $func_quote_for_expand_result"
+ }
+
+ if ${opt_dry_run-false}; then :; else
+ eval "$my_cmd"
+ my_status=$?
+ if test "$my_status" -eq 0; then :; else
+ eval "(exit $my_status); $my_fail_exp"
+ fi
fi
}
-# func_extract_archives gentop oldlib ...
-func_extract_archives ()
+
+# func_show_eval_locale cmd [fail_exp]
+# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is
+# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it. Use the saved locale for evaluation.
+func_show_eval_locale ()
{
- my_gentop="$1"; shift
- my_oldlibs=${1+"$@"}
- my_oldobjs=""
- my_xlib=""
- my_xabs=""
- my_xdir=""
- my_status=""
+ my_cmd="$1"
+ my_fail_exp="${2-:}"
- $show "${rm}r $my_gentop"
- $run ${rm}r "$my_gentop"
- $show "$mkdir $my_gentop"
- $run $mkdir "$my_gentop"
- my_status=$?
- if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
- exit $my_status
+ ${opt_silent-false} || {
+ func_quote_for_expand "$my_cmd"
+ eval "func_echo $func_quote_for_expand_result"
+ }
+
+ if ${opt_dry_run-false}; then :; else
+ eval "$lt_user_locale
+ $my_cmd"
+ my_status=$?
+ eval "$lt_safe_locale"
+ if test "$my_status" -eq 0; then :; else
+ eval "(exit $my_status); $my_fail_exp"
+ fi
fi
+}
- for my_xlib in $my_oldlibs; do
- # Extract the objects.
- case $my_xlib in
- [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
- *) my_xabs=`pwd`"/$my_xlib" ;;
- esac
- my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
- my_xlib_u=$my_xlib
- while :; do
- case " $extracted_archives " in
- *" $my_xlib_u "*)
- extracted_serial=`expr $extracted_serial + 1`
- my_xlib_u=lt$extracted_serial-$my_xlib ;;
- *) break ;;
- esac
- done
- extracted_archives="$extracted_archives $my_xlib_u"
- my_xdir="$my_gentop/$my_xlib_u"
- $show "${rm}r $my_xdir"
- $run ${rm}r "$my_xdir"
- $show "$mkdir $my_xdir"
- $run $mkdir "$my_xdir"
- exit_status=$?
- if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then
- exit $exit_status
- fi
- case $host in
- *-darwin*)
- $show "Extracting $my_xabs"
- # Do not bother doing anything if just a dry run
- if test -z "$run"; then
- darwin_orig_dir=`pwd`
- cd $my_xdir || exit $?
- darwin_archive=$my_xabs
- darwin_curdir=`pwd`
- darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
- darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
- if test -n "$darwin_arches"; then
- darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
- darwin_arch=
- $show "$darwin_base_archive has multiple architectures $darwin_arches"
- for darwin_arch in $darwin_arches ; do
- mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
- lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
- cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
- func_extract_an_archive "`pwd`" "${darwin_base_archive}"
- cd "$darwin_curdir"
- $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
- done # $darwin_arches
- ## Okay now we have a bunch of thin objects, gotta fatten them up :)
- darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
- darwin_file=
- darwin_files=
- for darwin_file in $darwin_filelist; do
- darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
- lipo -create -output "$darwin_file" $darwin_files
- done # $darwin_filelist
- ${rm}r unfat-$$
- cd "$darwin_orig_dir"
- else
- cd "$darwin_orig_dir"
- func_extract_an_archive "$my_xdir" "$my_xabs"
- fi # $darwin_arches
- fi # $run
- ;;
- *)
- func_extract_an_archive "$my_xdir" "$my_xabs"
- ;;
- esac
- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
- done
- func_extract_archives_result="$my_oldobjs"
+
+
+
+# func_version
+# Echo version message to standard output and exit.
+func_version ()
+{
+ $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
+ s/^# //
+ s/^# *$//
+ s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
+ p
+ }' < "$progpath"
+ exit $?
}
-# End of Shell function definitions
-#####################################
-# Darwin sucks
-eval std_shrext=\"$shrext_cmds\"
+# func_usage
+# Echo short help message to standard output and exit.
+func_usage ()
+{
+ $SED -n '/^# Usage:/,/# -h/ {
+ s/^# //
+ s/^# *$//
+ s/\$progname/'$progname'/
+ p
+ }' < "$progpath"
+ $ECHO
+ $ECHO "run \`$progname --help | more' for full usage"
+ exit $?
+}
-disable_libs=no
+# func_help
+# Echo long help message to standard output and exit.
+func_help ()
+{
+ $SED -n '/^# Usage:/,/# Report bugs to/ {
+ s/^# //
+ s/^# *$//
+ s*\$progname*'$progname'*
+ s*\$host*'"$host"'*
+ s*\$SHELL*'"$SHELL"'*
+ s*\$LTCC*'"$LTCC"'*
+ s*\$LTCFLAGS*'"$LTCFLAGS"'*
+ s*\$LD*'"$LD"'*
+ s/\$with_gnu_ld/'"$with_gnu_ld"'/
+ s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
+ s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
+ p
+ }' < "$progpath"
+ exit $?
+}
-# Parse our command line options once, thoroughly.
-while test "$#" -gt 0
-do
- arg="$1"
+# func_missing_arg argname
+# Echo program name prefixed message to standard error and set global
+# exit_cmd.
+func_missing_arg ()
+{
+ func_error "missing argument for $1"
+ exit_cmd=exit
+}
+
+exit_cmd=:
+
+
+
+
+
+# Check that we have a working $ECHO.
+if test "X$1" = X--no-reexec; then
+ # Discard the --no-reexec flag, and continue.
shift
+elif test "X$1" = X--fallback-echo; then
+ # Avoid inline document here, it may be left over
+ :
+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
+ # Yippee, $ECHO works!
+ :
+else
+ # Restart under the correct shell, and then maybe $ECHO will work.
+ exec $SHELL "$progpath" --no-reexec ${1+"$@"}
+fi
- case $arg in
- -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
- *) optarg= ;;
- esac
+if test "X$1" = X--fallback-echo; then
+ # used as fallback echo
+ shift
+ cat <<EOF
+$*
+EOF
+ exit $EXIT_SUCCESS
+fi
- # If the previous option needs an argument, assign it.
- if test -n "$prev"; then
- case $prev in
- execute_dlfiles)
- execute_dlfiles="$execute_dlfiles $arg"
- ;;
- tag)
- tagname="$arg"
- preserve_args="${preserve_args}=$arg"
+magic="%%%MAGIC variable%%%"
+magic_exe="%%%MAGIC EXE variable%%%"
- # Check whether tagname contains only valid characters
- case $tagname in
- *[!-_A-Za-z0-9,/]*)
- $echo "$progname: invalid tag name: $tagname" 1>&2
- exit $EXIT_FAILURE
- ;;
- esac
+# Global variables.
+# $mode is unset
+nonopt=
+execute_dlfiles=
+preserve_args=
+lo2o="s/\\.lo\$/.${objext}/"
+o2lo="s/\\.${objext}\$/.lo/"
+extracted_archives=
+extracted_serial=0
- case $tagname in
- CC)
- # Don't test for the "default" C tag, as we know, it's there, but
- # not specially marked.
- ;;
- *)
- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
- taglist="$taglist $tagname"
- # Evaluate the configuration.
- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
- else
- $echo "$progname: ignoring unknown tag $tagname" 1>&2
- fi
- ;;
- esac
- ;;
- *)
- eval "$prev=\$arg"
- ;;
- esac
+opt_dry_run=false
+opt_duplicate_deps=false
+opt_silent=false
+opt_debug=:
- prev=
- prevopt=
- continue
- fi
+# If this variable is set in any of the actions, the command in it
+# will be execed at the end. This prevents here-documents from being
+# left over by shells.
+exec_cmd=
- # Have we seen a non-optional argument yet?
- case $arg in
- --help)
- show_help=yes
- ;;
+# func_fatal_configuration arg...
+# Echo program name prefixed message to standard error, followed by
+# a configuration failure hint, and exit.
+func_fatal_configuration ()
+{
+ func_error ${1+"$@"}
+ func_error "See the $PACKAGE documentation for more information."
+ func_fatal_error "Fatal configuration error."
+}
- --version)
- echo "\
-$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
-Copyright (C) 2007 Free Software Foundation, Inc.
-This is free software; see the source for copying conditions. There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
- exit $?
- ;;
+# func_config
+# Display the configuration for all the tags in this script.
+func_config ()
+{
+ re_begincf='^# ### BEGIN LIBTOOL'
+ re_endcf='^# ### END LIBTOOL'
- --config)
- ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
+ # Default configuration.
+ $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath"
+
# Now print the configurations for the tags.
for tagname in $taglist; do
- ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
+ $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath"
done
+
exit $?
- ;;
+}
- --debug)
- $echo "$progname: enabling shell trace mode"
- set -x
- preserve_args="$preserve_args $arg"
- ;;
-
- --dry-run | -n)
- run=:
- ;;
-
- --features)
- $echo "host: $host"
+# func_features
+# Display the features supported by this script.
+func_features ()
+{
+ $ECHO "host: $host"
if test "$build_libtool_libs" = yes; then
- $echo "enable shared libraries"
+ $ECHO "enable shared libraries"
else
- $echo "disable shared libraries"
+ $ECHO "disable shared libraries"
fi
if test "$build_old_libs" = yes; then
- $echo "enable static libraries"
+ $ECHO "enable static libraries"
else
- $echo "disable static libraries"
+ $ECHO "disable static libraries"
fi
+
exit $?
- ;;
+}
- --finish) mode="finish" ;;
+# func_enable_tag tagname
+# Verify that TAGNAME is valid, and either flag an error and exit, or
+# enable the TAGNAME tag. We also add TAGNAME to the global $taglist
+# variable here.
+func_enable_tag ()
+{
+ # Global variable:
+ tagname="$1"
- --mode) prevopt="--mode" prev=mode ;;
- --mode=*) mode="$optarg" ;;
+ re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
+ re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
+ sed_extractcf="/$re_begincf/,/$re_endcf/p"
- --preserve-dup-deps) duplicate_deps="yes" ;;
+ # Validate tagname.
+ case $tagname in
+ *[!-_A-Za-z0-9,/]*)
+ func_fatal_error "invalid tag name: $tagname"
+ ;;
+ esac
- --quiet | --silent)
- show=:
- preserve_args="$preserve_args $arg"
- ;;
+ # Don't test for the "default" C tag, as we know it's
+ # there but not specially marked.
+ case $tagname in
+ CC) ;;
+ *)
+ if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
+ taglist="$taglist $tagname"
- --tag)
- prevopt="--tag"
- prev=tag
- preserve_args="$preserve_args --tag"
+ # Evaluate the configuration. Be careful to quote the path
+ # and the sed script, to avoid splitting on whitespace, but
+ # also don't use non-portable quotes within backquotes within
+ # quotes we have to do it in 2 steps:
+ extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
+ eval "$extractedcf"
+ else
+ func_error "ignoring unknown tag $tagname"
+ fi
+ ;;
+ esac
+}
+
+# Parse options once, thoroughly. This comes as soon as possible in
+# the script to make things like `libtool --version' happen quickly.
+{
+
+ # Shorthand for --mode=foo, only valid as the first argument
+ case $1 in
+ clean|clea|cle|cl)
+ shift; set dummy --mode clean ${1+"$@"}; shift
;;
- --tag=*)
- set tag "$optarg" ${1+"$@"}
- shift
- prev=tag
- preserve_args="$preserve_args --tag"
+ compile|compil|compi|comp|com|co|c)
+ shift; set dummy --mode compile ${1+"$@"}; shift
;;
-
- -dlopen)
- prevopt="-dlopen"
- prev=execute_dlfiles
+ execute|execut|execu|exec|exe|ex|e)
+ shift; set dummy --mode execute ${1+"$@"}; shift
;;
-
- -*)
- $echo "$modename: unrecognized option \`$arg'" 1>&2
- $echo "$help" 1>&2
- exit $EXIT_FAILURE
+ finish|finis|fini|fin|fi|f)
+ shift; set dummy --mode finish ${1+"$@"}; shift
;;
-
- *)
- nonopt="$arg"
- break
+ install|instal|insta|inst|ins|in|i)
+ shift; set dummy --mode install ${1+"$@"}; shift
;;
+ link|lin|li|l)
+ shift; set dummy --mode link ${1+"$@"}; shift
+ ;;
+ uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+ shift; set dummy --mode uninstall ${1+"$@"}; shift
+ ;;
esac
-done
-if test -n "$prevopt"; then
- $echo "$modename: option \`$prevopt' requires an argument" 1>&2
- $echo "$help" 1>&2
- exit $EXIT_FAILURE
-fi
+ # Parse non-mode specific arguments:
+ while test "$#" -gt 0; do
+ opt="$1"
+ shift
-case $disable_libs in
-no)
- ;;
-shared)
- build_libtool_libs=no
- build_old_libs=yes
- ;;
-static)
- build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
- ;;
-esac
+ case $opt in
+ --config) func_config ;;
-# If this variable is set in any of the actions, the command in it
-# will be execed at the end. This prevents here-documents from being
-# left over by shells.
-exec_cmd=
+ --debug) preserve_args="$preserve_args $opt"
+ func_echo "enabling shell trace mode"
+ opt_debug='set -x'
+ $opt_debug
+ ;;
-if test -z "$show_help"; then
+ -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break
+ execute_dlfiles="$execute_dlfiles $1"
+ shift
+ ;;
- # Infer the operation mode.
- if test -z "$mode"; then
- $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
- $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
- case $nonopt in
- *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
- mode=link
- for arg
- do
- case $arg in
- -c)
- mode=compile
- break
- ;;
- esac
- done
+ --dry-run | -n) opt_dry_run=: ;;
+ --features) func_features ;;
+ --finish) mode="finish" ;;
+
+ --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break
+ case $1 in
+ # Valid mode arguments:
+ clean) ;;
+ compile) ;;
+ execute) ;;
+ finish) ;;
+ install) ;;
+ link) ;;
+ relink) ;;
+ uninstall) ;;
+
+ # Catch anything else as an error
+ *) func_error "invalid argument for $opt"
+ exit_cmd=exit
+ break
+ ;;
+ esac
+
+ mode="$1"
+ shift
+ ;;
+
+ --preserve-dup-deps)
+ opt_duplicate_deps=: ;;
+
+ --quiet|--silent) preserve_args="$preserve_args $opt"
+ opt_silent=:
+ ;;
+
+ --verbose| -v) preserve_args="$preserve_args $opt"
+ opt_silent=false
+ ;;
+
+ --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break
+ preserve_args="$preserve_args $opt $1"
+ func_enable_tag "$1" # tagname is set here
+ shift
+ ;;
+
+ # Separate optargs to long options:
+ -dlopen=*|--mode=*|--tag=*)
+ func_opt_split "$opt"
+ set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
+ shift
+ ;;
+
+ -\?|-h) func_usage ;;
+ --help) opt_help=: ;;
+ --version) func_version ;;
+
+ -*) func_fatal_help "unrecognized option \`$opt'" ;;
+
+ *) nonopt="$opt"
+ break
+ ;;
+ esac
+ done
+
+
+ case $host in
+ *cygwin* | *mingw* | *pw32* | *cegcc*)
+ # don't eliminate duplications in $postdeps and $predeps
+ opt_duplicate_compiler_generated_deps=:
;;
- *db | *dbx | *strace | *truss)
- mode=execute
+ *)
+ opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
;;
- *install*|cp|mv)
- mode=install
- ;;
- *rm)
- mode=uninstall
- ;;
- *)
- # If we have no mode, but dlfiles were specified, then do execute mode.
- test -n "$execute_dlfiles" && mode=execute
+ esac
- # Just use the default operation mode.
- if test -z "$mode"; then
- if test -n "$nonopt"; then
- $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
- else
- $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
- fi
+ # Having warned about all mis-specified options, bail out if
+ # anything was wrong.
+ $exit_cmd $EXIT_FAILURE
+}
+
+# func_check_version_match
+# Ensure that we are using m4 macros, and libtool script from the same
+# release of libtool.
+func_check_version_match ()
+{
+ if test "$package_revision" != "$macro_revision"; then
+ if test "$VERSION" != "$macro_version"; then
+ if test -z "$macro_version"; then
+ cat >&2 <<_LT_EOF
+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from an older release.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+ else
+ cat >&2 <<_LT_EOF
+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
fi
- ;;
- esac
+ else
+ cat >&2 <<_LT_EOF
+$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
+$progname: but the definition of this LT_INIT comes from revision $macro_revision.
+$progname: You should recreate aclocal.m4 with macros from revision $package_revision
+$progname: of $PACKAGE $VERSION and run autoconf again.
+_LT_EOF
+ fi
+
+ exit $EXIT_MISMATCH
fi
+}
+
+## ----------- ##
+## Main. ##
+## ----------- ##
+
+$opt_help || {
+ # Sanity checks first:
+ func_check_version_match
+
+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+ func_fatal_configuration "not configured to build any kind of library"
+ fi
+
+ test -z "$mode" && func_fatal_error "error: you must specify a MODE."
+
+
+ # Darwin sucks
+ eval std_shrext=\"$shrext_cmds\"
+
+
# Only execute mode is allowed to have -dlopen flags.
if test -n "$execute_dlfiles" && test "$mode" != execute; then
- $echo "$modename: unrecognized option \`-dlopen'" 1>&2
- $echo "$help" 1>&2
+ func_error "unrecognized option \`-dlopen'"
+ $ECHO "$help" 1>&2
exit $EXIT_FAILURE
fi
# Change the help message to a mode-specific one.
generic_help="$help"
- help="Try \`$modename --help --mode=$mode' for more information."
+ help="Try \`$progname --help --mode=$mode' for more information."
+}
- # These modes are in order of execution frequency so that they run quickly.
- case $mode in
- # libtool compile mode
- compile)
- modename="$modename: compile"
+
+# func_lalib_p file
+# True iff FILE is a libtool `.la' library or `.lo' object file.
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_lalib_p ()
+{
+ test -f "$1" &&
+ $SED -e 4q "$1" 2>/dev/null \
+ | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+}
+
+# func_lalib_unsafe_p file
+# True iff FILE is a libtool `.la' library or `.lo' object file.
+# This function implements the same check as func_lalib_p without
+# resorting to external programs. To this end, it redirects stdin and
+# closes it afterwards, without saving the original file descriptor.
+# As a safety measure, use it only where a negative result would be
+# fatal anyway. Works if `file' does not exist.
+func_lalib_unsafe_p ()
+{
+ lalib_p=no
+ if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then
+ for lalib_p_l in 1 2 3 4
+ do
+ read lalib_p_line
+ case "$lalib_p_line" in
+ \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
+ esac
+ done
+ exec 0<&5 5<&-
+ fi
+ test "$lalib_p" = yes
+}
+
+# func_ltwrapper_script_p file
+# True iff FILE is a libtool wrapper script
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_script_p ()
+{
+ func_lalib_p "$1"
+}
+
+# func_ltwrapper_executable_p file
+# True iff FILE is a libtool wrapper executable
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_executable_p ()
+{
+ func_ltwrapper_exec_suffix=
+ case $1 in
+ *.exe) ;;
+ *) func_ltwrapper_exec_suffix=.exe ;;
+ esac
+ $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1
+}
+
+# func_ltwrapper_scriptname file
+# Assumes file is an ltwrapper_executable
+# uses $file to determine the appropriate filename for a
+# temporary ltwrapper_script.
+func_ltwrapper_scriptname ()
+{
+ func_ltwrapper_scriptname_result=""
+ if func_ltwrapper_executable_p "$1"; then
+ func_dirname_and_basename "$1" "" "."
+ func_stripname '' '.exe' "$func_basename_result"
+ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
+ fi
+}
+
+# func_ltwrapper_p file
+# True iff FILE is a libtool wrapper script or wrapper executable
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_p ()
+{
+ func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1"
+}
+
+
+# func_execute_cmds commands fail_cmd
+# Execute tilde-delimited COMMANDS.
+# If FAIL_CMD is given, eval that upon failure.
+# FAIL_CMD may read-access the current command in variable CMD!
+func_execute_cmds ()
+{
+ $opt_debug
+ save_ifs=$IFS; IFS='~'
+ for cmd in $1; do
+ IFS=$save_ifs
+ eval cmd=\"$cmd\"
+ func_show_eval "$cmd" "${2-:}"
+ done
+ IFS=$save_ifs
+}
+
+
+# func_source file
+# Source FILE, adding directory component if necessary.
+# Note that it is not necessary on cygwin/mingw to append a dot to
+# FILE even if both FILE and FILE.exe exist: automatic-append-.exe
+# behavior happens only for exec(3), not for open(2)! Also, sourcing
+# `FILE.' does not work on cygwin managed mounts.
+func_source ()
+{
+ $opt_debug
+ case $1 in
+ */* | *\\*) . "$1" ;;
+ *) . "./$1" ;;
+ esac
+}
+
+
+# func_infer_tag arg
+# Infer tagged configuration to use if any are available and
+# if one wasn't chosen via the "--tag" command line option.
+# Only attempt this if the compiler in the base compile
+# command doesn't match the default compiler.
+# arg is usually of the form 'gcc ...'
+func_infer_tag ()
+{
+ $opt_debug
+ if test -n "$available_tags" && test -z "$tagname"; then
+ CC_quoted=
+ for arg in $CC; do
+ func_quote_for_eval "$arg"
+ CC_quoted="$CC_quoted $func_quote_for_eval_result"
+ done
+ case $@ in
+ # Blanks in the command may have been stripped by the calling shell,
+ # but not from the CC environment variable when configure was run.
+ " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;;
+ # Blanks at the start of $base_compile will cause this to fail
+ # if we don't check for them as well.
+ *)
+ for z in $available_tags; do
+ i...
[truncated message content] |
|
From: <pst...@us...> - 2009-12-03 14:43:54
|
Revision: 738
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=738&view=rev
Author: pstieber
Date: 2009-12-03 14:43:42 +0000 (Thu, 03 Dec 2009)
Log Message:
-----------
Updated the autotools setup.
Modified Paths:
--------------
tex2rtf/Makefile.am
tex2rtf/config/ltmain.sh
tex2rtf/configure.ac
Added Paths:
-----------
tex2rtf/m4/
tex2rtf/m4/acinclude.m4
tex2rtf/m4/libtool.m4
tex2rtf/m4/ltoptions.m4
tex2rtf/m4/ltsugar.m4
tex2rtf/m4/ltversion.m4
tex2rtf/m4/lt~obsolete.m4
Removed Paths:
-------------
tex2rtf/config/acinclude.m4
Modified: tex2rtf/Makefile.am
===================================================================
--- tex2rtf/Makefile.am 2009-10-20 14:29:05 UTC (rev 737)
+++ tex2rtf/Makefile.am 2009-12-03 14:43:42 UTC (rev 738)
@@ -1,5 +1,5 @@
## Process this file with automake to produce Makefile.in
-ACLOCAL_FLAGS=-I config
+ACLOCAL_AMFLAGS=-I m4
SUBDIRS = src
Deleted: tex2rtf/config/acinclude.m4
===================================================================
--- tex2rtf/config/acinclude.m4 2009-10-20 14:29:05 UTC (rev 737)
+++ tex2rtf/config/acinclude.m4 2009-12-03 14:43:42 UTC (rev 738)
@@ -1,230 +0,0 @@
-dnl ---------------------------------------------------------------------------
-dnl Macros for the Jazz++ application configure.ac
-dnl ---------------------------------------------------------------------------
-
-dnl ---------------------------------------------------------------------------
-dnl Macros for wxWidgets detection. Typically used in configure.in as:
-dnl
-dnl AC_ARG_ENABLE(...)
-dnl AC_ARG_WITH(...)
-dnl ...
-dnl AM_OPTIONS_WXCONFIG
-dnl ...
-dnl ...
-dnl AM_PATH_WXCONFIG(2.8.7, wxWin=1)
-dnl if test "$wxWin" != 1; then
-dnl AC_MSG_ERROR([
-dnl wxWidgets must be installed on your system, but
-dnl the wx-config script couldn't be found.
-dnl
-dnl Please check that wx-config is in path, the directory
-dnl where wxWidgets libraries are installed (returned by
-dnl 'wx-config --libs' command) is in LD_LIBRARY_PATH or
-dnl equivalent variable and wxWidgets version is 2.8.7 or above.
-dnl ])
-dnl fi
-dnl CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
-dnl CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY"
-dnl CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
-dnl
-dnl LDFLAGS="$LDFLAGS $WX_LIBS"
-dnl ---------------------------------------------------------------------------
-
-dnl ---------------------------------------------------------------------------
-dnl AM_OPTIONS_WXCONFIG
-dnl
-dnl adds support for --wx-prefix, --wx-exec-prefix and --wx-config
-dnl command line options
-dnl ---------------------------------------------------------------------------
-
-AC_DEFUN([AM_OPTIONS_WXCONFIG],
-[
- AC_ARG_WITH(wx-prefix, [ --with-wx-prefix=PREFIX Prefix where wxWidgets is installed (optional)],
- wx_config_prefix="$withval", wx_config_prefix="")
- AC_ARG_WITH(wx-exec-prefix,[ --with-wx-exec-prefix=PREFIX Exec prefix where wxWidgets is installed (optional)],
- wx_config_exec_prefix="$withval", wx_config_exec_prefix="")
- AC_ARG_WITH(wx-config,[ --with-wx-config=CONFIG wx-config script to use (optional)],
- wx_config_name="$withval", wx_config_name="")
-])
-
-dnl ---------------------------------------------------------------------------
-dnl AM_PATH_WXCONFIG(VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl
-dnl Test for wxWidgets, and define WX_C*FLAGS, WX_LIBS and WX_LIBS_STATIC
-dnl (the latter is for static linking against wxWidgets). Set WX_CONFIG_NAME
-dnl environment variable to override the default name of the wx-config script
-dnl to use. Set WX_CONFIG_PATH to specify the full path to wx-config - in this
-dnl case the macro won't even waste time on tests for its existence.
-dnl ---------------------------------------------------------------------------
-
-dnl
-dnl Get the cflags and libraries from the wx-config script
-dnl
-AC_DEFUN([AM_PATH_WXCONFIG],
-[
- dnl do we have wx-config name: it can be wx-config or wxd-config or ...
- if test x${WX_CONFIG_NAME+set} != xset ; then
- WX_CONFIG_NAME=wx-config
- fi
- if test "x$wx_config_name" != x ; then
- WX_CONFIG_NAME="$wx_config_name"
- fi
-
- dnl deal with optional prefixes
- if test x$wx_config_exec_prefix != x ; then
- wx_config_args="$wx_config_args --exec-prefix=$wx_config_exec_prefix"
- WX_LOOKUP_PATH="$wx_config_exec_prefix/bin"
- fi
- if test x$wx_config_prefix != x ; then
- wx_config_args="$wx_config_args --prefix=$wx_config_prefix"
- WX_LOOKUP_PATH="$WX_LOOKUP_PATH:$wx_config_prefix/bin"
- fi
-
- dnl don't search the PATH if WX_CONFIG_NAME is absolute filename
- if test -x "$WX_CONFIG_NAME" ; then
- AC_MSG_CHECKING(for wx-config)
- WX_CONFIG_PATH="$WX_CONFIG_NAME"
- AC_MSG_RESULT($WX_CONFIG_PATH)
- else
-dnl AC_PATH_PROG(WX_CONFIG_PATH, $WX_CONFIG_NAME, no, "$WX_LOOKUP_PATH:$PATH")
- AC_PATH_PROG(WX_CONFIG_PATH, $WX_CONFIG_NAME, no)
- fi
-
- if test "$WX_CONFIG_PATH" != "no" ; then
- WX_VERSION=""
- no_wx=""
-
- min_wx_version=ifelse([$1], ,2.2.1,$1)
- AC_MSG_CHECKING(for wxWidgets version >= $min_wx_version)
-
- WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args"
-
- WX_VERSION=`$WX_CONFIG_WITH_ARGS --version`
- wx_config_major_version=`echo $WX_VERSION | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
- wx_config_minor_version=`echo $WX_VERSION | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
- wx_config_micro_version=`echo $WX_VERSION | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-
- wx_requested_major_version=`echo $min_wx_version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
- wx_requested_minor_version=`echo $min_wx_version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
- wx_requested_micro_version=`echo $min_wx_version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-
- wx_ver_ok=""
- if test $wx_config_major_version -gt $wx_requested_major_version; then
- wx_ver_ok=yes
- else
- if test $wx_config_major_version -eq $wx_requested_major_version; then
- if test $wx_config_minor_version -gt $wx_requested_minor_version; then
- wx_ver_ok=yes
- else
- if test $wx_config_minor_version -eq $wx_requested_minor_version; then
- if test $wx_config_micro_version -ge $wx_requested_micro_version; then
- wx_ver_ok=yes
- fi
- fi
- fi
- fi
- fi
-
- if test "x$wx_ver_ok" = x ; then
- no_wx=yes
- else
- WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs`
- WX_GL_LIBS=`$WX_CONFIG_WITH_ARGS --gl-libs`
- WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs`
- WX_GL_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --gl-libs`
-
- dnl starting with version 2.2.6 wx-config has --cppflags argument
- wx_has_cppflags=""
- if test $wx_config_major_version -gt 2; then
- wx_has_cppflags=yes
- else
- if test $wx_config_major_version -eq 2; then
- if test $wx_config_minor_version -gt 2; then
- wx_has_cppflags=yes
- else
- if test $wx_config_minor_version -eq 2; then
- if test $wx_config_micro_version -ge 6; then
- wx_has_cppflags=yes
- fi
- fi
- fi
- fi
- fi
-
- if test "x$wx_has_cppflags" = x ; then
- dnl no choice but to define all flags like CFLAGS
- WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags`
- WX_CPPFLAGS=$WX_CFLAGS
- WX_CXXFLAGS=$WX_CFLAGS
-
- WX_CFLAGS_ONLY=$WX_CFLAGS
- WX_CXXFLAGS_ONLY=$WX_CFLAGS
- else
- dnl we have CPPFLAGS included in CFLAGS included in CXXFLAGS
- WX_CPPFLAGS=`$WX_CONFIG_WITH_ARGS --cppflags`
- WX_CXXFLAGS=`$WX_CONFIG_WITH_ARGS --cxxflags`
- WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags`
-
- WX_CFLAGS_ONLY=`echo $WX_CFLAGS | sed "s@^$WX_CPPFLAGS *@@"`
- WX_CXXFLAGS_ONLY=`echo $WX_CXXFLAGS | sed "s@^$WX_CFLAGS *@@"`
- fi
- fi
-
- if test "x$no_wx" = x ; then
- AC_MSG_RESULT(yes (version $WX_VERSION))
- ifelse([$2], , :, [$2])
- else
- if test "x$WX_VERSION" = x; then
- dnl no wx-config at all
- AC_MSG_RESULT(no)
- else
- AC_MSG_RESULT(no (version $WX_VERSION is not new enough))
- fi
-
- WX_CFLAGS=""
- WX_CPPFLAGS=""
- WX_CXXFLAGS=""
- WX_LIBS=""
- WX_GL_LIBS=""
- WX_LIBS_STATIC=""
- WX_GL_LIBS_STATIC=""
- ifelse([$3], , :, [$3])
- fi
- fi
-
- dnl Setup resource compiler option for cygwin.
- WX_WRCFLAGS=""
- for opt in $WX_CXXFLAGS
- do
- case "$opt" in
- -I*)
- WX_WRCFLAGS="$WX_WRCFLAGS --include-dir \"`echo "$opt" | sed 's/^-I//'`\""
- ;;
- -D*)
- WX_WRCFLAGS="$WX_WRCFLAGS --define \"`echo "$opt" | sed 's/^-D//'`\""
- ;;
- *)
- ;;
- esac
- done
- dnl To debug resource setting use the following line
- dnl echo "WX_WRCFLAGS=$WX_WRCFLAGS"
-
- AC_SUBST(WX_WRCFLAGS)
- AC_SUBST(WX_CPPFLAGS)
- AC_SUBST(WX_CFLAGS)
- AC_SUBST(WX_CXXFLAGS)
- AC_SUBST(WX_CFLAGS_ONLY)
- AC_SUBST(WX_CXXFLAGS_ONLY)
- AC_SUBST(WX_LIBS)
- AC_SUBST(WX_GL_LIBS)
- AC_SUBST(WX_LIBS_STATIC)
- AC_SUBST(WX_GL_LIBS_STATIC)
- AC_SUBST(WX_VERSION)
-])
Modified: tex2rtf/config/ltmain.sh
===================================================================
--- tex2rtf/config/ltmain.sh 2009-10-20 14:29:05 UTC (rev 737)
+++ tex2rtf/config/ltmain.sh 2009-12-03 14:43:42 UTC (rev 738)
@@ -1,52 +1,83 @@
-# ltmain.sh - Provide generalized library-building support services.
-# NOTE: Changing this file will not affect anything until you rerun configure.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007 Free Software Foundation, Inc.
-# Originally by Gordon Matzigkeit <go...@gn...>, 1996
-#
-# This program is free software; you can redistribute it and/or modify
+# Generated from ltmain.m4sh.
+
+# ltmain.sh (GNU libtool) 2.2.6
+# Written by Gordon Matzigkeit <go...@gn...>, 1996
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions. There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool 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
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with GNU Libtool; see the file COPYING. If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html,
+# or obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+# Usage: $progname [OPTION]... [MODE-ARG]...
#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
+# Provide generalized library-building support services.
+#
+# --config show all configuration variables
+# --debug enable verbose shell tracing
+# -n, --dry-run display commands without modifying any files
+# --features display basic configuration information and exit
+# --mode=MODE use operation mode MODE
+# --preserve-dup-deps don't remove duplicate dependency libraries
+# --quiet, --silent don't print informational messages
+# --tag=TAG use configuration variables from tag TAG
+# -v, --verbose print informational messages (default)
+# --version print version information
+# -h, --help print short or long help message
+#
+# MODE must be one of the following:
+#
+# clean remove files from the build directory
+# compile compile a source file into a libtool object
+# execute automatically set library path, then run a program
+# finish complete the installation of libtool libraries
+# install install libraries or executables
+# link create a library or an executable
+# uninstall remove libraries from an installed directory
+#
+# MODE-ARGS vary depending on the MODE.
+# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
+#
+# When reporting a bug, please describe a test case to reproduce it and
+# include the following information:
+#
+# host-triplet: $host
+# shell: $SHELL
+# compiler: $LTCC
+# compiler flags: $LTCFLAGS
+# linker: $LD (gnu? $with_gnu_ld)
+# $progname: (GNU libtool) 2.2.6
+# automake: $automake_version
+# autoconf: $autoconf_version
+#
+# Report bugs to <bug...@gn...>.
-basename="s,^.*/,,g"
-
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
-# the _XPG environment variable is not equal to 1 (one), the special
-# positional parameter $0, within a function call, is the name of the
-# function.
-progpath="$0"
-
-# The name of this program:
-progname=`echo "$progpath" | $SED $basename`
-modename="$progname"
-
-# Global variables:
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
-
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION=1.5.24
-TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
+VERSION=2.2.6
+TIMESTAMP=""
+package_revision=1.3012
-# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
@@ -60,99 +91,262 @@
BIN_SH=xpg4; export BIN_SH # for Tru64
DUALCASE=1; export DUALCASE # for MKS sh
-# Check that we have a working $echo.
-if test "X$1" = X--no-reexec; then
- # Discard the --no-reexec flag, and continue.
- shift
-elif test "X$1" = X--fallback-echo; then
- # Avoid inline document here, it may be left over
- :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
- # Yippee, $echo works!
- :
-else
- # Restart under the correct shell, and then maybe $echo will work.
- exec $SHELL "$progpath" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
- # used as fallback echo
- shift
- cat <<EOF
-$*
-EOF
- exit $EXIT_SUCCESS
-fi
-
-default_mode=
-help="Try \`$progname --help' for more information."
-magic="%%%MAGIC variable%%%"
-mkdir="mkdir"
-mv="mv -f"
-rm="rm -f"
-
-# Sed substitution that helps us do robust quoting. It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed="${SED}"' -e 1s/^X//'
-sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
- # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
- SP2NL='tr \040 \012'
- NL2SP='tr \015\012 \040\040'
- ;;
- *) # EBCDIC based system
- SP2NL='tr \100 \n'
- NL2SP='tr \r\n \100\100'
- ;;
-esac
-
-# NLS nuisances.
+# NLS nuisances: We save the old values to restore during execute mode.
# Only set LANG and LC_ALL to C if already set.
# These must not be set unconditionally because not all systems understand
# e.g. LANG=C (notably SCO).
-# We save the old values to restore during execute mode.
-for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+lt_user_locale=
+lt_safe_locale=
+for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
do
eval "if test \"\${$lt_var+set}\" = set; then
- save_$lt_var=\$$lt_var
- $lt_var=C
+ save_$lt_var=\$$lt_var
+ $lt_var=C
export $lt_var
+ lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"
+ lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
fi"
done
+$lt_unset CDPATH
+
+
+
+
+
+: ${CP="cp -f"}
+: ${ECHO="echo"}
+: ${EGREP="/bin/grep -E"}
+: ${FGREP="/bin/grep -F"}
+: ${GREP="/bin/grep"}
+: ${LN_S="ln -s"}
+: ${MAKE="make"}
+: ${MKDIR="mkdir"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+: ${SED="/bin/sed"}
+: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
+: ${Xsed="$SED -e 1s/^X//"}
+
+# Global variables:
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing.
+EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake.
+
+exit_status=$EXIT_SUCCESS
+
# Make sure IFS has a sensible default
lt_nl='
'
IFS=" $lt_nl"
-if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
- $echo "$modename: not configured to build any kind of library" 1>&2
- $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
- exit $EXIT_FAILURE
-fi
+dirname="s,/[^/]*$,,"
+basename="s,^.*/,,"
-# Global variables.
-mode=$default_mode
-nonopt=
-prev=
-prevopt=
-run=
-show="$echo"
-show_help=
-execute_dlfiles=
-duplicate_deps=no
-preserve_args=
-lo2o="s/\\.lo\$/.${objext}/"
-o2lo="s/\\.${objext}\$/.lo/"
-extracted_archives=
-extracted_serial=0
+# func_dirname_and_basename file append nondir_replacement
+# perform func_basename and func_dirname in a single function
+# call:
+# dirname: Compute the dirname of FILE. If nonempty,
+# add APPEND to the result, otherwise set result
+# to NONDIR_REPLACEMENT.
+# value returned in "$func_dirname_result"
+# basename: Compute filename of FILE.
+# value retuned in "$func_basename_result"
+# Implementation must be kept synchronized with func_dirname
+# and func_basename. For efficiency, we do not delegate to
+# those functions but instead duplicate the functionality here.
+func_dirname_and_basename ()
+{
+ # Extract subdirectory from the argument.
+ func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+ if test "X$func_dirname_result" = "X${1}"; then
+ func_dirname_result="${3}"
+ else
+ func_dirname_result="$func_dirname_result${2}"
+ fi
+ func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+}
-#####################################
-# Shell function definitions:
-# This seems to be the best place for them
+# Generated shell functions inserted here.
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath="$0"
+
+# The name of this program:
+# In the unlikely event $progname began with a '-', it would play havoc with
+# func_echo (imagine progname=-n), so we prepend ./ in that case:
+func_dirname_and_basename "$progpath"
+progname=$func_basename_result
+case $progname in
+ -*) progname=./$progname ;;
+esac
+
+# Make sure we have an absolute path for reexecution:
+case $progpath in
+ [\\/]*|[A-Za-z]:\\*) ;;
+ *[\\/]*)
+ progdir=$func_dirname_result
+ progdir=`cd "$progdir" && pwd`
+ progpath="$progdir/$progname"
+ ;;
+ *)
+ save_IFS="$IFS"
+ IFS=:
+ for progdir in $PATH; do
+ IFS="$save_IFS"
+ test -x "$progdir/$progname" && break
+ done
+ IFS="$save_IFS"
+ test -n "$progdir" || progdir=`pwd`
+ progpath="$progdir/$progname"
+ ;;
+esac
+
+# Sed substitution that helps us do robust quoting. It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed="${SED}"' -e 1s/^X//'
+sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Re-`\' parameter expansions in output of double_quote_subst that were
+# `\'-ed in input to the same. If an odd number of `\' preceded a '$'
+# in input to double_quote_subst, that '$' was protected from expansion.
+# Since each input `\' is now two `\'s, look for any number of runs of
+# four `\'s followed by two `\'s and then a '$'. `\' that '$'.
+bs='\\'
+bs2='\\\\'
+bs4='\\\\\\\\'
+dollar='\$'
+sed_double_backslash="\
+ s/$bs4/&\\
+/g
+ s/^$bs2$dollar/$bs&/
+ s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g
+ s/\n//g"
+
+# Standard options:
+opt_dry_run=false
+opt_help=false
+opt_quiet=false
+opt_verbose=false
+opt_warning=:
+
+# func_echo arg...
+# Echo program name prefixed message, along with the current mode
+# name if it has been set yet.
+func_echo ()
+{
+ $ECHO "$progname${mode+: }$mode: $*"
+}
+
+# func_verbose arg...
+# Echo program name prefixed message in verbose mode only.
+func_verbose ()
+{
+ $opt_verbose && func_echo ${1+"$@"}
+
+ # A bug in bash halts the script if the last line of a function
+ # fails when set -e is in force, so we need another command to
+ # work around that:
+ :
+}
+
+# func_error arg...
+# Echo program name prefixed message to standard error.
+func_error ()
+{
+ $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
+}
+
+# func_warning arg...
+# Echo program name prefixed warning message to standard error.
+func_warning ()
+{
+ $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
+
+ # bash bug again:
+ :
+}
+
+# func_fatal_error arg...
+# Echo program name prefixed message to standard error, and exit.
+func_fatal_error ()
+{
+ func_error ${1+"$@"}
+ exit $EXIT_FAILURE
+}
+
+# func_fatal_help arg...
+# Echo program name prefixed message to standard error, followed by
+# a help hint, and exit.
+func_fatal_help ()
+{
+ func_error ${1+"$@"}
+ func_fatal_error "$help"
+}
+help="Try \`$progname --help' for more information." ## default
+
+
+# func_grep expression filename
+# Check whether EXPRESSION matches any line of FILENAME, without output.
+func_grep ()
+{
+ $GREP "$1" "$2" >/dev/null 2>&1
+}
+
+
+# func_mkdir_p directory-path
+# Make sure the entire path to DIRECTORY-PATH is available.
+func_mkdir_p ()
+{
+ my_directory_path="$1"
+ my_dir_list=
+
+ if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
+
+ # Protect directory names starting with `-'
+ case $my_directory_path in
+ -*) my_directory_path="./$my_directory_path" ;;
+ esac
+
+ # While some portion of DIR does not yet exist...
+ while test ! -d "$my_directory_path"; do
+ # ...make a list in topmost first order. Use a colon delimited
+ # list incase some portion of path contains whitespace.
+ my_dir_list="$my_directory_path:$my_dir_list"
+
+ # If the last portion added has no slash in it, the list is done
+ case $my_directory_path in */*) ;; *) break ;; esac
+
+ # ...otherwise throw away the child directory and loop
+ my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`
+ done
+ my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`
+
+ save_mkdir_p_IFS="$IFS"; IFS=':'
+ for my_dir in $my_dir_list; do
+ IFS="$save_mkdir_p_IFS"
+ # mkdir can fail with a `File exist' error if two processes
+ # try to create one of the directories concurrently. Don't
+ # stop in that case!
+ $MKDIR "$my_dir" 2>/dev/null || :
+ done
+ IFS="$save_mkdir_p_IFS"
+
+ # Bail out if we (or some other process) failed to create a directory.
+ test -d "$my_directory_path" || \
+ func_fatal_error "Failed to create \`$1'"
+ fi
+}
+
+
# func_mktempdir [string]
# Make a temporary directory that won't clash with other running
# libtool processes, and avoids race conditions if possible. If
@@ -161,7 +355,7 @@
{
my_template="${TMPDIR-/tmp}/${1-$progname}"
- if test "$run" = ":"; then
+ if test "$opt_dry_run" = ":"; then
# Return a directory name, but don't create it in dry-run mode
my_tmpdir="${my_template}-$$"
else
@@ -170,486 +364,743 @@
my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
if test ! -d "$my_tmpdir"; then
- # Failing that, at least try and use $RANDOM to avoid a race
- my_tmpdir="${my_template}-${RANDOM-0}$$"
+ # Failing that, at least try and use $RANDOM to avoid a race
+ my_tmpdir="${my_template}-${RANDOM-0}$$"
- save_mktempdir_umask=`umask`
- umask 0077
- $mkdir "$my_tmpdir"
- umask $save_mktempdir_umask
+ save_mktempdir_umask=`umask`
+ umask 0077
+ $MKDIR "$my_tmpdir"
+ umask $save_mktempdir_umask
fi
# If we're not in dry-run mode, bomb out on failure
- test -d "$my_tmpdir" || {
- $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2
- exit $EXIT_FAILURE
- }
+ test -d "$my_tmpdir" || \
+ func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
fi
- $echo "X$my_tmpdir" | $Xsed
+ $ECHO "X$my_tmpdir" | $Xsed
}
-# func_win32_libid arg
-# return the library type of file 'arg'
-#
-# Need a lot of goo to handle *both* DLLs and import libs
-# Has to be a shell function in order to 'eat' the argument
-# that is supplied when $file_magic_command is called.
-func_win32_libid ()
+# func_quote_for_eval arg
+# Aesthetically quote ARG to be evaled later.
+# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT
+# is double-quoted, suitable for a subsequent eval, whereas
+# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters
+# which are still active within double quotes backslashified.
+func_quote_for_eval ()
{
- win32_libid_type="unknown"
- win32_fileres=`file -L $1 2>/dev/null`
- case $win32_fileres in
- *ar\ archive\ import\ library*) # definitely import
- win32_libid_type="x86 archive import"
- ;;
- *ar\ archive*) # could be an import, or static
- if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
- $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
- win32_nmres=`eval $NM -f posix -A $1 | \
- $SED -n -e '1,100{
- / I /{
- s,.*,import,
- p
- q
- }
- }'`
- case $win32_nmres in
- import*) win32_libid_type="x86 archive import";;
- *) win32_libid_type="x86 archive static";;
- esac
- fi
- ;;
- *DLL*)
- win32_libid_type="x86 DLL"
- ;;
- *executable*) # but shell scripts are "executable" too...
- case $win32_fileres in
- *MS\ Windows\ PE\ Intel*)
- win32_libid_type="x86 DLL"
- ;;
+ case $1 in
+ *[\\\`\"\$]*)
+ func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;
+ *)
+ func_quote_for_eval_unquoted_result="$1" ;;
esac
- ;;
- esac
- $echo $win32_libid_type
+
+ case $func_quote_for_eval_unquoted_result in
+ # Double-quote args containing shell metacharacters to delay
+ # word splitting, command substitution and and variable
+ # expansion for a subsequent eval.
+ # Many Bourne shells cannot handle close brackets correctly
+ # in scan sets, so we specify it separately.
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""
+ ;;
+ *)
+ func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"
+ esac
}
-# func_infer_tag arg
-# Infer tagged configuration to use if any are available and
-# if one wasn't chosen via the "--tag" command line option.
-# Only attempt this if the compiler in the base compile
-# command doesn't match the default compiler.
-# arg is usually of the form 'gcc ...'
-func_infer_tag ()
+# func_quote_for_expand arg
+# Aesthetically quote ARG to be evaled later; same as above,
+# but do not quote variable references.
+func_quote_for_expand ()
{
- if test -n "$available_tags" && test -z "$tagname"; then
- CC_quoted=
- for arg in $CC; do
- case $arg in
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
- arg="\"$arg\""
- ;;
- esac
- CC_quoted="$CC_quoted $arg"
- done
- case $@ in
- # Blanks in the command may have been stripped by the calling shell,
- # but not from the CC environment variable when configure was run.
- " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
- # Blanks at the start of $base_compile will cause this to fail
- # if we don't check for them as well.
+ case $1 in
+ *[\\\`\"]*)
+ my_arg=`$ECHO "X$1" | $Xsed \
+ -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
*)
- for z in $available_tags; do
- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
- # Evaluate the configuration.
- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
- CC_quoted=
- for arg in $CC; do
- # Double-quote args containing other shell metacharacters.
- case $arg in
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
- arg="\"$arg\""
- ;;
- esac
- CC_quoted="$CC_quoted $arg"
- done
- case "$@ " in
- " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
- # The compiler in the base compile command matches
- # the one in the tagged configuration.
- # Assume this is the tagged configuration we want.
- tagname=$z
- break
- ;;
- esac
- fi
- done
- # If $tagname still isn't set, then no tagged configuration
- # was found and let the user know that the "--tag" command
- # line option must be used.
- if test -z "$tagname"; then
- $echo "$modename: unable to infer tagged configuration"
- $echo "$modename: specify a tag with \`--tag'" 1>&2
- exit $EXIT_FAILURE
-# else
-# $echo "$modename: using $tagname tagged configuration"
- fi
- ;;
- esac
- fi
+ my_arg="$1" ;;
+ esac
+
+ case $my_arg in
+ # Double-quote args containing shell metacharacters to delay
+ # word splitting and command substitution for a subsequent eval.
+ # Many Bourne shells cannot handle close brackets correctly
+ # in scan sets, so we specify it separately.
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ my_arg="\"$my_arg\""
+ ;;
+ esac
+
+ func_quote_for_expand_result="$my_arg"
}
-# func_extract_an_archive dir oldlib
-func_extract_an_archive ()
+# func_show_eval cmd [fail_exp]
+# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is
+# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it.
+func_show_eval ()
{
- f_ex_an_ar_dir="$1"; shift
- f_ex_an_ar_oldlib="$1"
+ my_cmd="$1"
+ my_fail_exp="${2-:}"
- $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
- $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
- if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
- :
- else
- $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
- exit $EXIT_FAILURE
+ ${opt_silent-false} || {
+ func_quote_for_expand "$my_cmd"
+ eval "func_echo $func_quote_for_expand_result"
+ }
+
+ if ${opt_dry_run-false}; then :; else
+ eval "$my_cmd"
+ my_status=$?
+ if test "$my_status" -eq 0; then :; else
+ eval "(exit $my_status); $my_fail_exp"
+ fi
fi
}
-# func_extract_archives gentop oldlib ...
-func_extract_archives ()
+
+# func_show_eval_locale cmd [fail_exp]
+# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is
+# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it. Use the saved locale for evaluation.
+func_show_eval_locale ()
{
- my_gentop="$1"; shift
- my_oldlibs=${1+"$@"}
- my_oldobjs=""
- my_xlib=""
- my_xabs=""
- my_xdir=""
- my_status=""
+ my_cmd="$1"
+ my_fail_exp="${2-:}"
- $show "${rm}r $my_gentop"
- $run ${rm}r "$my_gentop"
- $show "$mkdir $my_gentop"
- $run $mkdir "$my_gentop"
- my_status=$?
- if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
- exit $my_status
+ ${opt_silent-false} || {
+ func_quote_for_expand "$my_cmd"
+ eval "func_echo $func_quote_for_expand_result"
+ }
+
+ if ${opt_dry_run-false}; then :; else
+ eval "$lt_user_locale
+ $my_cmd"
+ my_status=$?
+ eval "$lt_safe_locale"
+ if test "$my_status" -eq 0; then :; else
+ eval "(exit $my_status); $my_fail_exp"
+ fi
fi
+}
- for my_xlib in $my_oldlibs; do
- # Extract the objects.
- case $my_xlib in
- [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
- *) my_xabs=`pwd`"/$my_xlib" ;;
- esac
- my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
- my_xlib_u=$my_xlib
- while :; do
- case " $extracted_archives " in
- *" $my_xlib_u "*)
- extracted_serial=`expr $extracted_serial + 1`
- my_xlib_u=lt$extracted_serial-$my_xlib ;;
- *) break ;;
- esac
- done
- extracted_archives="$extracted_archives $my_xlib_u"
- my_xdir="$my_gentop/$my_xlib_u"
- $show "${rm}r $my_xdir"
- $run ${rm}r "$my_xdir"
- $show "$mkdir $my_xdir"
- $run $mkdir "$my_xdir"
- exit_status=$?
- if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then
- exit $exit_status
- fi
- case $host in
- *-darwin*)
- $show "Extracting $my_xabs"
- # Do not bother doing anything if just a dry run
- if test -z "$run"; then
- darwin_orig_dir=`pwd`
- cd $my_xdir || exit $?
- darwin_archive=$my_xabs
- darwin_curdir=`pwd`
- darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
- darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
- if test -n "$darwin_arches"; then
- darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
- darwin_arch=
- $show "$darwin_base_archive has multiple architectures $darwin_arches"
- for darwin_arch in $darwin_arches ; do
- mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
- lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
- cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
- func_extract_an_archive "`pwd`" "${darwin_base_archive}"
- cd "$darwin_curdir"
- $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
- done # $darwin_arches
- ## Okay now we have a bunch of thin objects, gotta fatten them up :)
- darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
- darwin_file=
- darwin_files=
- for darwin_file in $darwin_filelist; do
- darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
- lipo -create -output "$darwin_file" $darwin_files
- done # $darwin_filelist
- ${rm}r unfat-$$
- cd "$darwin_orig_dir"
- else
- cd "$darwin_orig_dir"
- func_extract_an_archive "$my_xdir" "$my_xabs"
- fi # $darwin_arches
- fi # $run
- ;;
- *)
- func_extract_an_archive "$my_xdir" "$my_xabs"
- ;;
- esac
- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
- done
- func_extract_archives_result="$my_oldobjs"
+
+
+
+# func_version
+# Echo version message to standard output and exit.
+func_version ()
+{
+ $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
+ s/^# //
+ s/^# *$//
+ s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
+ p
+ }' < "$progpath"
+ exit $?
}
-# End of Shell function definitions
-#####################################
-# Darwin sucks
-eval std_shrext=\"$shrext_cmds\"
+# func_usage
+# Echo short help message to standard output and exit.
+func_usage ()
+{
+ $SED -n '/^# Usage:/,/# -h/ {
+ s/^# //
+ s/^# *$//
+ s/\$progname/'$progname'/
+ p
+ }' < "$progpath"
+ $ECHO
+ $ECHO "run \`$progname --help | more' for full usage"
+ exit $?
+}
-disable_libs=no
+# func_help
+# Echo long help message to standard output and exit.
+func_help ()
+{
+ $SED -n '/^# Usage:/,/# Report bugs to/ {
+ s/^# //
+ s/^# *$//
+ s*\$progname*'$progname'*
+ s*\$host*'"$host"'*
+ s*\$SHELL*'"$SHELL"'*
+ s*\$LTCC*'"$LTCC"'*
+ s*\$LTCFLAGS*'"$LTCFLAGS"'*
+ s*\$LD*'"$LD"'*
+ s/\$with_gnu_ld/'"$with_gnu_ld"'/
+ s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
+ s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
+ p
+ }' < "$progpath"
+ exit $?
+}
-# Parse our command line options once, thoroughly.
-while test "$#" -gt 0
-do
- arg="$1"
+# func_missing_arg argname
+# Echo program name prefixed message to standard error and set global
+# exit_cmd.
+func_missing_arg ()
+{
+ func_error "missing argument for $1"
+ exit_cmd=exit
+}
+
+exit_cmd=:
+
+
+
+
+
+# Check that we have a working $ECHO.
+if test "X$1" = X--no-reexec; then
+ # Discard the --no-reexec flag, and continue.
shift
+elif test "X$1" = X--fallback-echo; then
+ # Avoid inline document here, it may be left over
+ :
+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
+ # Yippee, $ECHO works!
+ :
+else
+ # Restart under the correct shell, and then maybe $ECHO will work.
+ exec $SHELL "$progpath" --no-reexec ${1+"$@"}
+fi
- case $arg in
- -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
- *) optarg= ;;
- esac
+if test "X$1" = X--fallback-echo; then
+ # used as fallback echo
+ shift
+ cat <<EOF
+$*
+EOF
+ exit $EXIT_SUCCESS
+fi
- # If the previous option needs an argument, assign it.
- if test -n "$prev"; then
- case $prev in
- execute_dlfiles)
- execute_dlfiles="$execute_dlfiles $arg"
- ;;
- tag)
- tagname="$arg"
- preserve_args="${preserve_args}=$arg"
+magic="%%%MAGIC variable%%%"
+magic_exe="%%%MAGIC EXE variable%%%"
- # Check whether tagname contains only valid characters
- case $tagname in
- *[!-_A-Za-z0-9,/]*)
- $echo "$progname: invalid tag name: $tagname" 1>&2
- exit $EXIT_FAILURE
- ;;
- esac
+# Global variables.
+# $mode is unset
+nonopt=
+execute_dlfiles=
+preserve_args=
+lo2o="s/\\.lo\$/.${objext}/"
+o2lo="s/\\.${objext}\$/.lo/"
+extracted_archives=
+extracted_serial=0
- case $tagname in
- CC)
- # Don't test for the "default" C tag, as we know, it's there, but
- # not specially marked.
- ;;
- *)
- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
- taglist="$taglist $tagname"
- # Evaluate the configuration.
- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
- else
- $echo "$progname: ignoring unknown tag $tagname" 1>&2
- fi
- ;;
- esac
- ;;
- *)
- eval "$prev=\$arg"
- ;;
- esac
+opt_dry_run=false
+opt_duplicate_deps=false
+opt_silent=false
+opt_debug=:
- prev=
- prevopt=
- continue
- fi
+# If this variable is set in any of the actions, the command in it
+# will be execed at the end. This prevents here-documents from being
+# left over by shells.
+exec_cmd=
- # Have we seen a non-optional argument yet?
- case $arg in
- --help)
- show_help=yes
- ;;
+# func_fatal_configuration arg...
+# Echo program name prefixed message to standard error, followed by
+# a configuration failure hint, and exit.
+func_fatal_configuration ()
+{
+ func_error ${1+"$@"}
+ func_error "See the $PACKAGE documentation for more information."
+ func_fatal_error "Fatal configuration error."
+}
- --version)
- echo "\
-$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
-Copyright (C) 2007 Free Software Foundation, Inc.
-This is free software; see the source for copying conditions. There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
- exit $?
- ;;
+# func_config
+# Display the configuration for all the tags in this script.
+func_config ()
+{
+ re_begincf='^# ### BEGIN LIBTOOL'
+ re_endcf='^# ### END LIBTOOL'
- --config)
- ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
+ # Default configuration.
+ $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath"
+
# Now print the configurations for the tags.
for tagname in $taglist; do
- ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
+ $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath"
done
+
exit $?
- ;;
+}
- --debug)
- $echo "$progname: enabling shell trace mode"
- set -x
- preserve_args="$preserve_args $arg"
- ;;
-
- --dry-run | -n)
- run=:
- ;;
-
- --features)
- $echo "host: $host"
+# func_features
+# Display the features supported by this script.
+func_features ()
+{
+ $ECHO "host: $host"
if test "$build_libtool_libs" = yes; then
- $echo "enable shared libraries"
+ $ECHO "enable shared libraries"
else
- $echo "disable shared libraries"
+ $ECHO "disable shared libraries"
fi
if test "$build_old_libs" = yes; then
- $echo "enable static libraries"
+ $ECHO "enable static libraries"
else
- $echo "disable static libraries"
+ $ECHO "disable static libraries"
fi
+
exit $?
- ;;
+}
- --finish) mode="finish" ;;
+# func_enable_tag tagname
+# Verify that TAGNAME is valid, and either flag an error and exit, or
+# enable the TAGNAME tag. We also add TAGNAME to the global $taglist
+# variable here.
+func_enable_tag ()
+{
+ # Global variable:
+ tagname="$1"
- --mode) prevopt="--mode" prev=mode ;;
- --mode=*) mode="$optarg" ;;
+ re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
+ re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
+ sed_extractcf="/$re_begincf/,/$re_endcf/p"
- --preserve-dup-deps) duplicate_deps="yes" ;;
+ # Validate tagname.
+ case $tagname in
+ *[!-_A-Za-z0-9,/]*)
+ func_fatal_error "invalid tag name: $tagname"
+ ;;
+ esac
- --quiet | --silent)
- show=:
- preserve_args="$preserve_args $arg"
- ;;
+ # Don't test for the "default" C tag, as we know it's
+ # there but not specially marked.
+ case $tagname in
+ CC) ;;
+ *)
+ if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
+ taglist="$taglist $tagname"
- --tag)
- prevopt="--tag"
- prev=tag
- preserve_args="$preserve_args --tag"
+ # Evaluate the configuration. Be careful to quote the path
+ # and the sed script, to avoid splitting on whitespace, but
+ # also don't use non-portable quotes within backquotes within
+ # quotes we have to do it in 2 steps:
+ extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
+ eval "$extractedcf"
+ else
+ func_error "ignoring unknown tag $tagname"
+ fi
+ ;;
+ esac
+}
+
+# Parse options once, thoroughly. This comes as soon as possible in
+# the script to make things like `libtool --version' happen quickly.
+{
+
+ # Shorthand for --mode=foo, only valid as the first argument
+ case $1 in
+ clean|clea|cle|cl)
+ shift; set dummy --mode clean ${1+"$@"}; shift
;;
- --tag=*)
- set tag "$optarg" ${1+"$@"}
- shift
- prev=tag
- preserve_args="$preserve_args --tag"
+ compile|compil|compi|comp|com|co|c)
+ shift; set dummy --mode compile ${1+"$@"}; shift
;;
-
- -dlopen)
- prevopt="-dlopen"
- prev=execute_dlfiles
+ execute|execut|execu|exec|exe|ex|e)
+ shift; set dummy --mode execute ${1+"$@"}; shift
;;
-
- -*)
- $echo "$modename: unrecognized option \`$arg'" 1>&2
- $echo "$help" 1>&2
- exit $EXIT_FAILURE
+ finish|finis|fini|fin|fi|f)
+ shift; set dummy --mode finish ${1+"$@"}; shift
;;
-
- *)
- nonopt="$arg"
- break
+ install|instal|insta|inst|ins|in|i)
+ shift; set dummy --mode install ${1+"$@"}; shift
;;
+ link|lin|li|l)
+ shift; set dummy --mode link ${1+"$@"}; shift
+ ;;
+ uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+ shift; set dummy --mode uninstall ${1+"$@"}; shift
+ ;;
esac
-done
-if test -n "$prevopt"; then
- $echo "$modename: option \`$prevopt' requires an argument" 1>&2
- $echo "$help" 1>&2
- exit $EXIT_FAILURE
-fi
+ # Parse non-mode specific arguments:
+ while test "$#" -gt 0; do
+ opt="$1"
+ shift
-case $disable_libs in
-no)
- ;;
-shared)
- build_libtool_libs=no
- build_old_libs=yes
- ;;
-static)
- build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
- ;;
-esac
+ case $opt in
+ --config) func_config ;;
-# If this variable is set in any of the actions, the command in it
-# will be execed at the end. This prevents here-documents from being
-# left over by shells.
-exec_cmd=
+ --debug) preserve_args="$preserve_args $opt"
+ func_echo "enabling shell trace mode"
+ opt_debug='set -x'
+ $opt_debug
+ ;;
-if test -z "$show_help"; then
+ -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break
+ execute_dlfiles="$execute_dlfiles $1"
+ shift
+ ;;
- # Infer the operation mode.
- if test -z "$mode"; then
- $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
- $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
- case $nonopt in
- *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
- mode=link
- for arg
- do
- case $arg in
- -c)
- mode=compile
- break
- ;;
- esac
- done
+ --dry-run | -n) opt_dry_run=: ;;
+ --features) func_features ;;
+ --finish) mode="finish" ;;
+
+ --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break
+ case $1 in
+ # Valid mode arguments:
+ clean) ;;
+ compile) ;;
+ execute) ;;
+ finish) ;;
+ install) ;;
+ link) ;;
+ relink) ;;
+ uninstall) ;;
+
+ # Catch anything else as an error
+ *) func_error "invalid argument for $opt"
+ exit_cmd=exit
+ break
+ ;;
+ esac
+
+ mode="$1"
+ shift
+ ;;
+
+ --preserve-dup-deps)
+ opt_duplicate_deps=: ;;
+
+ --quiet|--silent) preserve_args="$preserve_args $opt"
+ opt_silent=:
+ ;;
+
+ --verbose| -v) preserve_args="$preserve_args $opt"
+ opt_silent=false
+ ;;
+
+ --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break
+ preserve_args="$preserve_args $opt $1"
+ func_enable_tag "$1" # tagname is set here
+ shift
+ ;;
+
+ # Separate optargs to long options:
+ -dlopen=*|--mode=*|--tag=*)
+ func_opt_split "$opt"
+ set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
+ shift
+ ;;
+
+ -\?|-h) func_usage ;;
+ --help) opt_help=: ;;
+ --version) func_version ;;
+
+ -*) func_fatal_help "unrecognized option \`$opt'" ;;
+
+ *) nonopt="$opt"
+ break
+ ;;
+ esac
+ done
+
+
+ case $host in
+ *cygwin* | *mingw* | *pw32* | *cegcc*)
+ # don't eliminate duplications in $postdeps and $predeps
+ opt_duplicate_compiler_generated_deps=:
;;
- *db | *dbx | *strace | *truss)
- mode=execute
+ *)
+ opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
;;
- *install*|cp|mv)
- mode=install
- ;;
- *rm)
- mode=uninstall
- ;;
- *)
- # If we have no mode, but dlfiles were specified, then do execute mode.
- test -n "$execute_dlfiles" && mode=execute
+ esac
- # Just use the default operation mode.
- if test -z "$mode"; then
- if test -n "$nonopt"; then
- $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
- else
- $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
- fi
+ # Having warned about all mis-specified options, bail out if
+ # anything was wrong.
+ $exit_cmd $EXIT_FAILURE
+}
+
+# func_check_version_match
+# Ensure that we are using m4 macros, and libtool script from the same
+# release of libtool.
+func_check_version_match ()
+{
+ if test "$package_revision" != "$macro_revision"; then
+ if test "$VERSION" != "$macro_version"; then
+ if test -z "$macro_version"; then
+ cat >&2 <<_LT_EOF
+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from an older release.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+ else
+ cat >&2 <<_LT_EOF
+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
fi
- ;;
- esac
+ else
+ cat >&2 <<_LT_EOF
+$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
+$progname: but the definition of this LT_INIT comes from revision $macro_revision.
+$progname: You should recreate aclocal.m4 with macros from revision $package_revision
+$progname: of $PACKAGE $VERSION and run autoconf again.
+_LT_EOF
+ fi
+
+ exit $EXIT_MISMATCH
fi
+}
+
+## ----------- ##
+## Main. ##
+## ----------- ##
+
+$opt_help || {
+ # Sanity checks first:
+ func_check_version_match
+
+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+ func_fatal_configuration "not configured to build any kind of library"
+ fi
+
+ test -z "$mode" && func_fatal_error "error: you must specify a MODE."
+
+
+ # Darwin sucks
+ eval std_shrext=\"$shrext_cmds\"
+
+
# Only execute mode is allowed to have -dlopen flags.
if test -n "$execute_dlfiles" && test "$mode" != execute; then
- $echo "$modename: unrecognized option \`-dlopen'" 1>&2
- $echo "$help" 1>&2
+ func_error "unrecognized option \`-dlopen'"
+ $ECHO "$help" 1>&2
exit $EXIT_FAILURE
fi
# Change the help message to a mode-specific one.
generic_help="$help"
- help="Try \`$modename --help --mode=$mode' for more information."
+ help="Try \`$progname --help --mode=$mode' for more information."
+}
- # These modes are in order of execution frequency so that they run quickly.
- case $mode in
- # libtool compile mode
- compile)
- modename="$modename: compile"
+
+# func_lalib_p file
+# True iff FILE is a libtool `.la' library or `.lo' object file.
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_lalib_p ()
+{
+ test -f "$1" &&
+ $SED -e 4q "$1" 2>/dev/null \
+ | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+}
+
+# func_lalib_unsafe_p file
+# True iff FILE is a libtool `.la' library or `.lo' object file.
+# This function implements the same check as func_lalib_p without
+# resorting to external programs. To this end, it redirects stdin and
+# closes it afterwards, without saving the original file descriptor.
+# As a safety measure, use it only where a negative result would be
+# fatal anyway. Works if `file' does not exist.
+func_lalib_unsafe_p ()
+{
+ lalib_p=no
+ if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then
+ for lalib_p_l in 1 2 3 4
+ do
+ read lalib_p_line
+ case "$lalib_p_line" in
+ \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
+ esac
+ done
+ exec 0<&5 5<&-
+ fi
+ test "$lalib_p" = yes
+}
+
+# func_ltwrapper_script_p file
+# True iff FILE is a libtool wrapper script
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_script_p ()
+{
+ func_lalib_p "$1"
+}
+
+# func_ltwrapper_executable_p file
+# True iff FILE is a libtool wrapper executable
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_executable_p ()
+{
+ func_ltwrapper_exec_suffix=
+ case $1 in
+ *.exe) ;;
+ *) func_ltwrapper_exec_suffix=.exe ;;
+ esac
+ $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1
+}
+
+# func_ltwrapper_scriptname file
+# Assumes file is an ltwrapper_executable
+# uses $file to determine the appropriate filename for a
+# temporary ltwrapper_script.
+func_ltwrapper_scriptname ()
+{
+ func_ltwrapper_scriptname_result=""
+ if func_ltwrapper_executable_p "$1"; then
+ func_dirname_and_basename "$1" "" "."
+ func_stripname '' '.exe' "$func_basename_result"
+ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
+ fi
+}
+
+# func_ltwrapper_p file
+# True iff FILE is a libtool wrapper script or wrapper executable
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_p ()
+{
+ func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1"
+}
+
+
+# func_execute_cmds commands fail_cmd
+# Execute tilde-delimited COMMANDS.
+# If FAIL_CMD is given, eval that upon failure.
+# FAIL_CMD may read-access the current command in variable CMD!
+func_execute_cmds ()
+{
+ $opt_debug
+ save_ifs=$IFS; IFS='~'
+ for cmd in $1; do
+ IFS=$save_ifs
+ eval cmd=\"$cmd\"
+ func_show_eval "$cmd" "${2-:}"
+ done
+ IFS=$save_ifs
+}
+
+
+# func_source file
+# Source FILE, adding directory component if necessary.
+# Note that it is not necessary on cygwin/mingw to append a dot to
+# FILE even if both FILE and FILE.exe exist: automatic-append-.exe
+# behavior happens only for exec(3), not for open(2)! Also, sourcing
+# `FILE.' does not work on cygwin managed mounts.
+func_source ()
+{
+ $opt_debug
+ case $1 in
+ */* | *\\*) . "$1" ;;
+ *) . "./$1" ;;
+ esac
+}
+
+
+# func_infer_tag arg
+# Infer tagged configuration to use if any are available and
+# if one wasn't chosen via the "--tag" command line option.
+# Only attempt this if the compiler in the base compile
+# command doesn't match the default compiler.
+# arg is usually of the form 'gcc ...'
+func_infer_tag ()
+{
+ $opt_debug
+ if test -n "$available_tags" && test -z "$tagname"; then
+ CC_quoted=
+ for arg in $CC; do
+ func_quote_for_eval "$arg"
+ CC_quoted="$CC_quoted $func_quote_for_eval_result"
+ done
+ case $@ in
+ # Blanks in the command may have been stripped by the calling shell,
+ # but not from the CC environment variable when configure was run.
+ " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;;
+ # Blanks at the start of $base_compile will cause this to fail
+ # if we don't check for them as well.
+ *)
+ for z in $available_tags; do
+ if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
+ # Evaluate the configuration.
+ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
+ CC_quoted=
+ for arg in $CC; do
+ # Double-quote args containing other shell metacharacters.
+ func_quote_for_eval "$arg"
+ CC_quoted="$CC_quoted $func_quote_for_eval_result"
+ done
+ case "$@ " in
+ " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*)
+ # The compiler in the base compile command matches
+ # the one in the tagged configuration.
+ # Assume this is the tagged configuration we want.
+ tagname=$z
+ break
+ ;;
+ esac
+ fi
+ done
+ # If $tagname still isn't set, then no tagged configuration
+ # was found and let the user know that the "--tag" command
+ # line option must be used.
+ if test -z "$tagname"; then
+ func_echo "unable to infer tagged configuration"
+ func_fatal_error "specify a tag with \`--tag'"
+# else
+# func_verbose "using $tagname tagged configuration"
+ fi
+ ;;
+ esac
+ fi
+}
+
+
+
+# func_write_libtool_object output_name pic_name nonpic_name
+# Create a libtool object file (analogous to a ".la" file),
+# but don't create it if we're doing a dry run.
+func_write_libtool_object ()
+{
+ write_libobj=${1}
+ if test "$build_libtool_libs" = yes; then
+ write_lobj=\'${2}\'
+ else
+ write_lobj=none
+ fi
+
+ if test "$build_old_libs" = yes; then
+ write_oldobj=\'${3}\'
+ else
+ write_oldobj=none
+ fi
+
+ $opt_dry_run || {
+ cat >${write_libobj}T <<EOF
+# $write_libobj - a libtool object file
+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# Name of the PIC object.
+pic_object=$write_lobj
+
+# Name of the non-PIC object
+non_pic_object=$write_oldobj
+
+EOF
+ $MV "${write_libobj}T" "${write_libobj}"
+ }
+}
+
+# func_mode_compile arg...
+func_mode_compile ()
+{
+ $opt_debug
# Get the compilation command and the source file.
base_compile=
srcfile="$nonopt" # always keep a non-empty value in "srcfile"
@@ -658,6 +1109,7 @@
arg_mode=normal
libobj=
later=
+ pie_flag=
for arg
do
@@ -678,15 +1130,18 @@
# Accept any command-line options.
case $arg in
-o)
- if test -n "$libobj" ; then
- $echo "$modename: you cannot specify \`-o' more than once" 1>&2
- exit $EXIT_FAILURE
- fi
+ test -n "$libobj" && \
+ func_fatal_error "you cannot specify \`-o' more than once"
arg_mode=target
continue
;;
- -static | -prefer-pic | -prefer-non-pic)
+ -pie | -fpie | -fPIE)
+ pie_flag="$pie_flag $arg"
+ continue
+ ;;
+
+ -shared | -static | -prefer-pic | -prefer-non-pic)
later="$later $arg"
continue
;;
@@ -702,31 +1157,25 @@
;; # replaced later. I would guess that would be a bug.
-Wc,*)
- args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
+ func_stripname '-Wc,' '' "$arg"
+ args=$func_stripname_result
lastarg=
save_ifs="$IFS"; IFS=','
- for arg in $args; do
+ for arg in $args; do
IFS="$save_ifs"
-
- # Double-quote args containing other shell metacharacters.
- # Many Bourne shells cannot handle close brackets correctly
- # in scan sets, so we specify it separately.
- case $arg in
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
- arg="\"$arg\""
- ;;
- esac
- lastarg="$lastarg $arg"
+ func_quote_for_eval "$arg"
+ lastarg="$lastarg $func_quote_for_eval_result"
done
IFS="$save_ifs"
- lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
+ func_stripname ' ' '' "$lastarg"
+ lastarg=$func_stripname_result
# Add the arguments to base_compile.
base_compile="$base_compile $lastarg"
continue
;;
- * )
+ *)
# Accept the current argument as the source file.
# The previous "srcfile" becomes the current argument.
#
@@ -738,65 +1187,42 @@
esac # case $arg_mode
# Aesthetically quote the previous argument.
- lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
-
- case $lastarg in
- # Double-quote args containing other shell metacharacters.
- # Many Bourne shells cannot handle close brackets correctly
- # in scan sets, and some SunOS ksh mistreat backslash-escaping
- # in scan sets (worked around with variable expansion),
- # and furthermore cannot handle '|' '&' '(' ')' in scan sets
- # at all, so we specify them separately.
-...
[truncated message content] |
|
From: <pst...@us...> - 2009-10-20 14:29:13
|
Revision: 737
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=737&view=rev
Author: pstieber
Date: 2009-10-20 14:29:05 +0000 (Tue, 20 Oct 2009)
Log Message:
-----------
Expanded the possible extensions for MIDI files.
Modified Paths:
--------------
trunk/jazz/src/TrackFrame.cpp
Modified: trunk/jazz/src/TrackFrame.cpp
===================================================================
--- trunk/jazz/src/TrackFrame.cpp 2009-10-15 13:37:04 UTC (rev 736)
+++ trunk/jazz/src/TrackFrame.cpp 2009-10-20 14:29:05 UTC (rev 737)
@@ -474,7 +474,7 @@
"Load MIDI File",
"",
"",
- "*.mid",
+ "MIDI files (MID, MIDI)|*.mid;*.midi|All files (*.*)|*.*",
wxFD_OPEN | wxFD_CHANGE_DIR);
if (OpenDialog.ShowModal() == wxID_OK)
{
@@ -501,7 +501,7 @@
"Save MIDI File",
"",
"",
- "*.mid",
+ "MIDI files (MID, MIDI)|*.mid;*.midi|All files (*.*)|*.*",
wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
if (SaveAsDialog.ShowModal() == wxID_OK)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2009-10-15 13:37:12
|
Revision: 736
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=736&view=rev
Author: pstieber
Date: 2009-10-15 13:37:04 +0000 (Thu, 15 Oct 2009)
Log Message:
-----------
1. Removed SN++ from comments. I don't know what these represented.
2. Changed allways to always.
3. Wrapped lines longer than 80 columns.
4. Changed the style of some comments and translated others.
5. Put curly brackets around single line conditional statement.
Modified Paths:
--------------
trunk/jazz/src/PianoWindow.cpp
Modified: trunk/jazz/src/PianoWindow.cpp
===================================================================
--- trunk/jazz/src/PianoWindow.cpp 2009-08-13 22:43:48 UTC (rev 735)
+++ trunk/jazz/src/PianoWindow.cpp 2009-10-15 13:37:04 UTC (rev 736)
@@ -240,7 +240,7 @@
Copy = pKeyOn->Copy()->IsKeyOn();
Win = pPianoWindow;
- // SN++ BUG FIX: undo/redo
+ // BUG FIX: undo/redo
Win->GetSong()->NewUndoBuffer();
wxClientDC Dc(Win);
@@ -301,7 +301,7 @@
int ScrolledX,
int ScrolledY)
{
- // SN++ Key_Aftertouch
+ // Key_Aftertouch
if (Copy->GetEventLength() < mpKeyOn->GetEventLength())
{
int key, channel;
@@ -336,10 +336,10 @@
Win->mpMouseAction = 0;
- // SN++ Veloc- oder Aftertouch-Editor updaten
+ // Velocity or aftertouch editor update.
Win->UpdateControl();
- // allways repaint
+ // always repaint
Win->Refresh();
delete this;
@@ -389,7 +389,7 @@
Copy = k->Copy()->IsPlayTrack();
Win = pPianoWindow;
- // SN++ BUG FIX: undo/redo
+ // BUG FIX: undo/redo
Win->GetSong()->NewUndoBuffer();
//
wxClientDC Dc(Win);
@@ -454,10 +454,10 @@
Win->mpMouseAction = 0;
- // SN++ Veloc- oder Aftertouch-Editor updaten
+ // Velocity or aftertouch editor update.
Win->UpdateControl();
- // allways repaint
+ // always repaint
Win->Refresh();
delete this;
@@ -478,7 +478,7 @@
Win = pPianoWindow;
mpKeyOn = pKeyOn;
- // SN++ BUG FIX: undo/redo
+ // BUG FIX: undo/redo
Win->GetSong()->NewUndoBuffer();
//
wxClientDC Dc(Win);
@@ -809,7 +809,7 @@
mFromClock = mScrolledX * mClockTicsPerPixel;
mToClock = x2Clock(mCanvasWidth);
- // SN++ Because jazz has a ReDo function. Fixes simultaneously update a
+ // Because jazz has a ReDo function. Fixes simultaneously update a
// small problem when multiple ZoomOut. Active Ctrl draw new windows or
// reinitialize.
@@ -1218,12 +1218,13 @@
SetXScrollPosition(x);
}
-// SN++ Is changed. OnPaint always draws new -> Bug Fix for ZoomOut!
-/*
+ // Is changed. OnPaint always draws new -> Bug Fix for ZoomOut!
// OnPaint() redraws only if clock has changed
- if (mpCtrlEdit && TrackIndex >= 0)
- mpCtrlEdit->ReInit(mpTrack, mFromClock, mClockTicsPerPixel);
-*/
+// if (mpCtrlEdit && TrackIndex >= 0)
+// {
+// mpCtrlEdit->ReInit(mpTrack, mFromClock, mClockTicsPerPixel);
+// }
+
Refresh();
}
@@ -1294,9 +1295,17 @@
if (IsBlack(Pitch))
{
Dc.DrawRectangle(0, y, wBlack, mTrackHeight);
- Dc.DrawLine(wBlack, y + mTrackHeight/2, mPianoWidth, y + mTrackHeight/2);
+ Dc.DrawLine(
+ wBlack,
+ y + mTrackHeight / 2,
+ mPianoWidth,
+ y + mTrackHeight / 2);
Dc.SetPen(*wxWHITE_PEN);
- Dc.DrawLine(wBlack + 1, y + mTrackHeight/2+1, mPianoWidth, y + mTrackHeight/2+1);
+ Dc.DrawLine(
+ wBlack + 1,
+ y + mTrackHeight / 2 + 1,
+ mPianoWidth,
+ y + mTrackHeight / 2 + 1);
Dc.DrawLine(0, y, wBlack, y);
Dc.SetPen(*wxBLACK_PEN);
}
@@ -1475,7 +1484,7 @@
int FromPitch = 127 - mToLine;
int ToPitch = 127 - mFromLine;
- // Coordinate for Linien
+ // Coordinate lines.
int x0 = Clock2x(0);
int y0 = TrackIndex2y(64);
@@ -1499,17 +1508,21 @@
// y1 = TrackIndex2y(127 - pEvent->IsPlayTrack()->track);
// // use pitch instead
// }
- // event partially visible?
- if (Clock + Length >= mFromClock && FromPitch < Pitch && Pitch <= ToPitch)
+
+ // Test to determine if the event is partially visible.
+ if (
+ Clock + Length >= mFromClock &&
+ FromPitch < Pitch && Pitch <= ToPitch)
{
int DrawLength = Length / mClockTicsPerPixel;
- // do clipping ourselves
+ // Perform manual clipping.
if (x1 < mEventsX)
{
DrawLength -= mEventsX - x1;
x1 = mEventsX;
}
+
// Always draw at least two pixels to avoid invisible (behind a
// vertical line) or zero-length events:
if (DrawLength < 3)
@@ -1517,7 +1530,7 @@
DrawLength = 3;
}
- // show velocity as colors
+ // Show velocity as colors.
if (!force_color && mUseColors && pEvent->IsKeyOn())
{
int vel = pEvent->IsKeyOn()->GetVelocity();
@@ -1527,9 +1540,12 @@
{
Dc.SetBrush(*Brush);
}
- // end velocity colors
- Dc.DrawRectangle(x1, y1 + mLittleBit, DrawLength, mTrackHeight - 2 * mLittleBit);
+ Dc.DrawRectangle(
+ x1,
+ y1 + mLittleBit,
+ DrawLength,
+ mTrackHeight - 2 * mLittleBit);
//shouldnt it be in drawevent? odd.
if (pEvent->IsPlayTrack())
@@ -1571,8 +1587,15 @@
// Draw text labels drawn at top.
int textlabely = mTopInfoHeight;
- Dc.DrawRectangle(x1-textX, textlabely + mLittleBit, textX, textY);//mTrackHeight - 2 * mLittleBit);
- Dc.DrawText(pEvent->IsText()->GetText(), x1-textX, textlabely + mLittleBit);
+ Dc.DrawRectangle(
+ x1 - textX,
+ textlabely + mLittleBit,
+ textX,
+ textY); //mTrackHeight - 2 * mLittleBit);
+ Dc.DrawText(
+ pEvent->IsText()->GetText(),
+ x1 - textX,
+ textlabely + mLittleBit);
}
}
@@ -1915,7 +1938,7 @@
mpSnapSel->GetRectangle().x + mpSnapSel->GetRectangle().width + 1)));
}
- // SN++ Veloc- oder Aftertouch-Editor updaten
+ // Velocity or aftertouch editor update.
if (mpCtrlEdit)
{
mpCtrlEdit->UpDate();
@@ -2016,7 +2039,9 @@
if (!mpSnapSel->IsSelected())
{
if (msg == 0)
+ {
msg = "please select some events first";
+ }
wxMessageBox((char *)msg, "Error", wxOK);
return 0;
}
@@ -2181,7 +2206,7 @@
Paste(mpTrack, SnapClock(Clock), Pitch);
}
- // allways redraw
+ // always redraw
Refresh();
}
@@ -2349,8 +2374,8 @@
return pTrack == mpTrack;
}
- return (
- mpTrack->Channel == gpConfig->GetValue(C_DrumChannel)) ==
+ return
+ (mpTrack->Channel == gpConfig->GetValue(C_DrumChannel)) ==
(pTrack->Channel == gpConfig->GetValue(C_DrumChannel));
}
@@ -2438,9 +2463,10 @@
{
if (pEvent->GetClock() <= Clock)
{
- if ((pEvent->GetClock() + pEvent->GetLength() >= Clock)
- && (pEvent->GetPitch() == Pitch || Pitch == -1)
- && IsVisible(pEvent))
+ if (
+ (pEvent->GetClock() + pEvent->GetLength() >= Clock) &&
+ (pEvent->GetPitch() == Pitch || Pitch == -1) &&
+ IsVisible(pEvent))
{
return pEvent;
}
@@ -3043,7 +3069,7 @@
// Need a guitar window hint here.
JZProjectManager::Instance()->UpdateAllViews();
- // SN++ Veloc- oder Aftertouch-Editor updaten
+ // Velocity or aftertouch editor update.
if (mpCtrlEdit)
{
mpCtrlEdit->UpDate();
@@ -3064,7 +3090,7 @@
tKeyOn* pEvent = new tKeyOn(0, 0, 64, 64, len);
mPasteBuffer.Put(pEvent);
}
- // SN++
+
if (GetKeyOnEventCount() > 1)
{
// don't change Pitch
@@ -3076,7 +3102,6 @@
JZEvent* pEvent = Iterator.First();
if (pEvent)
{
- // SN++
JZEvent *a = pEvent;
while (a)
{
@@ -3130,7 +3155,8 @@
pEvent = Iterator.Next();
}
pTrack->Cleanup();
- // SN++ Veloc- oder Aftertouch-Editor updaten
+
+ // Velocity or aftertouch editor update.
if (mpCtrlEdit)
{
mpCtrlEdit->UpDate();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2009-08-13 22:43:57
|
Revision: 735
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=735&view=rev
Author: pstieber
Date: 2009-08-13 22:43:48 +0000 (Thu, 13 Aug 2009)
Log Message:
-----------
Added an event table entry for OnMeterChange.
Modified Paths:
--------------
trunk/jazz/src/EventFrame.cpp
Modified: trunk/jazz/src/EventFrame.cpp
===================================================================
--- trunk/jazz/src/EventFrame.cpp 2009-08-13 22:39:39 UTC (rev 734)
+++ trunk/jazz/src/EventFrame.cpp 2009-08-13 22:43:48 UTC (rev 735)
@@ -63,6 +63,7 @@
EVT_UPDATE_UI(ID_LENGTH, JZEventFrame::OnUpdateEventsSelected)
EVT_MENU(ID_LENGTH, JZEventFrame::OnLength)
+ EVT_MENU(ID_METER_CHANGE, JZEventFrame::OnMeterChange)
END_EVENT_TABLE()
//-----------------------------------------------------------------------------
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2009-08-13 22:39:50
|
Revision: 734
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=734&view=rev
Author: pstieber
Date: 2009-08-13 22:39:39 +0000 (Thu, 13 Aug 2009)
Log Message:
-----------
Finished changing C-style I/O to C++ streams.
Modified Paths:
--------------
trunk/jazz/src/StringReadWrite.cpp
Modified: trunk/jazz/src/StringReadWrite.cpp
===================================================================
--- trunk/jazz/src/StringReadWrite.cpp 2009-06-21 23:39:42 UTC (rev 733)
+++ trunk/jazz/src/StringReadWrite.cpp 2009-08-13 22:39:39 UTC (rev 734)
@@ -34,13 +34,13 @@
{
// Ignore through the first ".
Character = Is.get();
- } while (Character != '"' && Character != EOF);
+ } while (Character != '"' && Is.eof());
// This is an intention infinite for loop.
for (;;)
{
Character = Is.get();
- if (Character == '"' || Character != EOF)
+ if (Character == '"' || Is.eof())
{
break;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2009-06-21 23:39:43
|
Revision: 733
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=733&view=rev
Author: pstieber
Date: 2009-06-21 23:39:42 +0000 (Sun, 21 Jun 2009)
Log Message:
-----------
Updated the wxWidgets version to 2.8.10.
Modified Paths:
--------------
web/htdocs/buildingjazz/index.php
web/htdocs/buildingwx/index.php
web/htdocs/download/index.php
web/htdocs/index.php
Modified: web/htdocs/buildingjazz/index.php
===================================================================
--- web/htdocs/buildingjazz/index.php 2009-06-21 20:54:58 UTC (rev 732)
+++ web/htdocs/buildingjazz/index.php 2009-06-21 23:39:42 UTC (rev 733)
@@ -62,7 +62,7 @@
found on this web site, you should set this environment variable to
<TT>C:\ExternalPackages</TT>. The project settings rely on the wxWidgets
subdirectories following the naming convention suggested in the wxWidgets build
-instructions (wxMSW-2.8.8-VC8 for Visual Studio .NET 2005 and wxMSW-2.8.8-VC9
+instructions (wxMSW-2.8.10-VC8 for Visual Studio .NET 2005 and wxMSW-2.8.10-VC9
for Visual Studio .NET 2008).
</P>
Modified: web/htdocs/buildingwx/index.php
===================================================================
--- web/htdocs/buildingwx/index.php 2009-06-21 20:54:58 UTC (rev 732)
+++ web/htdocs/buildingwx/index.php 2009-06-21 23:39:42 UTC (rev 733)
@@ -38,34 +38,34 @@
<OL>
<LI>
Download
-<A NAME="wxMSW-2.8.9.zip-Download"
-HREF="http://prdownloads.sourceforge.net/wxwindows/wxMSW-2.8.9.zip">
-<TT>wxMSW-2.8.9.zip</TT></A> from the wxWidgets web site.
+<A NAME="wxMSW-2.8.10.zip-Download"
+HREF="http://prdownloads.sourceforge.net/wxwindows/wxMSW-2.8.10.zip">
+<TT>wxMSW-2.8.10.zip</TT></A> from the wxWidgets web site.
</LI>
<LI>
Extract the zip file to <TT>C:\ExternalPackages</TT>. Extracting creates a
-<TT>wxMSW-2.8.9</TT> directory directly under <TT>C:\ExternalPackages</TT>.
+<TT>wxMSW-2.8.10</TT> directory directly under <TT>C:\ExternalPackages</TT>.
</LI>
<LI>
Change the name of the top-level wxWidgets directory to
-<TT>wxMSW-2.8.9-VC8</TT> so other versions of wxWidgets can be built with
+<TT>wxMSW-2.8.10-VC8</TT> so other versions of wxWidgets can be built with
other compilers in parallel with this directory.
</LI>
<LI>
If you would like wxWidgets help files in compiled HTML format (*.chm),
-download <TT>wxWidgets-2.8.9-CHM.zip</TT> from the wxWidgets web site, and
-extract the zip file to <TT>C:\ExternalPackages\wxMSW-2.8.9-VC8</TT>. This
+download <TT>wxWidgets-2.8.10-CHM.zip</TT> from the wxWidgets web site, and
+extract the zip file to <TT>C:\ExternalPackages\wxMSW-2.8.10-VC8</TT>. This
installs the compiled HTML help files for wxWidgets and tex2rtf.
</LI>
<LI>
If you would like wxWidgets help files in HTML format, download
-<TT>wxWidgets-2.8.9-HTML.zip</TT> from the wxWidgets web site, and extract the
-zip file to <TT>C:\ExternalPackages\wxMSW-2.8.9-VC8</TT>. This installs the
+<TT>wxWidgets-2.8.10-HTML.zip</TT> from the wxWidgets web site, and extract the
+zip file to <TT>C:\ExternalPackages\wxMSW-2.8.10-VC8</TT>. This installs the
HTML help files for wxWidgets and tex2rtf.
</LI>
<LI>
Make the following changes to
-<TT>C:\ExternalPackages\wxMSW-2.8.9-VC8\include\wx\msw\setup.h</TT>:
+<TT>C:\ExternalPackages\wxMSW-2.8.10-VC8\include\wx\msw\setup.h</TT>:
<P>
@@ -119,7 +119,7 @@
for other projects.
</LI>
<LI>
-Edit <TT>C:\ExternalPackages\wxMSW-2.8.9-VC8\include\wx\msw\wx.rc</TT> and
+Edit <TT>C:\ExternalPackages\wxMSW-2.8.10-VC8\include\wx\msw\wx.rc</TT> and
comment out the following line.
<PRE>
@@ -136,7 +136,7 @@
are installed and ready to run.
</LI>
<LI>
-Change directory to <TT>C:\ExternalPackages\wxMSW-2.8.9-VC8\build\msw</TT>.
+Change directory to <TT>C:\ExternalPackages\wxMSW-2.8.10-VC8\build\msw</TT>.
</LI>
<LI>
Build the debug static version of the wxWidgets libraries by typing:
@@ -155,11 +155,11 @@
</LI>
<LI>To conserve disk space, remove the build directories (<TT>vc_msw</TT> and
-<TT>vc_mswd</TT>) under <TT>c:\ExternalPackages\wxMSW-2.8.9-VC8\build\msw</TT>.
+<TT>vc_mswd</TT>) under <TT>c:\ExternalPackages\wxMSW-2.8.10-VC8\build\msw</TT>.
</LI>
<LI>
Change directory to
-<TT>C:\ExternalPackages\wxMSW-2.8.9-VC8\utils\tex2rtf\src</TT>.
+<TT>C:\ExternalPackages\wxMSW-2.8.10-VC8\utils\tex2rtf\src</TT>.
</LI>
<LI>
Build the release static version of tex2rtf by typing:
@@ -170,16 +170,16 @@
</LI>
<LI>
Create a directory for the tex2rtf binaries under the wxWidgets
-distribution (<TT>c:\ExternalPackages\wxMSW-2.8.9-VC8\bin</TT>).
+distribution (<TT>c:\ExternalPackages\wxMSW-2.8.10-VC8\bin</TT>).
</LI>
<LI>
Move the tex2rtf binaries from
-<TT>c:\ExternalPackages\wxMSW-2.8.9-VC8\utils\tex2rtf\src\vc_msw</TT> to
-<TT>c:\ExternalPackages\wxMSW-2.8.9-VC8\bin</TT>.
+<TT>c:\ExternalPackages\wxMSW-2.8.10-VC8\utils\tex2rtf\src\vc_msw</TT> to
+<TT>c:\ExternalPackages\wxMSW-2.8.10-VC8\bin</TT>.
</LI>
<LI>
To conserve disk space, remove the build directory (vc_msw) under
-<TT>c:\ExternalPackages\wxMSW-2.8.9-VC8\utils\tex2rtf\src</TT>.
+<TT>c:\ExternalPackages\wxMSW-2.8.10-VC8\utils\tex2rtf\src</TT>.
</LI>
</OL>
@@ -194,8 +194,8 @@
trick.
<PRE>
-export PATH=/usr/local/wx289/bin:$PATH
-export LD_LIBRARY_PATH=/usr/local/wx289/lib:$LD_LIBRARY_PATH
+export PATH=/usr/local/wx-2.8.10/bin:$PATH
+export LD_LIBRARY_PATH=/usr/local/wx-2.8.10/lib:$LD_LIBRARY_PATH
</PRE>
After adding the above lines to your <TT>.bash_profile</TT>
@@ -240,7 +240,7 @@
<PRE>
../wxWidgets-2.8/configure \
- --prefix=/usr/local/wx289 \
+ --prefix=/usr/local/wx-2.8.10 \
--disable-no_exceptions \
--disable-no_rtti \
--disable-compat26 \
@@ -282,7 +282,7 @@
<PRE>
cd ../WxBuildRelease
../wxWidgets-2.8/configure \
- --prefix=/usr/local/wx289 \
+ --prefix=/usr/local/wx-2.8.10 \
--disable-no_exceptions \
--disable-no_rtti \
--disable-compat26 \
@@ -326,18 +326,18 @@
<LI>
Download
-<A NAME="wxMac-2.8.9.tar.gz"
-HREF="http://prdownloads.sourceforge.net/wxwindows/wxMac-2.8.9.tar.gz">
-<TT>wxMac-2.8.9.tar.gz</TT></A> from the wxWidgets web site and extract this
+<A NAME="wxMac-2.8.10.tar.gz"
+HREF="http://prdownloads.sourceforge.net/wxwindows/wxMac-2.8.10.tar.gz">
+<TT>wxMac-2.8.10.tar.gz</TT></A> from the wxWidgets web site and extract this
file under your <TT>OutsideSource</TT> directory.
</LI>
-<LI> Create a directory called <TT>WxBuild-2.8.9</TT> in parallel with the
-<TT>wxMac-2.8.9</TT> directory and change directory to that location.
+<LI> Create a directory called <TT>WxBuild-2.8.10</TT> in parallel with the
+<TT>wxMac-2.8.10</TT> directory and change directory to that location.
<PRE>
-mkdir WxBuild-2.8.9
-cd WxBuild-2.8.9
+mkdir WxBuild-2.8.10
+cd WxBuild-2.8.10
</PRE>
</LI>
@@ -345,8 +345,8 @@
configure options.
<PRE>
-../wxMac-2.8.9/configure \
- --prefix=$HOME/wx289 \
+../wxMac-2.8.10/configure \
+ --prefix=$HOME/wx-2.8.10 \
--disable-no_exceptions \
--disable-no_rtti \
--disable-compat26 \
@@ -387,8 +387,8 @@
<TT>.bash_profile</TT> will do the trick.
<PRE>
-export PATH=/usr/local/wx289/bin:$PATH
-export LD_LIBRARY_PATH=/usr/local/wx289/lib:$LD_LIBRARY_PATH
+export PATH=/usr/local/wx-2.8.10/bin:$PATH
+export LD_LIBRARY_PATH=/usr/local/wx-2.8.10/lib:$LD_LIBRARY_PATH
</PRE>
After adding the above lines to your <TT>.bash_profile</TT>
Modified: web/htdocs/download/index.php
===================================================================
--- web/htdocs/download/index.php 2009-06-21 20:54:58 UTC (rev 732)
+++ web/htdocs/download/index.php 2009-06-21 23:39:42 UTC (rev 733)
@@ -38,7 +38,7 @@
<P>
If you still want to just give the currently available 'minimal functionality'
source tarball a try, you will first need to compile and install a non-stock
-build of wxWidgets 2.8.9 to build Jazz++ itself, and the tex2rtf utility which
+build of wxWidgets 2.8.10 to build Jazz++ itself, and the tex2rtf utility which
Jazz++ depends on. View the <a href="/buildingwx/">Building wxWidgets</a> page
and <a href="/buildingtex2rtf/">Building Tex2rtf</a> for details.
</P>
Modified: web/htdocs/index.php
===================================================================
--- web/htdocs/index.php 2009-06-21 20:54:58 UTC (rev 732)
+++ web/htdocs/index.php 2009-06-21 23:39:42 UTC (rev 733)
@@ -35,7 +35,7 @@
only stable MIDI sequencer that runs under both Windows and Linux, we have gone
ahead and forked the source code that was available at http://www.jazzware.com/
(the old Jazzware site) and are in the process of porting it to wxWidgets
-2.8.8. In the process, we'll also be fixing numerous other problems that exist
+2.8.10. In the process, we'll also be fixing numerous other problems that exist
in the code and hopefully find a way to get it to run for Mac OS X as well.
</p>
<p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2009-06-21 20:55:01
|
Revision: 732
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=732&view=rev
Author: pstieber
Date: 2009-06-21 20:54:58 +0000 (Sun, 21 Jun 2009)
Log Message:
-----------
Added new versions of the search and replace and transpose dialogs.
Modified Paths:
--------------
trunk/jazz/src/Dialogs.cpp
trunk/jazz/src/Dialogs.h
trunk/jazz/src/EventWindow.cpp
trunk/jazz/src/Makefile.am
trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj
trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj
Added Paths:
-----------
trunk/jazz/src/Dialogs/SearchAndReplaceDialog.cpp
trunk/jazz/src/Dialogs/SearchAndReplaceDialog.h
trunk/jazz/src/Dialogs/TransposeDialog.cpp
trunk/jazz/src/Dialogs/TransposeDialog.h
Added: trunk/jazz/src/Dialogs/SearchAndReplaceDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/SearchAndReplaceDialog.cpp (rev 0)
+++ trunk/jazz/src/Dialogs/SearchAndReplaceDialog.cpp 2009-06-21 20:54:58 UTC (rev 732)
@@ -0,0 +1,133 @@
+//*****************************************************************************
+// The JAZZ++ Midi Sequencer
+//
+// Copyright (C) 2009 Peter J. Stieber, all rights reserved.
+//
+// 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+//*****************************************************************************
+
+#include "SearchAndReplaceDialog.h"
+
+#include "../Configuration.h"
+#include "../Globals.h"
+#include "../Help.h"
+
+#include <wx/button.h>
+#include <wx/listbox.h>
+#include <wx/sizer.h>
+#include <wx/stattext.h>
+
+using namespace std;
+
+//*****************************************************************************
+//*****************************************************************************
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+BEGIN_EVENT_TABLE(JZSearchAndReplaceDialog, wxDialog)
+
+ EVT_BUTTON(wxID_HELP, JZSearchAndReplaceDialog::OnHelp)
+
+END_EVENT_TABLE()
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+JZSearchAndReplaceDialog::JZSearchAndReplaceDialog(
+ short From,
+ short To,
+ wxWindow* pParent)
+ : wxDialog(
+ pParent,
+ wxID_ANY,
+ wxString("Search and replace controller types")),
+ mFrom(From),
+ mTo(To),
+ mpFromListBox(0),
+ mpToListBox(0)
+
+{
+ mpFromListBox = new wxListBox(this, wxID_ANY);
+ mpToListBox = new wxListBox(this, wxID_ANY);
+
+ const vector<pair<string, int> >& ControlNames =
+ gpConfig->GetControlNames();
+ for (
+ vector<pair<string, int> >::const_iterator iControlName =
+ ControlNames.begin();
+ iControlName != ControlNames.end();
+ ++iControlName)
+ {
+ const string& ControlName = iControlName->first;
+ if (!ControlName.empty())
+ {
+ mpFromListBox->Append(ControlName);
+ mpToListBox->Append(ControlName);
+ }
+ }
+
+ wxButton* pOkButton = new wxButton(this, wxID_OK, "&OK");
+ wxButton* pCancelButton = new wxButton(this, wxID_CANCEL, "Cancel");
+ wxButton* pHelpButton = new wxButton(this, wxID_HELP, "Help");
+ pOkButton->SetDefault();
+
+ wxBoxSizer* pTopSizer = new wxBoxSizer(wxVERTICAL);
+
+ pTopSizer->Add(
+ new wxStaticText(this, wxID_ANY, "Search and replace controller types"),
+ 0,
+ wxALIGN_CENTER | wxALL,
+ 6);
+
+ wxBoxSizer* pLeftSizer = new wxBoxSizer(wxVERTICAL);
+ pLeftSizer->Add(
+ new wxStaticText(this, wxID_ANY, "Search for"),
+ 0,
+ wxALL,
+ 3);
+ pLeftSizer->Add(mpFromListBox, 0, wxALIGN_CENTER | wxALL, 3);
+
+ wxBoxSizer* pRightSizer = new wxBoxSizer(wxVERTICAL);
+ pRightSizer->Add(
+ new wxStaticText(this, wxID_ANY, "Replace with"),
+ 0,
+ wxALL,
+ 3);
+ pRightSizer->Add(mpToListBox, 0, wxALIGN_CENTER | wxALL, 3);
+
+ wxBoxSizer* pListBoxSizer = new wxBoxSizer(wxHORIZONTAL);
+ pListBoxSizer->Add(pLeftSizer, 0, wxALL, 3);
+ pListBoxSizer->Add(pRightSizer, 0, wxALL, 3);
+
+ pTopSizer->Add(pListBoxSizer, 0, wxALL, 3);
+
+ wxBoxSizer* pButtonSizer = new wxBoxSizer(wxHORIZONTAL);
+ pButtonSizer->Add(pOkButton, 0, wxALL, 5);
+ pButtonSizer->Add(pCancelButton, 0, wxALL, 5);
+ pButtonSizer->Add(pHelpButton, 0, wxALL, 5);
+
+ pTopSizer->Add(pButtonSizer, 0, wxALIGN_CENTER | wxBOTTOM, 6);
+
+ SetAutoLayout(true);
+ SetSizer(pTopSizer);
+
+ pTopSizer->SetSizeHints(this);
+ pTopSizer->Fit(this);
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+void JZSearchAndReplaceDialog::OnHelp(wxCommandEvent& Event)
+{
+ gpHelpInstance->ShowTopic("Search Replace");
+}
Property changes on: trunk/jazz/src/Dialogs/SearchAndReplaceDialog.cpp
___________________________________________________________________
Added: svn:eol-style
+ native
Added: trunk/jazz/src/Dialogs/SearchAndReplaceDialog.h
===================================================================
--- trunk/jazz/src/Dialogs/SearchAndReplaceDialog.h (rev 0)
+++ trunk/jazz/src/Dialogs/SearchAndReplaceDialog.h 2009-06-21 20:54:58 UTC (rev 732)
@@ -0,0 +1,51 @@
+//*****************************************************************************
+// The JAZZ++ Midi Sequencer
+//
+// Copyright (C) 2009 Peter J. Stieber, all rights reserved.
+//
+// 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+//*****************************************************************************
+
+#ifndef JZ_SEARCHANDREPLACEDIALOG_H
+#define JZ_SEARCHANDREPLACEDIALOG_H
+
+#include <wx/dialog.h>
+
+class wxListBox;
+
+//*****************************************************************************
+//*****************************************************************************
+class JZSearchAndReplaceDialog : public wxDialog
+{
+ public:
+
+ JZSearchAndReplaceDialog(short From, short To, wxWindow* pParent);
+
+ private:
+
+ void OnHelp(wxCommandEvent& Event);
+
+ private:
+
+ short mFrom;
+ short mTo;
+
+ wxListBox* mpFromListBox;
+ wxListBox* mpToListBox;
+
+ DECLARE_EVENT_TABLE();
+};
+
+#endif // !defined(JZ_SEARCHANDREPLACEDIALOG_H)
Property changes on: trunk/jazz/src/Dialogs/SearchAndReplaceDialog.h
___________________________________________________________________
Added: svn:eol-style
+ native
Added: trunk/jazz/src/Dialogs/TransposeDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/TransposeDialog.cpp (rev 0)
+++ trunk/jazz/src/Dialogs/TransposeDialog.cpp 2009-06-21 20:54:58 UTC (rev 732)
@@ -0,0 +1,175 @@
+//*****************************************************************************
+// The JAZZ++ Midi Sequencer
+//
+// Copyright (C) 2009 Peter J. Stieber, all rights reserved.
+//
+// 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+//*****************************************************************************
+
+#include "TransposeDialog.h"
+
+#include "../Globals.h"
+#include "../Help.h"
+#include "../Knob.h"
+#include "../Resources.h"
+
+#include <wx/button.h>
+#include <wx/checkbox.h>
+#include <wx/combobox.h>
+#include <wx/sizer.h>
+#include <wx/stattext.h>
+
+#include <sstream>
+
+using namespace std;
+
+//*****************************************************************************
+//*****************************************************************************
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+BEGIN_EVENT_TABLE(JZTransposeDialog, wxDialog)
+
+ EVT_KNOB_CHANGED(
+ IDC_KB_AMOUNT,
+ JZTransposeDialog::OnAmountChange)
+
+ EVT_BUTTON(wxID_HELP, JZTransposeDialog::OnHelp)
+
+END_EVENT_TABLE()
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+JZTransposeDialog::JZTransposeDialog(
+ int CurrentScale,
+ int Notes,
+ int Scale,
+ bool FitIntoScale,
+ wxWindow* pParent)
+ : wxDialog(pParent, wxID_ANY, wxString("Transpose")),
+ mNotes(Notes),
+ mScale(Scale),
+ mFitIntoScale(FitIntoScale),
+ mpAmountKnob(0),
+ mpAmountValue(0),
+ mpFitIntoScaleCheckBox(0),
+ mpScaleNamesComboBox(0)
+{
+ wxString CurrentSelectionText;
+ CurrentSelectionText
+ << "Current selection looks like " << gScaleNames[CurrentScale + 2].first;
+
+ mpAmountKnob = new JZKnob(this, IDC_KB_AMOUNT, 0, -12, 12);
+ mpAmountValue = new wxStaticText(this, wxID_ANY, "-00");
+
+ mpFitIntoScaleCheckBox = new wxCheckBox(this, wxID_ANY, "Fit into Scale");
+
+ mpScaleNamesComboBox = new wxComboBox(this, wxID_ANY);
+
+ for (
+ vector<pair<string, int> >::const_iterator iPair = gScaleNames.begin();
+ iPair != gScaleNames.end();
+ ++iPair)
+ {
+ const string& String = iPair->first;
+ mpScaleNamesComboBox->Append(String.c_str());
+ }
+
+ wxButton* pOkButton = new wxButton(this, wxID_OK, "&OK");
+ wxButton* pCancelButton = new wxButton(this, wxID_CANCEL, "Cancel");
+ wxButton* pHelpButton = new wxButton(this, wxID_HELP, "Help");
+ pOkButton->SetDefault();
+
+ wxBoxSizer* pTopSizer = new wxBoxSizer(wxVERTICAL);
+
+ pTopSizer->Add(
+ new wxStaticText(this, wxID_ANY, CurrentSelectionText),
+ 0,
+ wxALIGN_CENTER | wxALL,
+ 5);
+
+ wxFlexGridSizer* pFlexGridSizer = new wxFlexGridSizer(1, 3, 4, 2);
+
+ pFlexGridSizer->Add(
+ new wxStaticText(this, wxID_ANY, "Amount:"),
+ 0,
+ wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL);
+ pFlexGridSizer->Add(
+ mpAmountValue,
+ 0,
+ wxALIGN_CENTER_VERTICAL | wxFIXED_MINSIZE);
+ pFlexGridSizer->Add(mpAmountKnob, 0, wxALIGN_CENTER_VERTICAL);
+
+ pTopSizer->Add(pFlexGridSizer, 0, wxALIGN_CENTER | wxALL, 5);
+
+ pTopSizer->Add(mpFitIntoScaleCheckBox, 0, wxALIGN_CENTER | wxALL, 5);
+
+ pTopSizer->Add(mpScaleNamesComboBox, 0, wxALIGN_CENTER | wxALL, 5);
+
+ wxBoxSizer* pButtonSizer = new wxBoxSizer(wxHORIZONTAL);
+ pButtonSizer->Add(pOkButton, 0, wxALL, 5);
+ pButtonSizer->Add(pCancelButton, 0, wxALL, 5);
+ pButtonSizer->Add(pHelpButton, 0, wxALL, 5);
+
+ pTopSizer->Add(pButtonSizer, 0, wxALIGN_CENTER | wxBOTTOM, 6);
+
+ SetAutoLayout(true);
+ SetSizer(pTopSizer);
+
+ pTopSizer->SetSizeHints(this);
+ pTopSizer->Fit(this);
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+bool JZTransposeDialog::TransferDataToWindow()
+{
+ mpFitIntoScaleCheckBox->SetValue(mFitIntoScale);
+
+ ostringstream Oss;
+
+ Oss << mNotes;
+ mpAmountValue->SetLabel(Oss.str().c_str());
+ mpAmountKnob->SetValue(mNotes);
+
+ return true;
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+bool JZTransposeDialog::TransferDataFromWindow()
+{
+ mFitIntoScale = mpFitIntoScaleCheckBox->GetValue();
+
+ mNotes = mpAmountKnob->GetValue();
+
+ return true;
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+void JZTransposeDialog::OnAmountChange(JZKnobEvent& Event)
+{
+ int Value = Event.GetValue();
+ ostringstream Oss;
+ Oss << Value;
+ mpAmountValue->SetLabel(Oss.str().c_str());
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+void JZTransposeDialog::OnHelp(wxCommandEvent& Event)
+{
+ gpHelpInstance->ShowTopic("Transpose");
+}
Property changes on: trunk/jazz/src/Dialogs/TransposeDialog.cpp
___________________________________________________________________
Added: svn:eol-style
+ native
Added: trunk/jazz/src/Dialogs/TransposeDialog.h
===================================================================
--- trunk/jazz/src/Dialogs/TransposeDialog.h (rev 0)
+++ trunk/jazz/src/Dialogs/TransposeDialog.h 2009-06-21 20:54:58 UTC (rev 732)
@@ -0,0 +1,69 @@
+//*****************************************************************************
+// The JAZZ++ Midi Sequencer
+//
+// Copyright (C) 2009 Peter J. Stieber, all rights reserved.
+//
+// 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+//*****************************************************************************
+
+#ifndef JZ_TRANSPOSEDIALOG_H
+#define JZ_TRANSPOSEDIALOG_H
+
+#include <wx/dialog.h>
+
+class JZKnob;
+class JZKnobEvent;
+class wxCheckBox;
+class wxComboBox;
+class wxStaticText;
+
+//*****************************************************************************
+//*****************************************************************************
+class JZTransposeDialog : public wxDialog
+{
+ public:
+
+ JZTransposeDialog(
+ int CurrentScale,
+ int Notes,
+ int Scale,
+ bool FitIntoScale,
+ wxWindow* pParent);
+
+ private:
+
+ virtual bool TransferDataToWindow();
+
+ virtual bool TransferDataFromWindow();
+
+ void OnAmountChange(JZKnobEvent& Event);
+
+ void OnHelp(wxCommandEvent& Event);
+
+ private:
+
+ int& mNotes;
+ int& mScale;
+ bool& mFitIntoScale;
+
+ JZKnob* mpAmountKnob;
+ wxStaticText* mpAmountValue;
+ wxCheckBox* mpFitIntoScaleCheckBox;
+ wxComboBox* mpScaleNamesComboBox;
+
+ DECLARE_EVENT_TABLE();
+};
+
+#endif // !defined(JZ_TRANSPOSEDIALOG_H)
Property changes on: trunk/jazz/src/Dialogs/TransposeDialog.h
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: trunk/jazz/src/Dialogs.cpp
===================================================================
--- trunk/jazz/src/Dialogs.cpp 2009-06-21 20:46:58 UTC (rev 731)
+++ trunk/jazz/src/Dialogs.cpp 2009-06-21 20:54:58 UTC (rev 732)
@@ -127,11 +127,6 @@
return false;
}
-void tSearchReplaceDlg::OnHelp()
-{
- gpHelpInstance->ShowTopic("Search Replace");
-}
-
void tSearchReplaceDlg::AddProperties()
{
sheet->AddProperty(new wxProperty(
@@ -149,65 +144,7 @@
-
//*****************************************************************************
-// Transpose
-//*****************************************************************************
-
-int tTransposeDlg::Notes = 0;
-int tTransposeDlg::Scale = gScaleChromatic;
-bool tTransposeDlg::FitIntoScale = 0;
-
-tTransposeDlg::tTransposeDlg(JZEventWindow* w, JZFilter *f)
- : tPropertyListDlg("Transpose")
-{
- Filter = f;
- Song = f->GetSong();
-}
-
-
-bool tTransposeDlg::OnClose()
-{
- tCmdTranspose trn(Filter, Notes, Scale, FitIntoScale);
- trn.Execute();
-
- JZProjectManager::Instance()->UpdateAllViews();
-
- return false;
-}
-
-void tTransposeDlg::OnHelp()
-{
- gpHelpInstance->ShowTopic("Transpose");
-}
-
-
-void tTransposeDlg::AddProperties()
-{
- int s = tScale::Analyze(Filter);
-
- sheet->AddProperty(new wxProperty(
- "selection looks like",
- wxPropertyValue(gScaleNames[s + 2].first),
- "string"));
- sheet->AddProperty(new wxProperty(
- "Amount",
- wxPropertyValue(&Notes),
- "integer",
- new wxIntegerListValidator(-12, 12)));
- sheet->AddProperty(new wxProperty(
- "Fit into Scale",
- wxPropertyValue((bool*)&FitIntoScale),
- "bool"));
-}
-
-
-
-
-
-
-
-//*****************************************************************************
// seqLength
//*****************************************************************************
Modified: trunk/jazz/src/Dialogs.h
===================================================================
--- trunk/jazz/src/Dialogs.h 2009-06-21 20:46:58 UTC (rev 731)
+++ trunk/jazz/src/Dialogs.h 2009-06-21 20:54:58 UTC (rev 732)
@@ -68,25 +68,6 @@
void OnHelp();
};
-// Transpose
-class tTransposeDlg : public tPropertyListDlg
-{
- public:
-
- static int Notes; // 0
- static bool FitIntoScale;
- static int Scale;
-
- JZFilter *Filter;
- JZSong *Song;
-
- //tNamedChoice ScaleDlg;
- tTransposeDlg(JZEventWindow* w, JZFilter *f);
- void AddProperties();
- bool OnClose();
- void OnHelp();
-};
-
// seqLength
class tSeqLengthDlg : public tPropertyListDlg
{
Modified: trunk/jazz/src/EventWindow.cpp
===================================================================
--- trunk/jazz/src/EventWindow.cpp 2009-06-21 20:46:58 UTC (rev 731)
+++ trunk/jazz/src/EventWindow.cpp 2009-06-21 20:54:58 UTC (rev 732)
@@ -28,7 +28,9 @@
#include "Dialogs/LengthDialog.h"
#include "Dialogs/MidiChannelDialog.h"
#include "Dialogs/QuantizeDialog.h"
+#include "Dialogs/SearchAndReplaceDialog.h"
#include "Dialogs/ShiftDialog.h"
+#include "Dialogs/TransposeDialog.h"
#include "Dialogs/VelocityDialog.h"
#include "Dialogs.h"
#include "EventFrame.h"
@@ -217,8 +219,23 @@
//-----------------------------------------------------------------------------
void JZEventWindow::Transpose()
{
- tTransposeDlg * dlg = new tTransposeDlg(this, mpFilter);
- dlg->Create();
+ int CurrentScale = tScale::Analyze(mpFilter);
+ int Notes = 0, Scale = gScaleChromatic;
+ bool FitIntoScale = false;
+
+ JZTransposeDialog TransposeDialog(
+ CurrentScale,
+ Notes,
+ Scale,
+ FitIntoScale,
+ this);
+ if (TransposeDialog.ShowModal() == wxID_OK)
+ {
+ tCmdTranspose TransposeCommand(mpFilter, Notes, Scale, FitIntoScale);
+ TransposeCommand.Execute();
+
+ JZProjectManager::Instance()->UpdateAllViews();
+ }
}
//-----------------------------------------------------------------------------
@@ -313,8 +330,17 @@
//-----------------------------------------------------------------------------
void JZEventWindow::SearchReplace()
{
- tSearchReplaceDlg * dlg = new tSearchReplaceDlg(this, mpFilter);
- dlg->Create();
+ short From = 1, To = 1;
+
+ JZSearchAndReplaceDialog SearchAndReplaceDialog(From, To, this);
+ if (SearchAndReplaceDialog.ShowModal() == wxID_OK)
+ {
+ tCmdSearchReplace SearchAndReplaceCommand(mpFilter, From - 1, To - 1);
+
+ SearchAndReplaceCommand.Execute();
+
+ JZProjectManager::Instance()->UpdateAllViews();
+ }
}
//-----------------------------------------------------------------------------
Modified: trunk/jazz/src/Makefile.am
===================================================================
--- trunk/jazz/src/Makefile.am 2009-06-21 20:46:58 UTC (rev 731)
+++ trunk/jazz/src/Makefile.am 2009-06-21 20:54:58 UTC (rev 732)
@@ -31,10 +31,12 @@
Dialogs/MetronomeSettingsDialog.cpp \
Dialogs/MidiChannelDialog.cpp \
Dialogs/QuantizeDialog.cpp \
+Dialogs/SearchAndReplaceDialog.cpp \
Dialogs/ShiftDialog.cpp \
Dialogs/SnapDialog.cpp \
Dialogs/SynthesizerSettingsDialog.cpp \
Dialogs/TrackDialog.cpp \
+Dialogs/TransposeDialog.cpp \
Dialogs/VelocityDialog.cpp \
Dialogs.cpp \
DynamicArray.cpp \
@@ -117,10 +119,12 @@
Dialogs/MetronomeSettingsDialog.cpp \
Dialogs/MidiChannelDialog.cpp \
Dialogs/QuantizeDialog.cpp \
+Dialogs/SearchAndReplaceDialog.cpp \
Dialogs/ShiftDialog.cpp \
Dialogs/SnapDialog.cpp \
Dialogs/SynthesizerSettingsDialog.cpp \
Dialogs/TrackDialog.cpp \
+Dialogs/TransposeDialog.cpp \
Dialogs/VelocityDialog.cpp \
Dialogs.cpp \
DynamicArray.cpp \
@@ -208,10 +212,12 @@
Dialogs/MetronomeSettingsDialog.h \
Dialogs/MidiChannelDialog.h \
Dialogs/QuantizeDialog.h \
+Dialogs/SearchAndReplaceDialog.h \
Dialogs/ShiftDialog.h \
Dialogs/SnapDialog.h \
Dialogs/SynthesizerSettingsDialog.h \
Dialogs/TrackDialog.h \
+Dialogs/TransposeDialog.h \
Dialogs/VelocityDialog.h \
Dialogs.h \
DynamicArray.h \
Modified: trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj
===================================================================
--- trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj 2009-06-21 20:46:58 UTC (rev 731)
+++ trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj 2009-06-21 20:54:58 UTC (rev 732)
@@ -47,7 +47,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.9-VC8\lib\vc_lib\mswd";"$(EXT_PKGS)\wxMSW-2.8.9-VC8\include";..\src;..\src\mswin"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.10-VC8\lib\vc_lib\mswd";"$(EXT_PKGS)\wxMSW-2.8.10-VC8\include";..\src;..\src\mswin"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WINVER=0x0400;STRICT;NOMINMAX;__WXDEBUG__;WXDEBUG=1"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -70,7 +70,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
Culture="1033"
- AdditionalIncludeDirectories="$(EXT_PKGS)\wxMSW-2.8.9-VC8\include"
+ AdditionalIncludeDirectories="$(EXT_PKGS)\wxMSW-2.8.10-VC8\include"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -81,7 +81,7 @@
OutputFile=".\$(OutDir)\JazzPlusPlus.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.9-VC8\lib\vc_lib""
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.10-VC8\lib\vc_lib""
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
ProgramDatabaseFile=".\$(OutDir)\JazzPlusPlus.pdb"
@@ -147,7 +147,7 @@
Name="VCCLCompilerTool"
Optimization="3"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.9-VC8\lib\vc_lib\msw";"$(EXT_PKGS)\wxMSW-2.8.9-VC8\include";..\src;..\src\mswin"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.10-VC8\lib\vc_lib\msw";"$(EXT_PKGS)\wxMSW-2.8.10-VC8\include";..\src;..\src\mswin"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WINVER=0x0400;STRICT;NOMINMAX"
StringPooling="true"
RuntimeLibrary="2"
@@ -171,7 +171,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"
- AdditionalIncludeDirectories="$(EXT_PKGS)\wxMSW-2.8.9-VC8\include"
+ AdditionalIncludeDirectories="$(EXT_PKGS)\wxMSW-2.8.10-VC8\include"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -182,7 +182,7 @@
OutputFile=".\$(OutDir)\JazzPlusPlus.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.9-VC8\lib\vc_lib""
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.10-VC8\lib\vc_lib""
IgnoreDefaultLibraryNames=""
ProgramDatabaseFile=".\$(OutDir)\JazzPlusPlus.pdb"
SubSystem="2"
@@ -899,6 +899,14 @@
>
</File>
<File
+ RelativePath="..\src\Dialogs\SearchAndReplaceDialog.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\src\Dialogs\SearchAndReplaceDialog.h"
+ >
+ </File>
+ <File
RelativePath="..\src\Dialogs\ShiftDialog.cpp"
>
</File>
@@ -931,6 +939,14 @@
>
</File>
<File
+ RelativePath="..\src\Dialogs\TransposeDialog.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\src\Dialogs\TransposeDialog.h"
+ >
+ </File>
+ <File
RelativePath="..\src\Dialogs\VelocityDialog.cpp"
>
</File>
Modified: trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj
===================================================================
--- trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2009-06-21 20:46:58 UTC (rev 731)
+++ trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2009-06-21 20:54:58 UTC (rev 732)
@@ -48,7 +48,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.9-VC9\lib\vc_lib\mswd";"$(EXT_PKGS)\wxMSW-2.8.9-VC9\include";..\src;..\src\mswin"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.10-VC9\lib\vc_lib\mswd";"$(EXT_PKGS)\wxMSW-2.8.10-VC9\include";..\src;..\src\mswin"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WINVER=0x0400;STRICT;NOMINMAX;__WXDEBUG__;WXDEBUG=1"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -72,7 +72,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
Culture="1033"
- AdditionalIncludeDirectories="$(EXT_PKGS)\wxMSW-2.8.9-VC9\include"
+ AdditionalIncludeDirectories="$(EXT_PKGS)\wxMSW-2.8.10-VC9\include"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -83,7 +83,7 @@
OutputFile=".\$(OutDir)\JazzPlusPlus.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.9-VC9\lib\vc_lib""
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.10-VC9\lib\vc_lib""
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
ProgramDatabaseFile=".\$(OutDir)\JazzPlusPlus.pdb"
@@ -148,7 +148,7 @@
Name="VCCLCompilerTool"
Optimization="3"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.9-VC9\lib\vc_lib\msw";"$(EXT_PKGS)\wxMSW-2.8.9-VC9\include";..\src;..\src\mswin"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.10-VC9\lib\vc_lib\msw";"$(EXT_PKGS)\wxMSW-2.8.10-VC9\include";..\src;..\src\mswin"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WINVER=0x0400;STRICT;NOMINMAX"
StringPooling="true"
RuntimeLibrary="2"
@@ -173,7 +173,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"
- AdditionalIncludeDirectories="$(EXT_PKGS)\wxMSW-2.8.9-VC9\include"
+ AdditionalIncludeDirectories="$(EXT_PKGS)\wxMSW-2.8.10-VC9\include"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -184,7 +184,7 @@
OutputFile=".\$(OutDir)\JazzPlusPlus.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.9-VC9\lib\vc_lib""
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.10-VC9\lib\vc_lib""
IgnoreDefaultLibraryNames=""
ProgramDatabaseFile=".\$(OutDir)\JazzPlusPlus.pdb"
SubSystem="2"
@@ -828,7 +828,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Performing Custom Help Build Step"
- CommandLine="echo cd "$(InputDir)"
cd "$(InputDir)"
echo $(EXT_PKGS)\wxMSW-2.8.9-VC9\bin\tex2rtf "$(InputName).tex" "$(InputName).html" -html -twice
$(EXT_PKGS)\wxMSW-2.8.9-VC9\bin\tex2rtf "$(InputName).tex" "$(InputName).html" -html -twice
"
+ CommandLine="echo cd "$(InputDir)"
cd "$(InputDir)"
echo $(EXT_PKGS)\wxMSW-2.8.10-VC9\bin\tex2rtf "$(InputName).tex" "$(InputName).html" -html -twice
$(EXT_PKGS)\wxMSW-2.8.10-VC9\bin\tex2rtf "$(InputName).tex" "$(InputName).html" -html -twice
"
Outputs="$(InputDir)$(InputName)_contents.html;$(InputDir)$(InputName).hhc;$(InputDir)$(InputName).hhp;$(InputDir)$(InputName).hhk;$(InputDir)$(InputName).ref;$(InputDir)$(InputName).con;$(InputDir)$(InputName).htx"
/>
</FileConfiguration>
@@ -837,7 +837,7 @@
>
<Tool
Name="VCCustomBuildTool"
- CommandLine="echo cd "$(InputDir)"
cd "$(InputDir)"
echo $(EXT_PKGS)\wxMSW-2.8.9-VC9\bin\tex2rtf "$(InputName).tex" "$(InputName).html" -html -twice
$(EXT_PKGS)\wxMSW-2.8.9-VC9\bin\tex2rtf "$(InputName).tex" "$(InputName).html" -html -twice
"
+ CommandLine="echo cd "$(InputDir)"
cd "$(InputDir)"
echo $(EXT_PKGS)\wxMSW-2.8.10-VC9\bin\tex2rtf "$(InputName).tex" "$(InputName).html" -html -twice
$(EXT_PKGS)\wxMSW-2.8.10-VC9\bin\tex2rtf "$(InputName).tex" "$(InputName).html" -html -twice
"
Outputs="$(InputDir)$(InputName)_contents.html"
/>
</FileConfiguration>
@@ -919,6 +919,14 @@
>
</File>
<File
+ RelativePath="..\src\Dialogs\SearchAndReplaceDialog.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\src\Dialogs\SearchAndReplaceDialog.h"
+ >
+ </File>
+ <File
RelativePath="..\src\Dialogs\ShiftDialog.cpp"
>
</File>
@@ -951,6 +959,14 @@
>
</File>
<File
+ RelativePath="..\src\Dialogs\TransposeDialog.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\src\Dialogs\TransposeDialog.h"
+ >
+ </File>
+ <File
RelativePath="..\src\Dialogs\VelocityDialog.cpp"
>
</File>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2009-06-21 20:47:01
|
Revision: 731
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=731&view=rev
Author: pstieber
Date: 2009-06-21 20:46:58 +0000 (Sun, 21 Jun 2009)
Log Message:
-----------
1. Updated the style of the search and replace and the transpose command classes.
2. Added function comment header lines in the source file.
Modified Paths:
--------------
trunk/jazz/src/Command.cpp
trunk/jazz/src/Command.h
Modified: trunk/jazz/src/Command.cpp
===================================================================
--- trunk/jazz/src/Command.cpp 2009-06-21 20:10:22 UTC (rev 730)
+++ trunk/jazz/src/Command.cpp 2009-06-21 20:46:58 UTC (rev 731)
@@ -157,21 +157,21 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void tScale::Init(int ScaleNr, JZFilter* pFilter)
+void tScale::Init(int ScaleIndex, JZFilter* pFilter)
{
for (int i = 0; i < 12; ++i)
{
ScaleKeys[i] = 0;
}
- if (ScaleNr == gScaleChromatic)
+ if (ScaleIndex == gScaleChromatic)
{
for (int i = 0; i < 12; ++i)
{
ScaleKeys[i] = 1;
}
}
- else if (ScaleNr == gScaleSelected)
+ else if (ScaleIndex == gScaleSelected)
{
bool Found = false;
tSelectedKeys cmd(pFilter);
@@ -193,7 +193,7 @@
{
for (int i = 0; i < 12; ++i)
{
- ScaleKeys[ (i + ScaleNr) % 12 ] = CMajor[i];
+ ScaleKeys[ (i + ScaleIndex) % 12 ] = CMajor[i];
}
}
}
@@ -318,6 +318,8 @@
{
}
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
void tCmdShift::ExecuteEvent(JZTrack* pTrack, JZEvent* pEvent)
{
JZEvent* pEventCopy = pEvent->Copy();
@@ -326,16 +328,19 @@
pTrack->Put(pEventCopy);
}
-// ************************************************************************
+//*****************************************************************************
// tCmdErase
-// ************************************************************************
-
+//*****************************************************************************
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
tCmdErase::tCmdErase(JZFilter* pFilter, int lvsp)
: tCommand(pFilter)
{
LeaveSpace = lvsp;
}
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
void tCmdErase::Execute(int NewUndo)
{
tCommand::Execute(NewUndo);
@@ -350,15 +355,18 @@
}
}
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
void tCmdErase::ExecuteEvent(JZTrack* pTrack, JZEvent* pEvent)
{
pTrack->Kill(pEvent);
}
-// ************************************************************************
+//*****************************************************************************
// tCmdQuantize
-// ************************************************************************
-
+//*****************************************************************************
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
tCmdQuantize::tCmdQuantize(
JZFilter* pFilter,
int QntClocks,
@@ -375,6 +383,8 @@
{
}
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
long tCmdQuantize::Quantize(int Clock, int islen)
{
Clock += mQntClocks / 2;
@@ -388,6 +398,8 @@
return Clock > MinClock ? Clock : MinClock;
}
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
void tCmdQuantize::ExecuteEvent(JZTrack* pTrack, JZEvent* pEvent)
{
tKeyOn* pKeyOn;
@@ -407,32 +419,40 @@
}
}
-// ************************************************************************
+//*****************************************************************************
// tCmdTranspose
-// ************************************************************************
-
-tCmdTranspose::tCmdTranspose(JZFilter* pFilter, int notes, int ScaleNr, int fit)
- : tCommand(pFilter)
+//*****************************************************************************
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+tCmdTranspose::tCmdTranspose(
+ JZFilter* pFilter,
+ int Notes,
+ int ScaleIndex,
+ bool FitIntoScale)
+ : tCommand(pFilter),
+ mNotes(Notes),
+ mFitIntoScale(FitIntoScale),
+ mScale()
{
- Scale.Init(ScaleNr, mpFilter);
- Notes = notes;
- FitIntoScale = fit;
+ mScale.Init(ScaleIndex, mpFilter);
}
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
void tCmdTranspose::ExecuteEvent(JZTrack* pTrack, JZEvent* pEvent)
{
tKeyOn* pKeyOn;
if (pEvent->IsKeyOn())
{
pKeyOn = (tKeyOn *)pEvent->Copy();
- if (FitIntoScale)
+ if (mFitIntoScale)
{
- pKeyOn->SetKey(pKeyOn->GetKey() + Notes);
- pKeyOn->SetKey(Scale.FitInto(pKeyOn->GetKey()));
+ pKeyOn->SetKey(pKeyOn->GetKey() + mNotes);
+ pKeyOn->SetKey(mScale.FitInto(pKeyOn->GetKey()));
}
- else if (Notes)
+ else if (mNotes)
{
- pKeyOn->SetKey(Scale.Transpose(pKeyOn->GetKey(), Notes));
+ pKeyOn->SetKey(mScale.Transpose(pKeyOn->GetKey(), mNotes));
}
pTrack->Kill(pEvent);
pTrack->Put(pKeyOn);
@@ -442,30 +462,33 @@
if (pEvent->IsKeyPressure())
{
tKeyPressure* pKeyPressure = (tKeyPressure *)pEvent->Copy();
- if (FitIntoScale)
+ if (mFitIntoScale)
{
- pKeyPressure->SetKey(pKeyPressure->GetKey() + Notes);
- pKeyPressure->SetKey(Scale.FitInto(pKeyPressure->GetKey()));
+ pKeyPressure->SetKey(pKeyPressure->GetKey() + mNotes);
+ pKeyPressure->SetKey(mScale.FitInto(pKeyPressure->GetKey()));
}
- else if (Notes)
+ else if (mNotes)
{
- pKeyPressure->SetKey(Scale.Transpose(pKeyPressure->GetKey(), Notes));
+ pKeyPressure->SetKey(mScale.Transpose(pKeyPressure->GetKey(), mNotes));
}
pTrack->Kill(pEvent);
pTrack->Put(pKeyPressure);
}
}
-// ************************************************************************
+//*****************************************************************************
// tCmdSetChannel
-// ************************************************************************
-
+//*****************************************************************************
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
tCmdSetChannel::tCmdSetChannel(JZFilter* pFilter, int NewChannel)
: tCommand(pFilter),
mNewChannel(NewChannel)
{
}
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
void tCmdSetChannel::ExecuteEvent(JZTrack* pTrack, JZEvent* pEvent)
{
tChannelEvent* pChannelEvent;
@@ -479,10 +502,11 @@
}
}
-// ************************************************************************
+//*****************************************************************************
// tCmdVelocity
-// ************************************************************************
-
+//*****************************************************************************
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
tCmdVelocity::tCmdVelocity(
JZFilter* pFilter,
int FromValue,
@@ -495,6 +519,8 @@
{
}
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
void tCmdVelocity::ExecuteEvent(JZTrack* pTrack, JZEvent* pEvent)
{
tKeyOn* pKeyOn;
@@ -528,10 +554,11 @@
}
}
-// ************************************************************************
+//*****************************************************************************
// tCmdLength
-// ************************************************************************
-
+//*****************************************************************************
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
tCmdLength::tCmdLength(
JZFilter* pFilter,
int FromValue,
@@ -544,6 +571,8 @@
{
}
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
void tCmdLength::ExecuteEvent(JZTrack* pTrack, JZEvent* pEvent)
{
tKeyOn* pKeyOn;
@@ -578,14 +607,13 @@
}
}
-
-
-// ************************************************************************
+//*****************************************************************************
// tCmdSeqLength
// This command is supposed to stretch/contract a sequence of events in
// time by factor "scale" from starting point "startClock"
-// ************************************************************************
-
+//*****************************************************************************
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
tCmdSeqLength::tCmdSeqLength(JZFilter* pFilter, double scale)
: tCommand(pFilter)
{
@@ -593,8 +621,9 @@
this->startClock=-1000;
}
-/** move an event according to startclock and scale
- */
+//-----------------------------------------------------------------------------
+// move an event according to startclock and scale
+//-----------------------------------------------------------------------------
void tCmdSeqLength::ExecuteEvent(JZTrack* pTrack, JZEvent* pEvent)
{
// Make a copy of the current event.
@@ -613,21 +642,22 @@
pTrack->Put(k);
}
-
-
-// ************************************************************************
+//*****************************************************************************
// tCmdConvertToModulation
// JAVE this command is supposed convert a midi note sequence
// to a pitch bend/volume control sequence instead
-// ************************************************************************
-
+//*****************************************************************************
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
tCmdConvertToModulation::tCmdConvertToModulation(JZFilter* pFilter)
: tCommand(pFilter)
{
}
-//need to override executetrack, since we have begin/end behaviour in this filter
-
+//-----------------------------------------------------------------------------
+// need to override executetrack, since we have begin/end behaviour in this
+// filter
+//-----------------------------------------------------------------------------
void tCmdConvertToModulation::ExecuteTrack(JZTrack* pTrack)
{
// JAVE:
@@ -714,11 +744,12 @@
pTrack->Cleanup();
}
-// ************************************************************************
+//*****************************************************************************
// tMidiDelayDlg
// JAVE this is a simple midi delay line
-// ************************************************************************
-
+//*****************************************************************************
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
tCmdMidiDelay::tCmdMidiDelay(
JZFilter* pFilter,
double scale,
@@ -731,6 +762,8 @@
this->repeat=repeat;
}
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
void tCmdMidiDelay::ExecuteEvent(JZTrack* pTrack, JZEvent* pEvent)
{
tKeyOn* pKeyOn;
@@ -749,12 +782,11 @@
}
}
-
-
-// ************************************************************************
+//*****************************************************************************
// tCmdCleanup
-// ************************************************************************
-
+//*****************************************************************************
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
tCmdCleanup::tCmdCleanup(JZFilter* pFilter, long clks, int so)
: tCommand(pFilter)
{
@@ -762,12 +794,16 @@
shortenOverlaps = so;
}
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
void tCmdCleanup::ExecuteTrack(JZTrack* pTrack)
{
memset(prev_note, 0, sizeof(prev_note));
tCommand::ExecuteTrack(pTrack);
}
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
void tCmdCleanup::ExecuteEvent(JZTrack* pTrack, JZEvent* pEvent)
{
tKeyOn* pKeyOn;
@@ -799,36 +835,40 @@
}
}
-// ************************************************************************
+//*****************************************************************************
// tCmdSearchReplace
-// ************************************************************************
-
-tCmdSearchReplace::tCmdSearchReplace(JZFilter* pFilter, short sf, short st)
- : tCommand(pFilter)
+//*****************************************************************************
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+tCmdSearchReplace::tCmdSearchReplace(JZFilter* pFilter, short From, short To)
+ : tCommand(pFilter),
+ mFrom(From),
+ mTo(To)
{
- fr = sf;
- to = st;
}
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
void tCmdSearchReplace::ExecuteEvent(JZTrack* pTrack, JZEvent* pEvent)
{
tControl* pControl = pEvent->IsControl();
if (pControl)
{
- if (pControl->GetControl() == fr)
+ if (pControl->GetControl() == mFrom)
{
tControl* pControlCopy = (tControl *)pControl->Copy();
- pControlCopy->SetControl(to);
+ pControlCopy->SetControl(mTo);
pTrack->Kill(pControl);
pTrack->Put(pControlCopy);
}
}
}
-// ************************************************************************
+//*****************************************************************************
// tCmdCopyToBuffer
-// ************************************************************************
-
+//*****************************************************************************
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
tCmdCopyToBuffer::tCmdCopyToBuffer(
JZFilter* pFilter,
tEventArray* pBuffer)
@@ -837,17 +877,18 @@
mpBuffer = pBuffer;
}
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
void tCmdCopyToBuffer::ExecuteEvent(JZTrack* pTrack, JZEvent* pEvent)
{
mpBuffer->Put(pEvent->Copy());
}
-// **********************************************************************
+//*****************************************************************************
// tCmdCopy
-// **********************************************************************
-
-
-
+//*****************************************************************************
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
tCmdCopy::tCmdCopy(JZFilter* pFilter, long dt, long dc)
: tCommand(pFilter)
{
@@ -867,8 +908,8 @@
}
}
-
-
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
void tCmdCopy::ExecuteTrack(JZTrack *s)
{
long StartClock, StopClock;
@@ -985,15 +1026,18 @@
}
}
-// ************************************************************************
+//*****************************************************************************
// tCmdExchLeftRight
-// ************************************************************************
-
+//*****************************************************************************
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
tCmdExchLeftRight::tCmdExchLeftRight(JZFilter* pFilter)
: tCommand(pFilter)
{
}
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
void tCmdExchLeftRight::ExecuteEvent(JZTrack* pTrack, JZEvent* pEvent)
{
if (pEvent->IsKeyOn())
@@ -1006,16 +1050,18 @@
}
}
-
-// ************************************************************************
+//*****************************************************************************
// tCmdExchUpDown
-// ************************************************************************
-
+//*****************************************************************************
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
tCmdExchUpDown::tCmdExchUpDown(JZFilter* pFilter)
: tCommand(pFilter)
{
}
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
void tCmdExchUpDown::ExecuteTrack(JZTrack* pTrack)
{
int i;
Modified: trunk/jazz/src/Command.h
===================================================================
--- trunk/jazz/src/Command.h 2009-06-21 20:10:22 UTC (rev 730)
+++ trunk/jazz/src/Command.h 2009-06-21 20:46:58 UTC (rev 731)
@@ -199,10 +199,15 @@
//*****************************************************************************
class tCmdSearchReplace : public tCommand
{
- short fr, to;
public:
- tCmdSearchReplace(JZFilter* pFilter, short fr, short to);
+
+ tCmdSearchReplace(JZFilter* pFilter, short From, short To);
+
virtual void ExecuteEvent(JZTrack* pTrack, JZEvent* pEvent);
+
+ private:
+
+ short mFrom, mTo;
};
//*****************************************************************************
@@ -239,15 +244,20 @@
class tCmdTranspose : public tCommand
{
public:
- int Notes;
- int FitIntoScale;
- tScale Scale;
+
tCmdTranspose(
JZFilter* pFilter,
int Notes,
- int ScaleNr = 0,
- int FitIntoScale = 0);
+ int ScaleIndex = 0,
+ bool FitIntoScale = false);
+
virtual void ExecuteEvent(JZTrack* pTrack, JZEvent* pEvent);
+
+ private:
+
+ int mNotes;
+ int mFitIntoScale;
+ tScale mScale;
};
//*****************************************************************************
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2009-06-21 20:10:23
|
Revision: 730
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=730&view=rev
Author: pstieber
Date: 2009-06-21 20:10:22 +0000 (Sun, 21 Jun 2009)
Log Message:
-----------
Added a resource ID for the transpose dialog.
Modified Paths:
--------------
trunk/jazz/src/Resources.h
Modified: trunk/jazz/src/Resources.h
===================================================================
--- trunk/jazz/src/Resources.h 2009-06-21 20:06:39 UTC (rev 729)
+++ trunk/jazz/src/Resources.h 2009-06-21 20:10:22 UTC (rev 730)
@@ -105,4 +105,7 @@
#define IDC_KB_GROOVE wxID_HIGHEST + 1230
#define IDC_KB_DELAY wxID_HIGHEST + 1231
+// JZTransposeDialog resource IDs.
+#define IDC_KB_AMOUNT wxID_HIGHEST + 1232
+
#endif // !defined(JZ_RESOURCES_H)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2009-06-21 20:06:40
|
Revision: 729
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=729&view=rev
Author: pstieber
Date: 2009-06-21 20:06:39 +0000 (Sun, 21 Jun 2009)
Log Message:
-----------
Added a wxWidgets event table entry for the search and replace command.
Modified Paths:
--------------
trunk/jazz/src/EventFrame.cpp
Modified: trunk/jazz/src/EventFrame.cpp
===================================================================
--- trunk/jazz/src/EventFrame.cpp 2009-06-21 20:03:06 UTC (rev 728)
+++ trunk/jazz/src/EventFrame.cpp 2009-06-21 20:06:39 UTC (rev 729)
@@ -42,6 +42,9 @@
EVT_UPDATE_UI(ID_CLEANUP, JZEventFrame::OnUpdateEventsSelected)
EVT_MENU(ID_CLEANUP, JZEventFrame::OnCleanup)
+ EVT_UPDATE_UI(ID_SEARCH_AND_REPLACE, JZEventFrame::OnUpdateEventsSelected)
+ EVT_MENU(ID_SEARCH_AND_REPLACE, JZEventFrame::OnSearchReplace)
+
EVT_UPDATE_UI(ID_QUANTIZE, JZEventFrame::OnUpdateEventsSelected)
EVT_MENU(ID_QUANTIZE, JZEventFrame::OnQuantize)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2009-06-21 20:03:07
|
Revision: 728
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=728&view=rev
Author: pstieber
Date: 2009-06-21 20:03:06 +0000 (Sun, 21 Jun 2009)
Log Message:
-----------
1. Changed mCtrlNames to mControlNames.
2. Fixed the reading of the control names.
Modified Paths:
--------------
trunk/jazz/src/Configuration.cpp
trunk/jazz/src/Configuration.h
Modified: trunk/jazz/src/Configuration.cpp
===================================================================
--- trunk/jazz/src/Configuration.cpp 2009-06-21 19:45:17 UTC (rev 727)
+++ trunk/jazz/src/Configuration.cpp 2009-06-21 20:03:06 UTC (rev 728)
@@ -124,7 +124,7 @@
: mFileName(),
mDrumNames(),
mDrumSets(),
- mCtrlNames(),
+ mControlNames(),
mVoiceNames(),
mBankTable()
{
@@ -344,7 +344,7 @@
for (int i = 0; i < 130; ++i)
{
- mCtrlNames.push_back(make_pair("", i));
+ mControlNames.push_back(make_pair("", i));
}
mVoiceNames.push_back(make_pair(pNoneString, 0));
@@ -392,8 +392,8 @@
//-----------------------------------------------------------------------------
const pair<string, int>& JZConfiguration::GetCtrlName(unsigned Entry) const
{
- assert((Entry >= 0) && (Entry < mCtrlNames.size()));
- return mCtrlNames[Entry];
+ assert((Entry >= 0) && (Entry < mControlNames.size()));
+ return mControlNames[Entry];
}
//-----------------------------------------------------------------------------
@@ -795,7 +795,7 @@
pVector = &mDrumSets;
break;
case C_CtrlNames:
- pVector = &mCtrlNames;
+ pVector = &mControlNames;
break;
case C_DrumNames:
pVector = &mDrumNames;
@@ -916,7 +916,7 @@
<< endl;
}
}
- else if (pVector == &mCtrlNames)
+ else if (pVector == &mControlNames)
{
// Controller names.
@@ -924,10 +924,11 @@
Iss >> i;
assert(0 <= i && i <= 127);
- string ControllerName =
- TNStringUtilities::TrimLeadingAndTrailingBlanks(Iss.str());
+ string ControllerName;
+ getline(Iss, ControllerName);
- mCtrlNames[i + 1].first = ControllerName;
+ mControlNames[i + 1].first =
+ TNStringUtilities::TrimLeadingAndTrailingBlanks(ControllerName);
}
else if (pVector == &mDrumNames)
{
Modified: trunk/jazz/src/Configuration.h
===================================================================
--- trunk/jazz/src/Configuration.h 2009-06-21 19:45:17 UTC (rev 727)
+++ trunk/jazz/src/Configuration.h 2009-06-21 20:03:06 UTC (rev 728)
@@ -270,7 +270,7 @@
std::vector<std::pair<std::string, int> > mDrumSets;
- std::vector<std::pair<std::string, int> > mCtrlNames;
+ std::vector<std::pair<std::string, int> > mControlNames;
std::vector<std::pair<std::string, int> > mVoiceNames;
@@ -323,7 +323,7 @@
const std::vector<std::pair<std::string, int> >&
JZConfiguration::GetControlNames() const
{
- return mCtrlNames;
+ return mControlNames;
}
//-----------------------------------------------------------------------------
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2009-06-21 19:45:19
|
Revision: 727
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=727&view=rev
Author: pstieber
Date: 2009-06-21 19:45:17 +0000 (Sun, 21 Jun 2009)
Log Message:
-----------
Removed a duplicated column.
Modified Paths:
--------------
trunk/jazz/conf/ctrlnam.jzi
Modified: trunk/jazz/conf/ctrlnam.jzi
===================================================================
--- trunk/jazz/conf/ctrlnam.jzi 2009-06-13 13:49:23 UTC (rev 726)
+++ trunk/jazz/conf/ctrlnam.jzi 2009-06-21 19:45:17 UTC (rev 727)
@@ -1,69 +1,68 @@
.ctrlnames
-0 0 Bank Select
-1 1 Modulation Wheel (coarse)
-2 2 Breath controller (coarse)
-4 4 Foot Pedal (coarse)
-5 5 Portamento Time (coarse)
-6 6 Data Entry (coarse)
-7 7 Volume (coarse)
-8 8 Balance (coarse)
-10 10 Pan position (coarse)
-11 11 Expression (coarse)
-12 12 Effect Control 1 (coarse)
-13 13 Effect Control 2 (coarse)
-16 16 General Purpose Slider 1
-17 17 General Purpose Slider 2
-18 18 General Purpose Slider 3
-19 19 General Purpose Slider 4
-32 32 Bank Select (fine)
-33 33 Modulation Wheel (fine)
-34 34 Breath controller (fine)
-36 36 Foot Pedal (fine)
-37 37 Portamento Time (fine)
-38 38 Data Entry (fine)
-39 39 Volume (fine)
-40 40 Balance (fine)
-42 42 Pan position (fine)
-43 43 Expression (fine)
-44 44 Effect Control 1 (fine)
-45 45 Effect Control 2 (fine)
-64 64 Hold Pedal (on/off)
-65 65 Portamento (on/off)
-66 66 Sustenuto Pedal (on/off)
-67 67 Soft Pedal (on/off)
-68 68 Legato Pedal (on/off)
-69 69 Hold 2 Pedal (on/off)
-70 70 Sound Variation
-71 71 Sound Timbre
-72 72 Sound Release Time
-73 73 Sound Attack Time
-74 74 Sound Brightness
-75 75 Sound Control 6
-76 76 Sound Control 7
-77 77 Sound Control 8
-78 78 Sound Control 9
-79 79 Sound Control 10
-80 80 General Purpose Button 1 (on/off)
-81 81 General Purpose Button 2 (on/off)
-82 82 General Purpose Button 3 (on/off)
-83 83 General Purpose Button 4 (on/off)
-91 91 Effects Level
-92 92 Tremulo Level
-93 93 Chorus Level
-94 94 Celeste Level
-95 95 Phaser Level
-96 96 Data Button increment
-97 97 Data Button decrement
-98 98 Non-registered Parameter (fine)
-99 99 Non-registered Parameter (coarse)
-100 100 Registered Parameter (fine)
-101 101 Registered Parameter (coarse)
-120 120 All Sound Off
-121 121 All Controllers Off
-122 122 Local Keyboard (on/off)
-123 123 All Notes Off
-124 124 Omni Mode Off
-125 125 Omni Mode On
-126 126 Mono Operation
-127 127 Poly Operation
-
+0 Bank Select
+1 Modulation Wheel (coarse)
+2 Breath controller (coarse)
+4 Foot Pedal (coarse)
+5 Portamento Time (coarse)
+6 Data Entry (coarse)
+7 Volume (coarse)
+8 Balance (coarse)
+10 Pan position (coarse)
+11 Expression (coarse)
+12 Effect Control 1 (coarse)
+13 Effect Control 2 (coarse)
+16 General Purpose Slider 1
+17 General Purpose Slider 2
+18 General Purpose Slider 3
+19 General Purpose Slider 4
+32 Bank Select (fine)
+33 Modulation Wheel (fine)
+34 Breath controller (fine)
+36 Foot Pedal (fine)
+37 Portamento Time (fine)
+38 Data Entry (fine)
+39 Volume (fine)
+40 Balance (fine)
+42 Pan position (fine)
+43 Expression (fine)
+44 Effect Control 1 (fine)
+45 Effect Control 2 (fine)
+64 Hold Pedal (on/off)
+65 Portamento (on/off)
+66 Sustenuto Pedal (on/off)
+67 Soft Pedal (on/off)
+68 Legato Pedal (on/off)
+69 Hold 2 Pedal (on/off)
+70 Sound Variation
+71 Sound Timbre
+72 Sound Release Time
+73 Sound Attack Time
+74 Sound Brightness
+75 Sound Control 6
+76 Sound Control 7
+77 Sound Control 8
+78 Sound Control 9
+79 Sound Control 10
+80 General Purpose Button 1 (on/off)
+81 General Purpose Button 2 (on/off)
+82 General Purpose Button 3 (on/off)
+83 General Purpose Button 4 (on/off)
+91 Effects Level
+92 Tremulo Level
+93 Chorus Level
+94 Celeste Level
+95 Phaser Level
+96 Data Button increment
+97 Data Button decrement
+98 Non-registered Parameter (fine)
+99 Non-registered Parameter (coarse)
+100 Registered Parameter (fine)
+101 Registered Parameter (coarse)
+120 All Sound Off
+121 All Controllers Off
+122 Local Keyboard (on/off)
+123 All Notes Off
+124 Omni Mode Off
+125 Omni Mode On
+126 Mono Operation
+127 Poly Operation
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2009-06-13 14:50:22
|
Revision: 726
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=726&view=rev
Author: pstieber
Date: 2009-06-13 13:49:23 +0000 (Sat, 13 Jun 2009)
Log Message:
-----------
Added Visual Studio .NET 2003 project and solution files that build with
version 2.8.10 of wxWidgets.
Added Paths:
-----------
tex2rtf/VC7.1/tex2rtf_tex2rtf.sln
tex2rtf/VC7.1/tex2rtf_tex2rtf.vcproj
tex2rtf/VC7.1/tex2rtf_tex2rtf_gui.sln
tex2rtf/VC7.1/tex2rtf_tex2rtf_gui.vcproj
Added: tex2rtf/VC7.1/tex2rtf_tex2rtf.sln
===================================================================
--- tex2rtf/VC7.1/tex2rtf_tex2rtf.sln (rev 0)
+++ tex2rtf/VC7.1/tex2rtf_tex2rtf.sln 2009-06-13 13:49:23 UTC (rev 726)
@@ -0,0 +1,65 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tex2rtf", "tex2rtf_tex2rtf.vcproj", "{5461F8C2-211E-4B00-83B7-23144AD22272}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Global
+ GlobalSection(SolutionConfiguration) = preSolution
+ Debug = Debug
+ DLL Debug = DLL Debug
+ DLL Release = DLL Release
+ DLL Unicode Debug = DLL Unicode Debug
+ DLL Unicode Release = DLL Unicode Release
+ DLL Universal Debug = DLL Universal Debug
+ DLL Universal Release = DLL Universal Release
+ DLL Universal Unicode Debug = DLL Universal Unicode Debug
+ DLL Universal Unicode Release = DLL Universal Unicode Release
+ Release = Release
+ Unicode Debug = Unicode Debug
+ Unicode Release = Unicode Release
+ Universal Debug = Universal Debug
+ Universal Release = Universal Release
+ Universal Unicode Debug = Universal Unicode Debug
+ Universal Unicode Release = Universal Unicode Release
+ EndGlobalSection
+ GlobalSection(ProjectDependencies) = postSolution
+ EndGlobalSection
+ GlobalSection(ProjectConfiguration) = postSolution
+ {5461F8C2-211E-4B00-83B7-23144AD22272}.Debug.ActiveCfg = Debug|Win32
+ {5461F8C2-211E-4B00-83B7-23144AD22272}.Debug.Build.0 = Debug|Win32
+ {5461F8C2-211E-4B00-83B7-23144AD22272}.DLL Debug.ActiveCfg = DLL Debug|Win32
+ {5461F8C2-211E-4B00-83B7-23144AD22272}.DLL Debug.Build.0 = DLL Debug|Win32
+ {5461F8C2-211E-4B00-83B7-23144AD22272}.DLL Release.ActiveCfg = DLL Release|Win32
+ {5461F8C2-211E-4B00-83B7-23144AD22272}.DLL Release.Build.0 = DLL Release|Win32
+ {5461F8C2-211E-4B00-83B7-23144AD22272}.DLL Unicode Debug.ActiveCfg = DLL Unicode Debug|Win32
+ {5461F8C2-211E-4B00-83B7-23144AD22272}.DLL Unicode Debug.Build.0 = DLL Unicode Debug|Win32
+ {5461F8C2-211E-4B00-83B7-23144AD22272}.DLL Unicode Release.ActiveCfg = DLL Unicode Release|Win32
+ {5461F8C2-211E-4B00-83B7-23144AD22272}.DLL Unicode Release.Build.0 = DLL Unicode Release|Win32
+ {5461F8C2-211E-4B00-83B7-23144AD22272}.DLL Universal Debug.ActiveCfg = DLL Universal Debug|Win32
+ {5461F8C2-211E-4B00-83B7-23144AD22272}.DLL Universal Debug.Build.0 = DLL Universal Debug|Win32
+ {5461F8C2-211E-4B00-83B7-23144AD22272}.DLL Universal Release.ActiveCfg = DLL Universal Release|Win32
+ {5461F8C2-211E-4B00-83B7-23144AD22272}.DLL Universal Release.Build.0 = DLL Universal Release|Win32
+ {5461F8C2-211E-4B00-83B7-23144AD22272}.DLL Universal Unicode Debug.ActiveCfg = DLL Universal Unicode Debug|Win32
+ {5461F8C2-211E-4B00-83B7-23144AD22272}.DLL Universal Unicode Debug.Build.0 = DLL Universal Unicode Debug|Win32
+ {5461F8C2-211E-4B00-83B7-23144AD22272}.DLL Universal Unicode Release.ActiveCfg = DLL Universal Unicode Release|Win32
+ {5461F8C2-211E-4B00-83B7-23144AD22272}.DLL Universal Unicode Release.Build.0 = DLL Universal Unicode Release|Win32
+ {5461F8C2-211E-4B00-83B7-23144AD22272}.Release.ActiveCfg = Release|Win32
+ {5461F8C2-211E-4B00-83B7-23144AD22272}.Release.Build.0 = Release|Win32
+ {5461F8C2-211E-4B00-83B7-23144AD22272}.Unicode Debug.ActiveCfg = Unicode Debug|Win32
+ {5461F8C2-211E-4B00-83B7-23144AD22272}.Unicode Debug.Build.0 = Unicode Debug|Win32
+ {5461F8C2-211E-4B00-83B7-23144AD22272}.Unicode Release.ActiveCfg = Unicode Release|Win32
+ {5461F8C2-211E-4B00-83B7-23144AD22272}.Unicode Release.Build.0 = Unicode Release|Win32
+ {5461F8C2-211E-4B00-83B7-23144AD22272}.Universal Debug.ActiveCfg = Universal Debug|Win32
+ {5461F8C2-211E-4B00-83B7-23144AD22272}.Universal Debug.Build.0 = Universal Debug|Win32
+ {5461F8C2-211E-4B00-83B7-23144AD22272}.Universal Release.ActiveCfg = Universal Release|Win32
+ {5461F8C2-211E-4B00-83B7-23144AD22272}.Universal Release.Build.0 = Universal Release|Win32
+ {5461F8C2-211E-4B00-83B7-23144AD22272}.Universal Unicode Debug.ActiveCfg = Universal Unicode Debug|Win32
+ {5461F8C2-211E-4B00-83B7-23144AD22272}.Universal Unicode Debug.Build.0 = Universal Unicode Debug|Win32
+ {5461F8C2-211E-4B00-83B7-23144AD22272}.Universal Unicode Release.ActiveCfg = Universal Unicode Release|Win32
+ {5461F8C2-211E-4B00-83B7-23144AD22272}.Universal Unicode Release.Build.0 = Universal Unicode Release|Win32
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ EndGlobalSection
+ GlobalSection(ExtensibilityAddIns) = postSolution
+ EndGlobalSection
+EndGlobal
Property changes on: tex2rtf/VC7.1/tex2rtf_tex2rtf.sln
___________________________________________________________________
Added: svn:eol-style
+ CRLF
Added: tex2rtf/VC7.1/tex2rtf_tex2rtf.vcproj
===================================================================
--- tex2rtf/VC7.1/tex2rtf_tex2rtf.vcproj (rev 0)
+++ tex2rtf/VC7.1/tex2rtf_tex2rtf.vcproj 2009-06-13 13:49:23 UTC (rev 726)
@@ -0,0 +1,2152 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="7.10"
+ Name="tex2rtf"
+ SccProjectName=""
+ SccLocalPath="">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <Configurations>
+ <Configuration
+ Name="Universal Unicode Release|Win32"
+ OutputDirectory=".\vc_mswunivu"
+ IntermediateDirectory=".\vc_mswunivu\tex2rtf"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="1">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/EHsc "
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu,.\..\..\..\include,."
+ PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_CONSOLE;wxUSE_GUI=0;NO_GUI"
+ StringPooling="TRUE"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="TRUE"
+ RuntimeTypeInfo="TRUE"
+ PrecompiledHeaderFile=".\vc_mswunivu\tex2rtf/tex2rtf_tex2rtf.pch"
+ AssemblerListingLocation=".\vc_mswunivu\tex2rtf/"
+ ObjectFile=".\vc_mswunivu\tex2rtf/"
+ ProgramDataBaseFileName="vc_mswunivu\tex2rtf.pdb"
+ WarningLevel="4"
+ SuppressStartupBanner="TRUE"
+ CompileAs="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="wxbase28u.lib wxzlib.lib wxregexu.lib wxexpat.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib"
+ OutputFile="vc_mswunivu\tex2rtf.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
+ ProgramDatabaseFile=".\vc_mswunivu/tex2rtf.pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\vc_mswunivu/tex2rtf_tex2rtf.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__,__WXUNIVERSAL__,_UNICODE,_CONSOLE,wxUSE_GUI=0,NO_GUI"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;."/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Universal Unicode Debug|Win32"
+ OutputDirectory=".\vc_mswunivud"
+ IntermediateDirectory=".\vc_mswunivud\tex2rtf"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="1">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/EHsc "
+ Optimization="0"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud,.\..\..\..\include,."
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_CONSOLE;wxUSE_GUI=0;NO_GUI"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ RuntimeTypeInfo="TRUE"
+ PrecompiledHeaderFile=".\vc_mswunivud\tex2rtf/tex2rtf_tex2rtf.pch"
+ AssemblerListingLocation=".\vc_mswunivud\tex2rtf/"
+ ObjectFile=".\vc_mswunivud\tex2rtf/"
+ ProgramDataBaseFileName="vc_mswunivud\tex2rtf.pdb"
+ WarningLevel="4"
+ SuppressStartupBanner="TRUE"
+ DebugInformationFormat="3"
+ CompileAs="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="wxbase28ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib"
+ OutputFile="vc_mswunivud\tex2rtf.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile=".\vc_mswunivud/tex2rtf.pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\vc_mswunivud/tex2rtf_tex2rtf.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG,__WXMSW__,__WXUNIVERSAL__,__WXDEBUG__,_UNICODE,_CONSOLE,wxUSE_GUI=0,NO_GUI"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;."/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Unicode Debug|Win32"
+ OutputDirectory=".\vc_mswud"
+ IntermediateDirectory=".\vc_mswud\tex2rtf"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="1">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/EHsc "
+ Optimization="0"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud,.\..\..\..\include,."
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_CONSOLE;wxUSE_GUI=0;NO_GUI"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ RuntimeTypeInfo="TRUE"
+ PrecompiledHeaderFile=".\vc_mswud\tex2rtf/tex2rtf_tex2rtf.pch"
+ AssemblerListingLocation=".\vc_mswud\tex2rtf/"
+ ObjectFile=".\vc_mswud\tex2rtf/"
+ ProgramDataBaseFileName="vc_mswud\tex2rtf.pdb"
+ WarningLevel="4"
+ SuppressStartupBanner="TRUE"
+ DebugInformationFormat="3"
+ CompileAs="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="wxbase28ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib"
+ OutputFile="vc_mswud\tex2rtf.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile=".\vc_mswud/tex2rtf.pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\vc_mswud/tex2rtf_tex2rtf.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG,__WXMSW__,__WXDEBUG__,_UNICODE,_CONSOLE,wxUSE_GUI=0,NO_GUI"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;."/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory=".\vc_msw"
+ IntermediateDirectory=".\vc_msw\tex2rtf"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/EHsc "
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="$(EXT_PKGS)\wxMSW-2.8.10-VC7.1\lib\vc_lib\msw,$(EXT_PKGS)\wxMSW-2.8.10-VC7.1\include,."
+ PreprocessorDefinitions="WIN32;__WXMSW__;_CONSOLE;wxUSE_GUI=0;NO_GUI"
+ StringPooling="TRUE"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="TRUE"
+ RuntimeTypeInfo="TRUE"
+ PrecompiledHeaderFile=".\vc_msw\tex2rtf/tex2rtf_tex2rtf.pch"
+ AssemblerListingLocation=".\vc_msw\tex2rtf/"
+ ObjectFile=".\vc_msw\tex2rtf/"
+ ProgramDataBaseFileName="vc_msw\tex2rtf.pdb"
+ WarningLevel="4"
+ SuppressStartupBanner="TRUE"
+ CompileAs="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="wxbase28.lib wxzlib.lib wxregex.lib wxexpat.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib"
+ OutputFile="vc_msw\tex2rtf.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories="$(EXT_PKGS)\wxMSW-2.8.10-VC7.1\lib\vc_lib"
+ ProgramDatabaseFile=".\vc_msw/tex2rtf.pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\vc_msw/tex2rtf_tex2rtf.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__,_CONSOLE,wxUSE_GUI=0,NO_GUI"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\msw;.\..\..\..\include;."/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Universal Release|Win32"
+ OutputDirectory=".\vc_mswuniv"
+ IntermediateDirectory=".\vc_mswuniv\tex2rtf"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/EHsc "
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswuniv,.\..\..\..\include,."
+ PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_CONSOLE;wxUSE_GUI=0;NO_GUI"
+ StringPooling="TRUE"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="TRUE"
+ RuntimeTypeInfo="TRUE"
+ PrecompiledHeaderFile=".\vc_mswuniv\tex2rtf/tex2rtf_tex2rtf.pch"
+ AssemblerListingLocation=".\vc_mswuniv\tex2rtf/"
+ ObjectFile=".\vc_mswuniv\tex2rtf/"
+ ProgramDataBaseFileName="vc_mswuniv\tex2rtf.pdb"
+ WarningLevel="4"
+ SuppressStartupBanner="TRUE"
+ CompileAs="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="wxbase28.lib wxzlib.lib wxregex.lib wxexpat.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib"
+ OutputFile="vc_mswuniv\tex2rtf.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
+ ProgramDatabaseFile=".\vc_mswuniv/tex2rtf.pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\vc_mswuniv/tex2rtf_tex2rtf.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__,__WXUNIVERSAL__,_CONSOLE,wxUSE_GUI=0,NO_GUI"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswuniv;.\..\..\..\include;."/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Universal Debug|Win32"
+ OutputDirectory=".\vc_mswunivd"
+ IntermediateDirectory=".\vc_mswunivd\tex2rtf"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/EHsc "
+ Optimization="0"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivd,.\..\..\..\include,."
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_CONSOLE;wxUSE_GUI=0;NO_GUI"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ RuntimeTypeInfo="TRUE"
+ PrecompiledHeaderFile=".\vc_mswunivd\tex2rtf/tex2rtf_tex2rtf.pch"
+ AssemblerListingLocation=".\vc_mswunivd\tex2rtf/"
+ ObjectFile=".\vc_mswunivd\tex2rtf/"
+ ProgramDataBaseFileName="vc_mswunivd\tex2rtf.pdb"
+ WarningLevel="4"
+ SuppressStartupBanner="TRUE"
+ DebugInformationFormat="3"
+ CompileAs="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="wxbase28d.lib wxzlibd.lib wxregexd.lib wxexpatd.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib"
+ OutputFile="vc_mswunivd\tex2rtf.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile=".\vc_mswunivd/tex2rtf.pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\vc_mswunivd/tex2rtf_tex2rtf.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG,__WXMSW__,__WXUNIVERSAL__,__WXDEBUG__,_CONSOLE,wxUSE_GUI=0,NO_GUI"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivd;.\..\..\..\include;."/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="DLL Unicode Release|Win32"
+ OutputDirectory=".\vc_mswudll"
+ IntermediateDirectory=".\vc_mswudll\tex2rtf"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="1">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/EHsc "
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu,.\..\..\..\include,."
+ PreprocessorDefinitions="WIN32;__WXMSW__;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0;NO_GUI"
+ StringPooling="TRUE"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="TRUE"
+ RuntimeTypeInfo="TRUE"
+ PrecompiledHeaderFile=".\vc_mswudll\tex2rtf/tex2rtf_tex2rtf.pch"
+ AssemblerListingLocation=".\vc_mswudll\tex2rtf/"
+ ObjectFile=".\vc_mswudll\tex2rtf/"
+ ProgramDataBaseFileName="vc_mswudll\tex2rtf.pdb"
+ WarningLevel="4"
+ SuppressStartupBanner="TRUE"
+ CompileAs="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="wxbase28u.lib wxzlib.lib wxregexu.lib wxexpat.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib"
+ OutputFile="vc_mswudll\tex2rtf.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
+ ProgramDatabaseFile=".\vc_mswudll/tex2rtf.pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\vc_mswudll/tex2rtf_tex2rtf.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__,_UNICODE,WXUSINGDLL,_CONSOLE,wxUSE_GUI=0,NO_GUI"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;."/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="DLL Debug|Win32"
+ OutputDirectory=".\vc_mswddll"
+ IntermediateDirectory=".\vc_mswddll\tex2rtf"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/EHsc "
+ Optimization="0"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswd,.\..\..\..\include,."
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0;NO_GUI"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ RuntimeTypeInfo="TRUE"
+ PrecompiledHeaderFile=".\vc_mswddll\tex2rtf/tex2rtf_tex2rtf.pch"
+ AssemblerListingLocation=".\vc_mswddll\tex2rtf/"
+ ObjectFile=".\vc_mswddll\tex2rtf/"
+ ProgramDataBaseFileName="vc_mswddll\tex2rtf.pdb"
+ WarningLevel="4"
+ SuppressStartupBanner="TRUE"
+ DebugInformationFormat="3"
+ CompileAs="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="wxbase28d.lib wxzlibd.lib wxregexd.lib wxexpatd.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib"
+ OutputFile="vc_mswddll\tex2rtf.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile=".\vc_mswddll/tex2rtf.pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\vc_mswddll/tex2rtf_tex2rtf.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG,__WXMSW__,__WXDEBUG__,WXUSINGDLL,_CONSOLE,wxUSE_GUI=0,NO_GUI"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswd;.\..\..\..\include;."/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="DLL Universal Unicode Debug|Win32"
+ OutputDirectory=".\vc_mswunivuddll"
+ IntermediateDirectory=".\vc_mswunivuddll\tex2rtf"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="1">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/EHsc "
+ Optimization="0"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud,.\..\..\..\include,."
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0;NO_GUI"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ RuntimeTypeInfo="TRUE"
+ PrecompiledHeaderFile=".\vc_mswunivuddll\tex2rtf/tex2rtf_tex2rtf.pch"
+ AssemblerListingLocation=".\vc_mswunivuddll\tex2rtf/"
+ ObjectFile=".\vc_mswunivuddll\tex2rtf/"
+ ProgramDataBaseFileName="vc_mswunivuddll\tex2rtf.pdb"
+ WarningLevel="4"
+ SuppressStartupBanner="TRUE"
+ DebugInformationFormat="3"
+ CompileAs="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="wxbase28ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib"
+ OutputFile="vc_mswunivuddll\tex2rtf.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile=".\vc_mswunivuddll/tex2rtf.pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\vc_mswunivuddll/tex2rtf_tex2rtf.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG,__WXMSW__,__WXUNIVERSAL__,__WXDEBUG__,_UNICODE,WXUSINGDLL,_CONSOLE,wxUSE_GUI=0,NO_GUI"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;."/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory=".\vc_mswd"
+ IntermediateDirectory=".\vc_mswd\tex2rtf"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/EHsc "
+ Optimization="0"
+ AdditionalIncludeDirectories="$(EXT_PKGS)\wxMSW-2.8.10-VC7.1\lib\vc_lib\mswd,$(EXT_PKGS)\wxMSW-2.8.10-VC7.1\include,."
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_CONSOLE;wxUSE_GUI=0;NO_GUI"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ RuntimeTypeInfo="TRUE"
+ PrecompiledHeaderFile=".\vc_mswd\tex2rtf/tex2rtf_tex2rtf.pch"
+ AssemblerListingLocation=".\vc_mswd\tex2rtf/"
+ ObjectFile=".\vc_mswd\tex2rtf/"
+ ProgramDataBaseFileName="vc_mswd\tex2rtf.pdb"
+ WarningLevel="4"
+ SuppressStartupBanner="TRUE"
+ DebugInformationFormat="3"
+ CompileAs="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="wxbase28d.lib wxzlibd.lib wxregexd.lib wxexpatd.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib"
+ OutputFile="vc_mswd\tex2rtf.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories="$(EXT_PKGS)\wxMSW-2.8.10-VC7.1\lib\vc_lib"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile=".\vc_mswd/tex2rtf.pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\vc_mswd/tex2rtf_tex2rtf.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG,__WXMSW__,__WXDEBUG__,_CONSOLE,wxUSE_GUI=0,NO_GUI"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswd;.\..\..\..\include;."/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="DLL Universal Release|Win32"
+ OutputDirectory=".\vc_mswunivdll"
+ IntermediateDirectory=".\vc_mswunivdll\tex2rtf"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/EHsc "
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswuniv,.\..\..\..\include,."
+ PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0;NO_GUI"
+ StringPooling="TRUE"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="TRUE"
+ RuntimeTypeInfo="TRUE"
+ PrecompiledHeaderFile=".\vc_mswunivdll\tex2rtf/tex2rtf_tex2rtf.pch"
+ AssemblerListingLocation=".\vc_mswunivdll\tex2rtf/"
+ ObjectFile=".\vc_mswunivdll\tex2rtf/"
+ ProgramDataBaseFileName="vc_mswunivdll\tex2rtf.pdb"
+ WarningLevel="4"
+ SuppressStartupBanner="TRUE"
+ CompileAs="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="wxbase28.lib wxzlib.lib wxregex.lib wxexpat.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib"
+ OutputFile="vc_mswunivdll\tex2rtf.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
+ ProgramDatabaseFile=".\vc_mswunivdll/tex2rtf.pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\vc_mswunivdll/tex2rtf_tex2rtf.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__,__WXUNIVERSAL__,WXUSINGDLL,_CONSOLE,wxUSE_GUI=0,NO_GUI"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswuniv;.\..\..\..\include;."/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="DLL Universal Unicode Release|Win32"
+ OutputDirectory=".\vc_mswunivudll"
+ IntermediateDirectory=".\vc_mswunivudll\tex2rtf"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="1">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/EHsc "
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu,.\..\..\..\include,."
+ PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0;NO_GUI"
+ StringPooling="TRUE"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="TRUE"
+ RuntimeTypeInfo="TRUE"
+ PrecompiledHeaderFile=".\vc_mswunivudll\tex2rtf/tex2rtf_tex2rtf.pch"
+ AssemblerListingLocation=".\vc_mswunivudll\tex2rtf/"
+ ObjectFile=".\vc_mswunivudll\tex2rtf/"
+ ProgramDataBaseFileName="vc_mswunivudll\tex2rtf.pdb"
+ WarningLevel="4"
+ SuppressStartupBanner="TRUE"
+ CompileAs="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="wxbase28u.lib wxzlib.lib wxregexu.lib wxexpat.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib"
+ OutputFile="vc_mswunivudll\tex2rtf.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
+ ProgramDatabaseFile=".\vc_mswunivudll/tex2rtf.pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\vc_mswunivudll/tex2rtf_tex2rtf.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__,__WXUNIVERSAL__,_UNICODE,WXUSINGDLL,_CONSOLE,wxUSE_GUI=0,NO_GUI"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;."/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="DLL Release|Win32"
+ OutputDirectory=".\vc_mswdll"
+ IntermediateDirectory=".\vc_mswdll\tex2rtf"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/EHsc "
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\msw,.\..\..\..\include,."
+ PreprocessorDefinitions="WIN32;__WXMSW__;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0;NO_GUI"
+ StringPooling="TRUE"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="TRUE"
+ RuntimeTypeInfo="TRUE"
+ PrecompiledHeaderFile=".\vc_mswdll\tex2rtf/tex2rtf_tex2rtf.pch"
+ AssemblerListingLocation=".\vc_mswdll\tex2rtf/"
+ ObjectFile=".\vc_mswdll\tex2rtf/"
+ ProgramDataBaseFileName="vc_mswdll\tex2rtf.pdb"
+ WarningLevel="4"
+ SuppressStartupBanner="TRUE"
+ CompileAs="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="wxbase28.lib wxzlib.lib wxregex.lib wxexpat.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib"
+ OutputFile="vc_mswdll\tex2rtf.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
+ ProgramDatabaseFile=".\vc_mswdll/tex2rtf.pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\vc_mswdll/tex2rtf_tex2rtf.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__,WXUSINGDLL,_CONSOLE,wxUSE_GUI=0,NO_GUI"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\msw;.\..\..\..\include;."/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Unicode Release|Win32"
+ OutputDirectory=".\vc_mswu"
+ IntermediateDirectory=".\vc_mswu\tex2rtf"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="1">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/EHsc "
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu,.\..\..\..\include,."
+ PreprocessorDefinitions="WIN32;__WXMSW__;_CONSOLE;wxUSE_GUI=0;NO_GUI"
+ StringPooling="TRUE"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="TRUE"
+ RuntimeTypeInfo="TRUE"
+ PrecompiledHeaderFile=".\vc_mswu\tex2rtf/tex2rtf_tex2rtf.pch"
+ AssemblerListingLocation=".\vc_mswu\tex2rtf/"
+ ObjectFile=".\vc_mswu\tex2rtf/"
+ ProgramDataBaseFileName="vc_mswu\tex2rtf.pdb"
+ WarningLevel="4"
+ SuppressStartupBanner="TRUE"
+ CompileAs="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="wxbase28u.lib wxzlib.lib wxregexu.lib wxexpat.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib"
+ OutputFile="vc_mswu\tex2rtf.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
+ ProgramDatabaseFile=".\vc_mswu/tex2rtf.pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\vc_mswu/tex2rtf_tex2rtf.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="__WXMSW__,_UNICODE,_CONSOLE,wxUSE_GUI=0,NO_GUI"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;."/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="DLL Unicode Debug|Win32"
+ OutputDirectory=".\vc_mswuddll"
+ IntermediateDirectory=".\vc_mswuddll\tex2rtf"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="1">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/EHsc "
+ Optimization="0"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud,.\..\..\..\include,."
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0;NO_GUI"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ RuntimeTypeInfo="TRUE"
+ PrecompiledHeaderFile=".\vc_mswuddll\tex2rtf/tex2rtf_tex2rtf.pch"
+ AssemblerListingLocation=".\vc_mswuddll\tex2rtf/"
+ ObjectFile=".\vc_mswuddll\tex2rtf/"
+ ProgramDataBaseFileName="vc_mswuddll\tex2rtf.pdb"
+ WarningLevel="4"
+ SuppressStartupBanner="TRUE"
+ DebugInformationFormat="3"
+ CompileAs="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="wxbase28ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib"
+ OutputFile="vc_mswuddll\tex2rtf.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile=".\vc_mswuddll/tex2rtf.pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\vc_mswuddll/tex2rtf_tex2rtf.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG,__WXMSW__,__WXDEBUG__,_UNICODE,WXUSINGDLL,_CONSOLE,wxUSE_GUI=0,NO_GUI"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;."/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="DLL Universal Debug|Win32"
+ OutputDirectory=".\vc_mswunivddll"
+ IntermediateDirectory=".\vc_mswunivddll\tex2rtf"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/EHsc "
+ Optimization="0"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivd,.\..\..\..\include,."
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0;NO_GUI"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ RuntimeTypeInfo="TRUE"
+ PrecompiledHeaderFile=".\vc_mswunivddll\tex2rtf/tex2rtf_tex2rtf.pch"
+ AssemblerListingLocation=".\vc_mswunivddll\tex2rtf/"
+ ObjectFile=".\vc_mswunivddll\tex2rtf/"
+ ProgramDataBaseFileName="vc_mswunivddll\tex2rtf.pdb"
+ WarningLevel="4"
+ SuppressStartupBanner="TRUE"
+ DebugInformationFormat="3"
+ CompileAs="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="wxbase28d.lib wxzlibd.lib wxregexd.lib wxexpatd.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib"
+ OutputFile="vc_mswunivddll\tex2rtf.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile=".\vc_mswunivddll/tex2rtf.pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\vc_mswunivddll/tex2rtf_tex2rtf.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG,__WXMSW__,__WXUNIVERSAL__,__WXDEBUG__,WXUSINGDLL,_CONSOLE,wxUSE_GUI=0,NO_GUI"
+ Culture="1033"
+ AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivd;.\..\..\..\include;."/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="">
+ <File
+ RelativePath="..\src\htmlutil.cpp">
+ <FileConfiguration
+ Name="Universal Unicode Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0;NO_GUI;$(NoInherit)"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Universal Unicode Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0;NO_GUI;$(NoInherit)"
+ BasicRuntimeChecks="3"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Unicode Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0;NO_GUI;$(NoInherit)"
+ BasicRuntimeChecks="3"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Universal Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Universal Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="DLL Unicode Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0;NO_GUI;$(NoInherit)"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="DLL Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="DLL Universal Unicode Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0;NO_GUI;$(NoInherit)"
+ BasicRuntimeChecks="3"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="DLL Universal Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="DLL Universal Unicode Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0;NO_GUI;$(NoInherit)"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="DLL Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Unicode Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0;NO_GUI;$(NoInherit)"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="DLL Unicode Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0;NO_GUI;$(NoInherit)"
+ BasicRuntimeChecks="3"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="DLL Universal Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\src\readshg.cpp">
+ <FileConfiguration
+ Name="Universal Unicode Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0;NO_GUI;$(NoInherit)"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Universal Unicode Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0;NO_GUI;$(NoInherit)"
+ BasicRuntimeChecks="3"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Unicode Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0;NO_GUI;$(NoInherit)"
+ BasicRuntimeChecks="3"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Universal Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Universal Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="DLL Unicode Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0;NO_GUI;$(NoInherit)"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="DLL Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="DLL Universal Unicode Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0;NO_GUI;$(NoInherit)"
+ BasicRuntimeChecks="3"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="DLL Universal Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="DLL Universal Unicode Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0;NO_GUI;$(NoInherit)"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="DLL Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Unicode Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0;NO_GUI;$(NoInherit)"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="DLL Unicode Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0;NO_GUI;$(NoInherit)"
+ BasicRuntimeChecks="3"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="DLL Universal Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\src\rtfutils.cpp">
+ <FileConfiguration
+ Name="Universal Unicode Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0;NO_GUI;$(NoInherit)"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Universal Unicode Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0;NO_GUI;$(NoInherit)"
+ BasicRuntimeChecks="3"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Unicode Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0;NO_GUI;$(NoInherit)"
+ BasicRuntimeChecks="3"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Universal Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Universal Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="DLL Unicode Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0;NO_GUI;$(NoInherit)"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="DLL Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="DLL Universal Unicode Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0;NO_GUI;$(NoInherit)"
+ BasicRuntimeChecks="3"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="DLL Universal Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="DLL Universal Unicode Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0;NO_GUI;$(NoInherit)"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="DLL Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Unicode Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0;NO_GUI;$(NoInherit)"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="DLL Unicode Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0;NO_GUI;$(NoInherit)"
+ BasicRuntimeChecks="3"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="DLL Universal Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\src\table.cpp">
+ <FileConfiguration
+ Name="Universal Unicode Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0;NO_GUI;$(NoInherit)"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Universal Unicode Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0;NO_GUI;$(NoInherit)"
+ BasicRuntimeChecks="3"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Unicode Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0;NO_GUI;$(NoInherit)"
+ BasicRuntimeChecks="3"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Universal Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Universal Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="DLL Unicode Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0;NO_GUI;$(NoInherit)"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="DLL Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="DLL Universal Unicode Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0;NO_GUI;$(NoInherit)"
+ BasicRuntimeChecks="3"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="DLL Universal Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="DLL Universal Unicode Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0;NO_GUI;$(NoInherit)"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="DLL Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Unicode Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0;NO_GUI;$(NoInherit)"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="DLL Unicode Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0;NO_GUI;$(NoInherit)"
+ BasicRuntimeChecks="3"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="DLL Universal Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\src\tex2any.cpp">
+ <FileConfiguration
+ Name="Universal Unicode Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0;NO_GUI;$(NoInherit)"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Universal Unicode Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMS...
[truncated message content] |
|
From: <pst...@us...> - 2009-06-13 14:12:57
|
Revision: 725
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=725&view=rev
Author: pstieber
Date: 2009-06-13 13:41:16 +0000 (Sat, 13 Jun 2009)
Log Message:
-----------
Updated to use wxWidgets 2.8.10.
Modified Paths:
--------------
tex2rtf/VC9/tex2rtf_tex2rtf.vcproj
tex2rtf/VC9/tex2rtf_tex2rtf_gui.vcproj
Modified: tex2rtf/VC9/tex2rtf_tex2rtf.vcproj
===================================================================
--- tex2rtf/VC9/tex2rtf_tex2rtf.vcproj 2009-06-13 13:40:54 UTC (rev 724)
+++ tex2rtf/VC9/tex2rtf_tex2rtf.vcproj 2009-06-13 13:41:16 UTC (rev 725)
@@ -330,7 +330,7 @@
AdditionalOptions="/EHsc "
Optimization="2"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.9-VC9\lib\vc_lib\msw";"$(EXT_PKGS)\wxMSW-2.8.9-VC9\include";."
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.10-VC9\lib\vc_lib\msw";"$(EXT_PKGS)\wxMSW-2.8.10-VC9\include";."
PreprocessorDefinitions="WIN32;__WXMSW__;_CONSOLE;wxUSE_GUI=0;NO_GUI"
StringPooling="true"
RuntimeLibrary="2"
@@ -361,7 +361,7 @@
OutputFile="vc_msw\tex2rtf.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(EXT_PKGS)\wxMSW-2.8.9-VC9\lib\vc_lib"
+ AdditionalLibraryDirectories="$(EXT_PKGS)\wxMSW-2.8.10-VC9\lib\vc_lib"
ProgramDatabaseFile=".\vc_msw/tex2rtf.pdb"
SubSystem="1"
RandomizedBaseAddress="1"
@@ -892,7 +892,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/EHsc "
Optimization="0"
- AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.9-VC9\lib\vc_lib\mswd";"$(EXT_PKGS)\wxMSW-2.8.9-VC9\include";."
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.10-VC9\lib\vc_lib\mswd";"$(EXT_PKGS)\wxMSW-2.8.10-VC9\include";."
PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_CONSOLE;wxUSE_GUI=0;NO_GUI"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -924,7 +924,7 @@
OutputFile="vc_mswd\tex2rtf.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(EXT_PKGS)\wxMSW-2.8.9-VC9\lib\vc_lib"
+ AdditionalLibraryDirectories="$(EXT_PKGS)\wxMSW-2.8.10-VC9\lib\vc_lib"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\vc_mswd/tex2rtf.pdb"
SubSystem="1"
Modified: tex2rtf/VC9/tex2rtf_tex2rtf_gui.vcproj
===================================================================
--- tex2rtf/VC9/tex2rtf_tex2rtf_gui.vcproj 2009-06-13 13:40:54 UTC (rev 724)
+++ tex2rtf/VC9/tex2rtf_tex2rtf_gui.vcproj 2009-06-13 13:41:16 UTC (rev 725)
@@ -934,7 +934,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/EHsc "
Optimization="0"
- AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.9-VC9\lib\vc_lib\mswd";"$(EXT_PKGS)\wxMSW-2.8.9-VC9\include";."
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.10-VC9\lib\vc_lib\mswd";"$(EXT_PKGS)\wxMSW-2.8.10-VC9\include";."
PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_WINDOWS;NOPCH"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -955,7 +955,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG,__WXMSW__,__WXDEBUG__,_WINDOWS,NOPCH"
Culture="1033"
- AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.9-VC9\lib\vc_lib\mswd";"$(EXT_PKGS)\wxMSW-2.8.9-VC9\include";."
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.10-VC9\lib\vc_lib\mswd";"$(EXT_PKGS)\wxMSW-2.8.10-VC9\include";."
/>
<Tool
Name="VCPreLinkEventTool"
@@ -966,7 +966,7 @@
OutputFile="vc_mswd\tex2rtf_gui.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.9-VC9\lib\vc_lib""
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.10-VC9\lib\vc_lib""
GenerateDebugInformation="true"
ProgramDatabaseFile=".\vc_mswd/tex2rtf_gui.pdb"
SubSystem="2"
@@ -1229,7 +1229,7 @@
AdditionalOptions="/EHsc "
Optimization="2"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.9-VC9\lib\vc_lib\msw";"$(EXT_PKGS)\wxMSW-2.8.9-VC9\include";."
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.10-VC9\lib\vc_lib\msw";"$(EXT_PKGS)\wxMSW-2.8.10-VC9\include";."
PreprocessorDefinitions="WIN32;__WXMSW__;_WINDOWS;NOPCH"
StringPooling="true"
RuntimeLibrary="2"
@@ -1249,7 +1249,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="__WXMSW__,_WINDOWS,NOPCH"
Culture="1033"
- AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.9-VC9\lib\vc_lib\msw";"$(EXT_PKGS)\wxMSW-2.8.9-VC9\include""
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.10-VC9\lib\vc_lib\msw";"$(EXT_PKGS)\wxMSW-2.8.10-VC9\include""
/>
<Tool
Name="VCPreLinkEventTool"
@@ -1260,7 +1260,7 @@
OutputFile="vc_msw\tex2rtf_gui.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.9-VC9\lib\vc_lib""
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.10-VC9\lib\vc_lib""
ProgramDatabaseFile=".\vc_msw/tex2rtf_gui.pdb"
SubSystem="2"
RandomizedBaseAddress="1"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2009-06-13 14:12:55
|
Revision: 724
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=724&view=rev
Author: pstieber
Date: 2009-06-13 13:40:54 +0000 (Sat, 13 Jun 2009)
Log Message:
-----------
Updated to use wxWidgets 2.8.10.
Modified Paths:
--------------
tex2rtf/VC8/tex2rtf_tex2rtf.vcproj
tex2rtf/VC8/tex2rtf_tex2rtf_gui.vcproj
Modified: tex2rtf/VC8/tex2rtf_tex2rtf.vcproj
===================================================================
--- tex2rtf/VC8/tex2rtf_tex2rtf.vcproj 2009-05-18 03:45:52 UTC (rev 723)
+++ tex2rtf/VC8/tex2rtf_tex2rtf.vcproj 2009-06-13 13:40:54 UTC (rev 724)
@@ -332,7 +332,7 @@
AdditionalOptions="/EHsc "
Optimization="2"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.9-VC8\lib\vc_lib\msw";"$(EXT_PKGS)\wxMSW-2.8.9-VC8\include";."
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.10-VC8\lib\vc_lib\msw";"$(EXT_PKGS)\wxMSW-2.8.10-VC8\include";."
PreprocessorDefinitions="WIN32;__WXMSW__;_CONSOLE;wxUSE_GUI=0;NO_GUI"
StringPooling="true"
RuntimeLibrary="2"
@@ -363,7 +363,7 @@
OutputFile="vc_msw\tex2rtf.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(EXT_PKGS)\wxMSW-2.8.9-VC8\lib\vc_lib"
+ AdditionalLibraryDirectories="$(EXT_PKGS)\wxMSW-2.8.10-VC8\lib\vc_lib"
ProgramDatabaseFile=".\vc_msw/tex2rtf.pdb"
SubSystem="1"
TargetMachine="1"
@@ -900,7 +900,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/EHsc "
Optimization="0"
- AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.9-VC8\lib\vc_lib\mswd";"$(EXT_PKGS)\wxMSW-2.8.9-VC8\include";."
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.10-VC8\lib\vc_lib\mswd";"$(EXT_PKGS)\wxMSW-2.8.10-VC8\include";."
PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_CONSOLE;wxUSE_GUI=0;NO_GUI"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -932,7 +932,7 @@
OutputFile="vc_mswd\tex2rtf.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(EXT_PKGS)\wxMSW-2.8.9-VC8\lib\vc_lib"
+ AdditionalLibraryDirectories="$(EXT_PKGS)\wxMSW-2.8.10-VC8\lib\vc_lib"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\vc_mswd/tex2rtf.pdb"
SubSystem="1"
Modified: tex2rtf/VC8/tex2rtf_tex2rtf_gui.vcproj
===================================================================
--- tex2rtf/VC8/tex2rtf_tex2rtf_gui.vcproj 2009-05-18 03:45:52 UTC (rev 723)
+++ tex2rtf/VC8/tex2rtf_tex2rtf_gui.vcproj 2009-06-13 13:40:54 UTC (rev 724)
@@ -942,7 +942,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/EHsc "
Optimization="0"
- AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.9-VC8\lib\vc_lib\mswd";"$(EXT_PKGS)\wxMSW-2.8.9-VC8\include";."
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.10-VC8\lib\vc_lib\mswd";"$(EXT_PKGS)\wxMSW-2.8.10-VC8\include";."
PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_WINDOWS;NOPCH"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -963,7 +963,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG,__WXMSW__,__WXDEBUG__,_WINDOWS,NOPCH"
Culture="1033"
- AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.9-VC8\lib\vc_lib\mswd";"$(EXT_PKGS)\wxMSW-2.8.9-VC8\include";."
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.10-VC8\lib\vc_lib\mswd";"$(EXT_PKGS)\wxMSW-2.8.10-VC8\include";."
/>
<Tool
Name="VCPreLinkEventTool"
@@ -974,7 +974,7 @@
OutputFile="vc_mswd\tex2rtf_gui.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.9-VC8\lib\vc_lib""
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.10-VC8\lib\vc_lib""
GenerateDebugInformation="true"
ProgramDatabaseFile=".\vc_mswd/tex2rtf_gui.pdb"
SubSystem="2"
@@ -1240,7 +1240,7 @@
AdditionalOptions="/EHsc "
Optimization="2"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.9-VC8\lib\vc_lib\msw";"$(EXT_PKGS)\wxMSW-2.8.9-VC8\include";."
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.10-VC8\lib\vc_lib\msw";"$(EXT_PKGS)\wxMSW-2.8.10-VC8\include";."
PreprocessorDefinitions="WIN32;__WXMSW__;_WINDOWS;NOPCH"
StringPooling="true"
RuntimeLibrary="2"
@@ -1260,7 +1260,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="__WXMSW__,_WINDOWS,NOPCH"
Culture="1033"
- AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.9-VC8\lib\vc_lib\msw";"$(EXT_PKGS)\wxMSW-2.8.9-VC8\include""
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.10-VC8\lib\vc_lib\msw";"$(EXT_PKGS)\wxMSW-2.8.10-VC8\include""
/>
<Tool
Name="VCPreLinkEventTool"
@@ -1271,7 +1271,7 @@
OutputFile="vc_msw\tex2rtf_gui.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.9-VC8\lib\vc_lib""
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.10-VC8\lib\vc_lib""
ProgramDatabaseFile=".\vc_msw/tex2rtf_gui.pdb"
SubSystem="2"
TargetMachine="1"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2009-05-18 03:46:00
|
Revision: 723
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=723&view=rev
Author: pstieber
Date: 2009-05-18 03:45:52 +0000 (Mon, 18 May 2009)
Log Message:
-----------
Changed rec_info to mpRecordingInfo in the Linux code.
Modified Paths:
--------------
trunk/jazz/src/AlsaDriver.cpp
trunk/jazz/src/AudioDriver.cpp
Modified: trunk/jazz/src/AlsaDriver.cpp
===================================================================
--- trunk/jazz/src/AlsaDriver.cpp 2009-05-17 17:51:49 UTC (rev 722)
+++ trunk/jazz/src/AlsaDriver.cpp 2009-05-18 03:45:52 UTC (rev 723)
@@ -56,7 +56,7 @@
mHardExit(true)
{
mpPlayer->mpListener = this;
- mpPlayer->rec_info = 0; // not recording!
+ mpPlayer->mpRecordingInfo = 0; // not recording!
mpPlayer->running_mode = 0;
// SYNC seems not to work?? so add 8 more silent buffers
@@ -76,7 +76,7 @@
mHardExit(true)
{
mpPlayer->mpListener = this;
- mpPlayer->rec_info = 0; // not recording!
+ mpPlayer->mpRecordingInfo = 0; // not recording!
mpPlayer->running_mode = 0;
mpPlayer->OpenDsp(tAlsaAudioPlayer::PLAYBACK, 0);
@@ -195,7 +195,7 @@
curr_speed = midi_speed;
running_mode = 0;
- if (rec_info && rec_info->mpTrack->GetAudioMode())
+ if (mpRecordingInfo && mpRecordingInfo->mpTrack->GetAudioMode())
{
OpenDsp(CAPTURE, 1);
recbuffers.ResetBufferSize(frag_byte_size[CAPTURE]);
@@ -623,12 +623,12 @@
CloseDsp(true);
if (RecordMode())
{
- long frc = rec_info->mFromClock;
+ long frc = mpRecordingInfo->mFromClock;
if (frc < audio_clock_offset)
{
frc = audio_clock_offset;
}
- long toc = rec_info->mToClock;
+ long toc = mpRecordingInfo->mToClock;
if (toc > recd_clock)
{
toc = recd_clock;
Modified: trunk/jazz/src/AudioDriver.cpp
===================================================================
--- trunk/jazz/src/AudioDriver.cpp 2009-05-17 17:51:49 UTC (rev 722)
+++ trunk/jazz/src/AudioDriver.cpp 2009-05-18 03:45:52 UTC (rev 723)
@@ -52,7 +52,7 @@
{
mpPlayer->mpListener = this;
- mpPlayer->rec_info = 0; // not recording!
+ mpPlayer->mpRecordingInfo = 0; // not recording!
// SYNC seems not to work?? so add 8 more silent buffers
// to hear the end of the sample too.
@@ -72,7 +72,7 @@
mHardExit(true)
{
mpPlayer->mpListener = this;
- mpPlayer->rec_info = 0; // not recording!
+ mpPlayer->mpRecordingInfo = 0; // not recording!
mCount = 8 + mpPlayer->mSamples.PrepareListen(&spl, fr_smpl, to_smpl);
mpPlayer->OpenDsp();
@@ -184,7 +184,7 @@
int tAudioPlayer::RecordMode() const
{
- return rec_info != 0 && rec_info->mpTrack->GetAudioMode();
+ return mpRecordingInfo != 0 && mpRecordingInfo->mpTrack->GetAudioMode();
}
void tAudioPlayer::StartAudio()
@@ -531,12 +531,12 @@
CloseDsp(true);
if (RecordMode())
{
- long frc = rec_info->mFromClock;
+ long frc = mpRecordingInfo->mFromClock;
if (frc < start_clock)
{
frc = start_clock;
}
- long toc = rec_info->mToClock;
+ long toc = mpRecordingInfo->mToClock;
if (toc > recd_clock)
{
toc = recd_clock;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2009-05-17 17:52:03
|
Revision: 722
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=722&view=rev
Author: pstieber
Date: 2009-05-17 17:51:49 +0000 (Sun, 17 May 2009)
Log Message:
-----------
1. Changed tMouseAction to JZMouseAction, added window scrolling information to all of the
virtual functions in this class, moved ProcessMouseEvent from the header to the source file,
and implemented in-line functions outside of the class declaration.
2. Made SnapSelectionStart and SnapSelectionStop pure virtual in the JZEventWindow base class.
3. Removed extra header sentry check for wx/timer.h in MouseAction.h and reordered the includes.
4. Updated some function comment headers.
5. Changed tMouseMapper to JZMouseMapper, removed an unused default constructor, renamed the
Button enumeration to TEButton, changed Action to GetAction, and prefixed enumeration entries
with an e.
6. Removed unneeded JZSelection::Select(JZRectangle&, int, int, int, int), and changed
JZSelection::Select(JZRectangle&) to JZSelection::Select(const JZRectangle&).
7. Added window scrolling information to JZSnapSelection::Snap.
8. Used a preprocessor to remove the unused tMouseButton class.
9. Updated some variable names to match the new style convention.
10. Translated a comment in the song module and fixed a typo in a comment in the track frame
header.
11. Commented unused JZTrackWindow::Mark, fixed selection bugs in the track window when
the window was scrolled, removed the line (y = y2yLine(y)) that forced discrete instead of
smooth scrolling of the track text, and commented out unused JZTrackWindow::x2xBar and
JZTrackWindow::x2wBar. x2xBar and x2wBar need to take into account scrolling if they are
reinstated.
Modified Paths:
--------------
trunk/jazz/src/EventWindow.cpp
trunk/jazz/src/EventWindow.h
trunk/jazz/src/MouseAction.cpp
trunk/jazz/src/MouseAction.h
trunk/jazz/src/PianoWindow.cpp
trunk/jazz/src/PianoWindow.h
trunk/jazz/src/SampleWindow.cpp
trunk/jazz/src/Song.cpp
trunk/jazz/src/TrackFrame.cpp
trunk/jazz/src/TrackFrame.h
trunk/jazz/src/TrackWindow.cpp
trunk/jazz/src/TrackWindow.h
Modified: trunk/jazz/src/EventWindow.cpp
===================================================================
--- trunk/jazz/src/EventWindow.cpp 2009-05-17 17:27:44 UTC (rev 721)
+++ trunk/jazz/src/EventWindow.cpp 2009-05-17 17:51:49 UTC (rev 722)
@@ -552,18 +552,6 @@
}
//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-void JZEventWindow::SnapSelectionStart(wxMouseEvent& MouseEvent)
-{
-}
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-void JZEventWindow::SnapSelectionStop(wxMouseEvent& MouseEvent)
-{
-}
-
-//-----------------------------------------------------------------------------
// Descriptions:
// This mouse handler delegates to the subclassed event window.
//-----------------------------------------------------------------------------
@@ -588,7 +576,7 @@
// invalidate a rect).
Refresh();
// }
- mpSnapSel->ProcessMouseEvent(MouseEvent);
+ mpSnapSel->ProcessMouseEvent(MouseEvent, mScrolledX, mScrolledY);
mpMouseAction = mpSnapSel;
}
}
@@ -598,7 +586,7 @@
{
// mpMouseAction active
- if (mpMouseAction->ProcessMouseEvent(MouseEvent))
+ if (mpMouseAction->ProcessMouseEvent(MouseEvent, mScrolledX, mScrolledY))
{
// mpMouseAction finished
Modified: trunk/jazz/src/EventWindow.h
===================================================================
--- trunk/jazz/src/EventWindow.h 2009-05-17 17:27:44 UTC (rev 721)
+++ trunk/jazz/src/EventWindow.h 2009-05-17 17:51:49 UTC (rev 722)
@@ -26,7 +26,7 @@
#include <wx/window.h>
class JZFilter;
-class tMouseAction;
+class JZMouseAction;
class JZSnapSelection;
class JZSong;
class wxDialog;
@@ -102,9 +102,9 @@
int SnapClock(int Clock, bool Up);
- virtual void SnapSelectionStart(wxMouseEvent& MouseEvent);
+ virtual void SnapSelectionStart(wxMouseEvent& MouseEvent) = 0;
- virtual void SnapSelectionStop(wxMouseEvent& MouseEvent);
+ virtual void SnapSelectionStop(wxMouseEvent& MouseEvent) = 0;
void DrawVerticalLine(wxDC& Dc, int XPosition) const;
@@ -126,7 +126,7 @@
JZFilter* mpFilter;
- tMouseAction* mpMouseAction;
+ JZMouseAction* mpMouseAction;
protected:
Modified: trunk/jazz/src/MouseAction.cpp
===================================================================
--- trunk/jazz/src/MouseAction.cpp 2009-05-17 17:27:44 UTC (rev 721)
+++ trunk/jazz/src/MouseAction.cpp 2009-05-17 17:51:49 UTC (rev 722)
@@ -24,52 +24,64 @@
#include "EventWindow.h"
+#include <wx/brush.h>
#include <wx/dcclient.h>
-#include <wx/brush.h>
+//DEBUG#include <iostream>
+
using namespace std;
-// -----------------------------------------------------------------
-// tMouseMapper - map mouse button to Command-ID
-// -----------------------------------------------------------------
-
-tMouseMapper::tMouseMapper(const int a[12])
+//*****************************************************************************
+// Description:
+// This is the mouse mapper class declaration.
+//*****************************************************************************
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+JZMouseMapper::JZMouseMapper(const int Actions[12])
+ : mActions(),
+ mLeftAction(0)
{
for (int i = 0; i < 12; i++)
- actions[i] = a[i];
- left_action = 0;
+ {
+ mActions[i] = Actions[i];
+ }
}
-tMouseMapper::tMouseMapper()
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+void JZMouseMapper::SetAction(
+ int Action,
+ TEButton Button,
+ bool Shift,
+ bool Ctrl)
{
- for (int i = 0; i < 12; i++)
- actions[i] = 0;
- left_action = 0;
-}
-
-void tMouseMapper::SetAction(int code, Button but, bool shift, bool ctrl)
-{
int i = 0;
- switch (but)
+ switch (Button)
{
- case Left:
+ case eLeft:
i = 0;
break;
- case Middle:
+ case eMiddle:
i = 1;
break;
- case Right:
+ case eRight:
i = 2;
break;
}
- if (shift)
+ if (Shift)
+ {
i += 3;
- if (ctrl)
+ }
+ if (Ctrl)
+ {
i += 6;
- actions[i] = code;
+ }
+ mActions[i] = Action;
}
-int tMouseMapper::Action(wxMouseEvent& MouseEvent)
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+int JZMouseMapper::GetAction(wxMouseEvent& MouseEvent)
{
if (!MouseEvent.ButtonDown())
{
@@ -77,15 +89,16 @@
}
if (
- left_action > 0 &&
+ mLeftAction > 0 &&
MouseEvent.LeftDown() &&
!MouseEvent.ShiftDown() &&
!MouseEvent.ControlDown())
{
- return left_action;
+ return mLeftAction;
}
- int i = 0; // left down
+ // Assume the left button is down.
+ int i = 0;
if (MouseEvent.MiddleDown())
{
i = 1;
@@ -99,15 +112,70 @@
{
i += 3;
}
+
if (MouseEvent.ControlDown())
{
i += 6;
}
- return actions[i];
+
+ return mActions[i];
}
//*****************************************************************************
// Description:
+// This is the mouse action base class definition. Derived classes are
+// instantiated in the mouse handler of the event window, for example, to
+// retain state during mouse operations, like drag and drop and so on.
+// The ProcessMouseEvent() function is used to determine what to do with an
+// incoming event. Normally, if the event is a left button down event, call
+// the LeftDown function of the class, and so on.
+//*****************************************************************************
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+JZMouseAction::~JZMouseAction()
+{
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+int JZMouseAction::ProcessMouseEvent(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY)
+{
+ if (MouseEvent.Dragging())
+ {
+ return Dragging(MouseEvent, ScrolledX, ScrolledY);
+ }
+ else if (MouseEvent.LeftDown())
+ {
+ return LeftDown(MouseEvent, ScrolledX, ScrolledY);
+ }
+ else if (MouseEvent.LeftUp())
+ {
+ return LeftUp(MouseEvent, ScrolledX, ScrolledY);
+ }
+ else if (MouseEvent.MiddleDown())
+ {
+ return MiddleDown(MouseEvent, ScrolledX, ScrolledY);
+ }
+ else if (MouseEvent.MiddleUp())
+ {
+ return MiddleUp(MouseEvent, ScrolledX, ScrolledY);
+ }
+ else if (MouseEvent.RightDown())
+ {
+ return RightDown(MouseEvent, ScrolledX, ScrolledY);
+ }
+ else if (MouseEvent.RightUp())
+ {
+ return RightUp(MouseEvent, ScrolledX, ScrolledY);
+ }
+ return 0;
+}
+
+//*****************************************************************************
+// Description:
// This is the selection class definition.
//*****************************************************************************
//-----------------------------------------------------------------------------
@@ -132,26 +200,32 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-int JZSelection::ProcessMouseEvent(wxMouseEvent& MouseEvent)
+int JZSelection::ProcessMouseEvent(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY)
{
if (MouseEvent.ButtonDown())
{
- return ButtonDown(MouseEvent);
+ return ButtonDown(MouseEvent, ScrolledX, ScrolledY);
}
else if (MouseEvent.ButtonUp())
{
- return ButtonUp(MouseEvent);
+ return ButtonUp(MouseEvent, ScrolledX, ScrolledY);
}
else if (MouseEvent.Dragging())
{
- return Dragging(MouseEvent);
+ return Dragging(MouseEvent, ScrolledX, ScrolledY);
}
return 0;
}
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-int JZSelection::ButtonDown(wxMouseEvent& MouseEvent)
+int JZSelection::ButtonDown(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY)
{
if (!mActive)
{
@@ -161,14 +235,14 @@
// Continue selection
JZRectangle Rectangle = mRectangle;
Rectangle.SetNormal();
- Dragging(MouseEvent);
+ Dragging(MouseEvent, ScrolledX, ScrolledY);
}
else
{
mSelected = false;
- int x = MouseEvent.GetX();
- int y = MouseEvent.GetY();
- Snap(x, y, 0);
+ int x = MouseEvent.GetX() + ScrolledX;
+ int y = MouseEvent.GetY() + ScrolledY;
+ Snap(x, y, ScrolledX, ScrolledY, false);
mRectangle.x = x;
mRectangle.y = y;
mRectangle.width = 1;
@@ -180,17 +254,41 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-int JZSelection::Dragging(wxMouseEvent& MouseEvent)
+int JZSelection::ButtonUp(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY)
{
+ if (mActive)
+ {
+ mActive = false;
+ mRectangle.SetNormal();
+
+ // Only select if the rectangle is larger than 3x3 pixels.
+ mSelected = (mRectangle.width > 3 && mRectangle.height > 3);
+ return 1;
+ }
+
+ mpWindow->Refresh();
+ return 0;
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+int JZSelection::Dragging(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY)
+{
if (!mActive)
{
- ButtonDown(MouseEvent);
+ ButtonDown(MouseEvent, ScrolledX, ScrolledY);
}
if (mActive)
{
- int x = MouseEvent.GetX();
- int y = MouseEvent.GetY();
+ int x = MouseEvent.GetX() + ScrolledX;
+ int y = MouseEvent.GetY() + ScrolledY;
if (x < 0)
{
x = 0;
@@ -199,7 +297,7 @@
{
y = 0;
}
- Snap(x, y, 1);
+ Snap(x, y, ScrolledX, ScrolledY, true);
mRectangle.width = x - mRectangle.x;
mRectangle.height = y - mRectangle.y;
@@ -209,27 +307,8 @@
}
//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-int JZSelection::ButtonUp(wxMouseEvent& MouseEvent)
-{
- if (mActive)
- {
- mActive = false;
- mRectangle.SetNormal();
-
- // Only select if the rectangle is larger than 3x3 pixels.
- mSelected = (mRectangle.width > 3 && mRectangle.height > 3);
- return 1;
- }
-
- mpWindow->Refresh();
- return 0;
-}
-
-//-----------------------------------------------------------------------------
// Description:
-// Draw the selected rectangle, normally called from OnDraw
-// in the parent window.
+// Draw the selected rectangle.
//-----------------------------------------------------------------------------
void JZSelection::Draw(wxDC& Dc, int ScrolledX, int ScrolledY)
{
@@ -279,26 +358,15 @@
// It did this by drawing directly in the device context. This is bad, so I
// tried changing it to invalidation instead.
//-----------------------------------------------------------------------------
-void JZSelection::Select(JZRectangle& Rectangle, int x, int y, int w, int h)
+void JZSelection::Select(const JZRectangle& Rectangle)
{
- // clear old rectangle
- // Draw(x, y, w, h);
- // make new one
mRectangle = Rectangle;
mSelected = true;
- // Draw(x, y, w, h);
// Inefficient because should invalidate only the rectangle.
mpWindow->Refresh();
}
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-void JZSelection::Select(JZRectangle& Rectangle)
-{
- Select(Rectangle, 0, 0, 3000, 3000);
-}
-
//*****************************************************************************
// Description:
// This is the snap selection class definition.
@@ -320,47 +388,52 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZSnapSelection::Snap(int& x, int& y, bool drag)
+void JZSnapSelection::Snap(
+ int& x,
+ int& y,
+ int ScrolledX,
+ int ScrolledY,
+ bool Up)
{
if (!mXCoordinates.empty())
{
- SnapToVector(x, mXCoordinates, drag);
+ SnapToVector(x, mXCoordinates, ScrolledX, Up);
}
else if (mXStep)
{
- SnapMod(x, mXMin, mXMax, mXStep, drag);
+ SnapMod(x, mXMin, mXMax, mXStep, ScrolledX, Up);
}
if (!mYCoordinates.empty())
{
- SnapToVector(y, mYCoordinates, drag);
+ SnapToVector(y, mYCoordinates, ScrolledY, Up);
}
else if (mYStep)
{
- SnapMod(y, mYMin, mYMax, mYStep, drag);
+ SnapMod(y, mYMin, mYMax, mYStep, ScrolledY, Up);
}
}
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZSnapSelection::SetXSnap(int XCount, int* pXVector)
+void JZSnapSelection::SetXSnap(int XCount, int* pXVector, int ScrolledX)
{
mXCoordinates.clear();
for (int i = 0; i < XCount; ++i)
{
- mXCoordinates.push_back(pXVector[i]);
+ mXCoordinates.push_back(pXVector[i] + ScrolledX);
}
mXStep = 0;
}
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZSnapSelection::SetYSnap(int YCount, int* pYVector)
+void JZSnapSelection::SetYSnap(int YCount, int* pYVector, int ScrolledY)
{
mYCoordinates.clear();
for (int i = 0; i < YCount; ++i)
{
- mXCoordinates.push_back(pYVector[i]);
+ mXCoordinates.push_back(pYVector[i] + ScrolledY);
}
mYStep = 0;
}
@@ -390,8 +463,10 @@
void JZSnapSelection::SnapToVector(
int& Coordinate,
vector<int> Vector,
+ int Scrolled,
bool Up)
{
+//DEBUG cout << "In: " << Coordinate;
for (unsigned i = 0; i < Vector.size(); ++i)
{
if (Vector[i] > Coordinate)
@@ -404,9 +479,11 @@
{
Coordinate = Vector[i - 1];
}
+//DEBUG cout << " Out: " << Coordinate << endl;
return;
}
}
+//DEBUG cout << " Out: " << Coordinate << endl;
Coordinate = Vector[Vector.size() - 1];
}
@@ -417,8 +494,10 @@
int Min,
int Max,
int Step,
+ int Scrolled,
bool Up)
{
+//DEBUG cout << "In: " << Coordinate;
if (Coordinate <= Min)
{
Coordinate = Min;
@@ -427,13 +506,15 @@
if (Coordinate >= Max)
{
Coordinate = Max;
+//DEBUG cout << "Max: " << Coordinate << endl;
return;
}
- Coordinate -= (Coordinate - Min) % Step;
+ Coordinate -= (Coordinate - Min) % Step - (Scrolled % Step);
if (Up)
{
Coordinate += Step;
}
+//DEBUG cout << " Out: " << Coordinate << endl;
}
@@ -461,7 +542,10 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-int tMouseCounter::LeftDown(wxMouseEvent& MouseEvent)
+int tMouseCounter::LeftDown(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY)
{
Delta = MouseEvent.ShiftDown() ? 10 : 1;
Start(Timeout);
@@ -478,7 +562,10 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-int tMouseCounter::LeftUp(wxMouseEvent& MouseEvent)
+int tMouseCounter::LeftUp(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY)
{
Stop();
ShowValue(FALSE);
@@ -487,7 +574,10 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-int tMouseCounter::RightDown(wxMouseEvent& MouseEvent)
+int tMouseCounter::RightDown(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY)
{
Delta = MouseEvent.ShiftDown() ? -10 : -1;
Start(Timeout);
@@ -505,7 +595,10 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-int tMouseCounter::RightUp(wxMouseEvent& MouseEvent)
+int tMouseCounter::RightUp(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY)
{
Stop();
ShowValue(FALSE);
@@ -558,7 +651,10 @@
//Frame->SetStatusText("Click Destination point");
}
-int tMarkDestin::ButtonDown(wxMouseEvent& MouseEvent)
+int tMarkDestin::ButtonDown(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY)
{
wxCursor c = wxCursor(wxCURSOR_ARROW);
Canvas->SetCursor(c);
@@ -571,28 +667,38 @@
x=point.x;
y=point.y;
- // cout<<"tMarkDestin::ButtonDown "<<x<<" "<<y<<endl;
+//DEBUG cout << "tMarkDestin::ButtonDown " << x << ' ' << y <<endl;
return 1;
}
-int tMarkDestin::RightDown(wxMouseEvent& MouseEvent)
+int tMarkDestin::RightDown(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY)
{
- ButtonDown(MouseEvent);
+ ButtonDown(MouseEvent, ScrolledX, ScrolledY);
Aborted = 1;
//Frame->SetStatusText("Operation aborted");
return 1;
}
-int tMarkDestin::LeftDown(wxMouseEvent& MouseEvent)
+int tMarkDestin::LeftDown(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY)
{
- ButtonDown(MouseEvent);
+ ButtonDown(MouseEvent, ScrolledX, ScrolledY);
Aborted = 0;
//Frame->SetStatusText("");
return 1;
}
+#if 0
+
//*****************************************************************************
-// tMouseButton - simulate a 3D button
+// Description:
+// This is the mouse button class definition. This class simulates a 3D
+// button.
//*****************************************************************************
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
@@ -640,7 +746,10 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-int tMouseButton::ProcessMouseEvent(wxMouseEvent& MouseEvent)
+int tMouseButton::ProcessMouseEvent(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY)
{
if (MouseEvent.ButtonUp())
{
@@ -663,3 +772,5 @@
}
return 0;
}
+
+#endif
Modified: trunk/jazz/src/MouseAction.h
===================================================================
--- trunk/jazz/src/MouseAction.h 2009-05-17 17:27:44 UTC (rev 721)
+++ trunk/jazz/src/MouseAction.h 2009-05-17 17:51:49 UTC (rev 722)
@@ -23,16 +23,16 @@
#ifndef JZ_MOUSEACTION_H
#define JZ_MOUSEACTION_H
-#ifndef wx_timerh
-#include <wx/timer.h>
-#endif
-
#include "Rectangle.h"
#include <vector>
+#include <wx/timer.h>
+
class JZEventWindow;
+//*****************************************************************************
+//*****************************************************************************
enum TEMousePlayMode
{
eMouse,
@@ -43,110 +43,115 @@
};
//*****************************************************************************
+// Description:
+// This is the mouse mapper class declaration. This class maps the state of
+// the mouse and certain keyboard keys into user defined integer codes. There
+// are 12 possible mouse button / keyboard key combinations. They are:
+//
+// 0, 1, 2 = left, middle, right down
+// 3, 4, 5 = left, middle, right down + shift
+// 6, 7, 8 = left, middle, right down + ctrl
+// 9, 10, 11 = left, middle, right down + ctrl + shift
+//
+// Note that combinations or mouse buttons are not considered.
+// The function GetAction converts a wxWidgets mouse event into a user
+// defined code. The default code for all mouse actions is 0.
//*****************************************************************************
-class tMouseMapper
+class JZMouseMapper
{
public:
- // actions
- // 0..2 = left/middle/right down
- // 3..5 = left/middle/right down + shift
- // 6..8 = left/middle/right down + ctrl
- // 9..11 = left/middle/right down + ctrl + shift
+ JZMouseMapper(const int Actions[12]);
- tMouseMapper(const int actions[12]);
-
- tMouseMapper();
-
- enum Button
+ enum TEButton
{
- Left,
- Middle,
- Right
+ eLeft,
+ eMiddle,
+ eRight
};
+ int GetAction(wxMouseEvent& MouseEvent);
+
void SetAction(
- int code,
- Button but = Left,
- bool shift = false,
- bool ctrl = false);
+ int Action,
+ TEButton Button = eLeft,
+ bool Shift = false,
+ bool Ctrl = false);
- int Action(wxMouseEvent& MouseEvent);
-
- void SetLeftAction(int id = 0)
+ void SetLeftAction(int Action = 0)
{
- left_action = id;
+ mLeftAction = Action;
}
private:
- int actions[12];
+ int mActions[12];
- int left_action;
+ int mLeftAction;
};
//*****************************************************************************
// Description:
-// This is a base class for mouse actions. The classes are instantiated in
-// the mouse handler of the event window, for example, to keep state during
-// mouse operations, like drag and drop and so on.
+// This is the mouse action base class declaration. Derived classes are
+// instantiated in the mouse handler of the event window, for example, to
+// retain state during mouse operations, like drag and drop and so on.
// The ProcessMouseEvent() function is used to determine what to do with an
-// incoming event. Normally, if the event is a drag event, call the drag
-// function of the class, and so on.
+// incoming event. Normally, if the event is a left button down event, call
+// the LeftDown function of the class, and so on.
//*****************************************************************************
-class tMouseAction
+class JZMouseAction
{
public:
- virtual ~tMouseAction() {}
- virtual int Dragging(wxMouseEvent& MouseEvent) { return 0; }
- virtual int LeftDown(wxMouseEvent& MouseEvent) { return 0; }
- virtual int LeftUp(wxMouseEvent& MouseEvent) { return 0; }
- virtual int RightDown(wxMouseEvent& MouseEvent) { return 0; }
- virtual int RightUp(wxMouseEvent& MouseEvent) { return 0; }
- virtual int MiddleDown(wxMouseEvent& MouseEvent) { return 0; }
- virtual int MiddleUp(wxMouseEvent& MouseEvent) { return 0; }
- virtual int ProcessMouseEvent(wxMouseEvent& MouseEvent)
- {
- if (MouseEvent.Dragging())
- {
- return Dragging(MouseEvent);
- }
- else if (MouseEvent.LeftDown())
- {
- return LeftDown(MouseEvent);
- }
- else if (MouseEvent.LeftUp())
- {
- return LeftUp(MouseEvent);
- }
- else if (MouseEvent.MiddleDown())
- {
- return MiddleDown(MouseEvent);
- }
- else if (MouseEvent.MiddleUp())
- {
- return MiddleUp(MouseEvent);
- }
- else if (MouseEvent.RightDown())
- {
- return RightDown(MouseEvent);
- }
- else if (MouseEvent.RightUp())
- {
- return RightUp(MouseEvent);
- }
- return 0;
- }
+ virtual ~JZMouseAction();
+
+ virtual int LeftDown(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY);
+
+ virtual int LeftUp(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY);
+
+ virtual int RightDown(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY);
+
+ virtual int RightUp(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY);
+
+ virtual int MiddleDown(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY);
+
+ virtual int MiddleUp(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY);
+
+ virtual int Dragging(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY);
+
+ virtual int ProcessMouseEvent(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY);
};
-
//*****************************************************************************
// Description:
// This is the selection class declaration. This class selects events using
// the mouse and draws indicating the selected events.
//*****************************************************************************
-class JZSelection : public tMouseAction
+class JZSelection : public JZMouseAction
{
public:
@@ -179,17 +184,34 @@
mRectangle = Rectangle;
}
- virtual void Snap(int& x, int& y, bool drag)
+ virtual void Snap(
+ int& x,
+ int& y,
+ int ScrolledX,
+ int ScrolledY,
+ bool Up)
{
}
- virtual int Dragging(wxMouseEvent& MouseEvent);
+ virtual int Dragging(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY);
- virtual int ProcessMouseEvent(wxMouseEvent& MouseEvent);
+ virtual int ProcessMouseEvent(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY);
- virtual int ButtonDown(wxMouseEvent& MouseEvent);
+ virtual int ButtonDown(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY);
- virtual int ButtonUp(wxMouseEvent& MouseEvent);
+ virtual int ButtonUp(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY);
virtual void Draw(wxDC& Dc, int ScrolledX, int ScrolledY);
@@ -203,17 +225,15 @@
int ClipWidth,
int ClipHeight);
- // May not be called while dragging.
- void Select(JZRectangle& rr, int x, int y, int w, int h);
+ void Select(const JZRectangle& Rectangle);
- void Select(JZRectangle& Rectangle);
-
private:
bool mActive;
// The following indicates if the rectangle is valid.
bool mSelected;
+
JZRectangle mRectangle;
wxWindow* mpWindow;
@@ -231,11 +251,16 @@
JZSnapSelection(wxWindow* pWindow);
- virtual void Snap(int& x, int& y, bool Up);
+ virtual void Snap(
+ int& x,
+ int& y,
+ int ScrolledX,
+ int ScrolledY,
+ bool Up);
- void SetXSnap(int XCount, int* pXVector);
+ void SetXSnap(int XCount, int* pXVector, int ScrolledX);
- void SetYSnap(int YCount, int* pYVector);
+ void SetYSnap(int YCount, int* pYVector, int ScrolledY);
void SetXSnap(int XMin, int XMax, int XStep);
@@ -246,6 +271,7 @@
static void SnapToVector(
int& Coordinate,
std::vector<int> Vector,
+ int Scrolled,
bool Up);
static void SnapMod(
@@ -253,6 +279,7 @@
int Min,
int Max,
int Step,
+ int Scrolled,
bool Up);
protected:
@@ -291,7 +318,7 @@
//*****************************************************************************
// MouseCounter - let you enter numbers with left/right mouse button
//*****************************************************************************
-class tMouseCounter : public wxTimer, public tMouseAction
+class tMouseCounter : public wxTimer, public JZMouseAction
{
public:
@@ -314,11 +341,28 @@
int Wait; // don't inc/dec at Init
tButtonLabelInterface *win;
- virtual int LeftDown(wxMouseEvent& MouseEvent);
- virtual int LeftUp(wxMouseEvent& MouseEvent);
- virtual int RightDown(wxMouseEvent& MouseEvent);
- virtual int RightUp(wxMouseEvent& MouseEvent);
+ virtual int LeftDown(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY);
+
+ virtual int LeftUp(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY);
+
+ virtual int RightDown(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY);
+
+ virtual int RightUp(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY);
+
virtual void Notify();
+
virtual void ShowValue(bool down);
};
@@ -326,26 +370,44 @@
//*****************************************************************************
// tMarkDestin - mark destination of some operation
//*****************************************************************************
-class tMarkDestin : public tMouseAction
+class tMarkDestin : public JZMouseAction
{
public:
+
int Aborted;
float x, y;
- virtual int LeftDown(wxMouseEvent& MouseEvent);
- virtual int RightDown(wxMouseEvent& MouseEvent);
+ virtual int LeftDown(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY);
+
+ virtual int RightDown(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY);
+
tMarkDestin(wxWindow* canvas, wxFrame* frame, int left);
private:
+
wxWindow *Canvas;
wxFrame *Frame;
- int ButtonDown(wxMouseEvent& MouseEvent);
+
+ int ButtonDown(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY);
};
+#if 0
+
//*****************************************************************************
-// tMouseButton - simulate a 3D button
+// Description:
+// This is the mouse button class declaration. This class simulates a 3D
+// button.
//*****************************************************************************
-class tMouseButton : public tMouseAction
+class tMouseButton : public JZMouseAction
{
public:
@@ -353,11 +415,14 @@
JZEventWindow* pEventWindow,
JZRectangle* pRectangle,
const char* pDownString,
- const char* upUpString = 0);
+ const char* pUpString = 0);
virtual ~tMouseButton();
- virtual int ProcessMouseEvent(wxMouseEvent& MouseEvent);
+ virtual int ProcessMouseEvent(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY);
protected:
@@ -376,4 +441,87 @@
wxString mUpString;
};
+#endif
+
+//*****************************************************************************
+// Description:
+// These are the mouse action class inline member functions.
+//*****************************************************************************
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+inline
+int JZMouseAction::LeftDown(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY)
+{
+ return 0;
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+inline
+int JZMouseAction::LeftUp(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY)
+{
+ return 0;
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+inline
+int JZMouseAction::RightDown(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY)
+{
+ return 0;
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+inline
+int JZMouseAction::RightUp(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY)
+{
+ return 0;
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+inline
+int JZMouseAction::MiddleDown(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY)
+{
+ return 0;
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+inline
+int JZMouseAction::MiddleUp(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY)
+{
+ return 0;
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+inline
+int JZMouseAction::Dragging(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY)
+{
+ return 0;
+}
+
#endif // !defined(JZ_MOUSEACTION_H)
Modified: trunk/jazz/src/PianoWindow.cpp
===================================================================
--- trunk/jazz/src/PianoWindow.cpp 2009-05-17 17:27:44 UTC (rev 721)
+++ trunk/jazz/src/PianoWindow.cpp 2009-05-17 17:51:49 UTC (rev 722)
@@ -95,13 +95,18 @@
// Description:
// JZMousePlay - Click in pianoroll
//*****************************************************************************
-class JZMousePlay : public tMouseAction
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+class JZMousePlay : public JZMouseAction
{
public:
JZMousePlay(JZPianoWindow* pPianoWindow);
- virtual int ProcessMouseEvent(wxMouseEvent& MouseEvent);
+ virtual int ProcessMouseEvent(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY);
private:
@@ -123,7 +128,10 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-int JZMousePlay::ProcessMouseEvent(wxMouseEvent& MouseEvent)
+int JZMousePlay::ProcessMouseEvent(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY)
{
int x, y;
MouseEvent.GetPosition(&x, &y);
@@ -193,17 +201,26 @@
// Description:
// tKeyLengthDragger
//*****************************************************************************
-class tKeyLengthDragger : public tMouseAction
+class tKeyLengthDragger : public JZMouseAction
{
public:
tKeyLengthDragger(tKeyOn* pKeyOn, JZPianoWindow* pPianoWindow);
- int Dragging(wxMouseEvent& MouseEvent);
+ int Dragging(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY);
- int ButtonUp(wxMouseEvent& MouseEvent);
+ int ProcessMouseEvent(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY);
- int ProcessMouseEvent(wxMouseEvent& MouseEvent);
+ int ButtonUp(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY);
private:
@@ -237,22 +254,28 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-int tKeyLengthDragger::ProcessMouseEvent(wxMouseEvent& MouseEvent)
+int tKeyLengthDragger::ProcessMouseEvent(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY)
{
if (MouseEvent.Dragging())
{
- return Dragging(MouseEvent);
+ return Dragging(MouseEvent, ScrolledX, ScrolledY);
}
else if (MouseEvent.ButtonUp())
{
- return ButtonUp(MouseEvent);
+ return ButtonUp(MouseEvent, ScrolledX, ScrolledY);
}
return 0;
}
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-int tKeyLengthDragger::Dragging(wxMouseEvent& MouseEvent)
+int tKeyLengthDragger::Dragging(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY)
{
wxClientDC Dc(Win);
Win->PrepareDC(Dc); //to translate scrolled coordinates
@@ -273,7 +296,10 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-int tKeyLengthDragger::ButtonUp(wxMouseEvent& MouseEvent)
+int tKeyLengthDragger::ButtonUp(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY)
{
// SN++ Key_Aftertouch
if (Copy->GetEventLength() < mpKeyOn->GetEventLength())
@@ -325,17 +351,26 @@
// tPlayTrackLengthDragger JAVE this is just copied from tKeyLengthDragger,
// the need to be inherited somehow
//*****************************************************************************
-class tPlayTrackLengthDragger : public tMouseAction
+class tPlayTrackLengthDragger : public JZMouseAction
{
public:
tPlayTrackLengthDragger(tPlayTrack* k, JZPianoWindow* pPianoWindow);
- int Dragging(wxMouseEvent& MouseEvent);
+ int Dragging(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY);
- int ButtonUp(wxMouseEvent& MouseEvent);
+ int ProcessMouseEvent(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY);
- int ProcessMouseEvent(wxMouseEvent& MouseEvent);
+ int ButtonUp(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY);
private:
tPlayTrack* mpKeyOn;
@@ -365,22 +400,28 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-int tPlayTrackLengthDragger::ProcessMouseEvent(wxMouseEvent& MouseEvent)
+int tPlayTrackLengthDragger::ProcessMouseEvent(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY)
{
if (MouseEvent.Dragging())
{
- return Dragging(MouseEvent);
+ return Dragging(MouseEvent, ScrolledX, ScrolledY);
}
else if (MouseEvent.ButtonUp())
{
- return ButtonUp(MouseEvent);
+ return ButtonUp(MouseEvent, ScrolledX, ScrolledY);
}
return 0;
}
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-int tPlayTrackLengthDragger::Dragging(wxMouseEvent& MouseEvent)
+int tPlayTrackLengthDragger::Dragging(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY)
{
wxClientDC Dc(Win);
Win->PrepareDC(Dc);
@@ -399,7 +440,10 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-int tPlayTrackLengthDragger::ButtonUp(wxMouseEvent& MouseEvent)
+int tPlayTrackLengthDragger::ButtonUp(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY)
{
wxClientDC Dc(Win);
Win->PrepareDC(Dc);
@@ -441,7 +485,10 @@
Dc.SetFont(*(Win->GetFixedFont()));
}
- virtual int ProcessMouseEvent(wxMouseEvent& MouseEvent);
+ virtual int ProcessMouseEvent(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY);
private:
@@ -452,9 +499,12 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-int tVelocCounter::ProcessMouseEvent(wxMouseEvent& MouseEvent)
+int tVelocCounter::ProcessMouseEvent(
+ wxMouseEvent& MouseEvent,
+ int ScrolledX,
+ int ScrolledY)
{
- if (tMouseCounter::ProcessMouseEvent(MouseEvent))
+ if (tMouseCounter::ProcessMouseEvent(MouseEvent, ScrolledX, ScrolledY))
{
tKeyOn* pKeyOnCopy = (tKeyOn *)mpKeyOn->Copy();
pKeyOnCopy->SetVelocity(Value);
@@ -538,24 +588,26 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-const int play_actions[12] =
+static const int PlayAreaActions[12] =
{
+ // Depressed mouse button:
// left middle right
MA_PLAY, MA_CYCLE, 0, // plain
MA_CYCLE, 0, 0, // shift
0, 0, 0, // ctrl
- 0, 0, 0 // shift+ctrl
+ 0, 0, 0 // shift + ctrl
};
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-const int evnt_actions[12] =
+static const int EventAreaActions[12] =
{
+ // Depressed mouse button:
// left middle right
MA_SELECT, MA_CUTPASTE, MA_LENGTH, // plain
MA_CONTSEL, MA_COPY, MA_LISTEN, // shift
MA_VELOCITY, MA_DIALOG, MA_VELOCITY, // ctrl
- MA_CUTPASTE, 0, MA_COPY // shift+ctrl
+ MA_CUTPASTE, 0, MA_COPY // shift + ctrl
};
@@ -598,8 +650,8 @@
mpTrack(0),
mTrackIndex(0),
mpCtrlEdit(0),
- mMousePlay(play_actions),
- mMouseEvent(evnt_actions),
+ mMousePlay(PlayAreaActions),
+ mMouseEvent(EventAreaActions),
mUseColors(true),
mMouseLine(-1),
mFontSize(12),
@@ -1653,7 +1705,7 @@
else if (x > mEventsX)
{
// click in top line
- int action = mMousePlay.Action(MouseEvent);
+ int action = mMousePlay.GetAction(MouseEvent);
if (action)
{
@@ -1897,11 +1949,11 @@
}
if (mSnapCount < eMaxSnaps)
{
- mpSnapSel->SetXSnap(mSnapCount, mSnapsX);
+ mpSnapSel->SetXSnap(mSnapCount, mSnapsX, 0);
}
else
{
- mpSnapSel->SetXSnap(0,0,0);
+ mpSnapSel->SetXSnap(0, 0, 0);
}
mpSnapSel->SetYSnap(
mFromLine * mTrackHeight + mTopInfoHeight,
@@ -2028,7 +2080,7 @@
// invalidate a rect).
Refresh();
// }
- mpSnapSel->ProcessMouseEvent(MouseEvent);
+ mpSnapSel->ProcessMouseEvent(MouseEvent, mScrolledX, mScrolledY);
mpMouseAction = mpSnapSel;
}
}
@@ -2038,7 +2090,7 @@
{
// mpMouseAction active
- if (mpMouseAction->ProcessMouseEvent(MouseEvent))
+ if (mpMouseAction->ProcessMouseEvent(MouseEvent, mScrolledX, mScrolledY))
{
// mpMouseAction finished
@@ -2137,7 +2189,7 @@
//-----------------------------------------------------------------------------
void JZPianoWindow::MouseEvents(wxMouseEvent& MouseEvent)
{
- int action = mMouseEvent.Action(MouseEvent);
+ int action = mMouseEvent.GetAction(MouseEvent);
if (action)
{
@@ -2220,7 +2272,7 @@
r.SetHeight(mTopInfoHeight);
tVelocCounter *VelocCounter = new tVelocCounter(this, &r, pKeyOn);
- VelocCounter->ProcessMouseEvent(MouseEvent);
+ VelocCounter->ProcessMouseEvent(MouseEvent, mScrolledX, mScrolledY);
mpMouseAction = VelocCounter;
}
break;
@@ -2236,7 +2288,8 @@
if (MouseEvent.ButtonDown())
{
mpMouseAction = new JZMousePlay(this);
- int Status = mpMouseAction->ProcessMouseEvent(MouseEvent);
+ int Status =
+ mpMouseAction->ProcessMouseEvent(MouseEvent, mScrolledX, mScrolledY);
if (Status == 1)
{
delete mpMouseAction;
Modified: trunk/jazz/src/PianoWindow.h
===================================================================
--- trunk/jazz/src/PianoWindow.h 2009-05-17 17:27:44 UTC (rev 721)
+++ trunk/jazz/src/PianoWindow.h 2009-05-17 17:51:49 UTC (rev 722)
@@ -305,8 +305,8 @@
tCtrlEditBase* mpCtrlEdit;
- tMouseMapper mMousePlay;
- tMouseMapper mMouseEvent;
+ JZMouseMapper mMousePlay;
+ JZMouseMapper mMouseEvent;
// Number of colors to use for velocity representation.
enum
Modified: trunk/jazz/src/SampleWindow.cpp
===================================================================
--- trunk/jazz/src/SampleWindow.cpp 2009-05-17 17:27:44 UTC (rev 721)
+++ trunk/jazz/src/SampleWindow.cpp 2009-05-17 17:51:49 UTC (rev 722)
@@ -42,7 +42,7 @@
#include <wx/msgdlg.h>
#include <wx/scrolbar.h>
-#include <iostream>
+//DEBUG#include <iostream>
#define MEN_LOAD 1
#define MEN_SAVE 2
@@ -158,6 +158,7 @@
int paint_length;
JZSnapSelection snapsel;
+
// sel_fr == 0: no selection and no insertion point
// sel_fr > 0 && sel_fr == sel_to: insertion point
// sel_fr > 0 && sel_fr < sel_to: selected range
@@ -303,7 +304,7 @@
{
int cw, ch;
GetClientSize(&cw, &ch);
- //snapsel.SetYSnap(0, ch, ch / spl.GetChannels());
+// snapsel.SetYSnap(0, ch, ch / spl.GetChannels());
snapsel.SetYSnap(0, ch, ch);
AdjustScrollbars();
@@ -340,12 +341,12 @@
{
mouse_up_sets_insertion_point = 1;
}
- snapsel.ProcessMouseEvent(MouseEvent);
+ snapsel.ProcessMouseEvent(MouseEvent, 0, 0);
}
else if (MouseEvent.LeftUp())
{
mouse_down = FALSE;
- snapsel.ProcessMouseEvent(MouseEvent);
+ snapsel.ProcessMouseEvent(MouseEvent, 0, 0);
if (snapsel.IsSelected())
{
snapsel.Draw(*pDc, 0, 0);
@@ -368,7 +369,7 @@
}
else if (MouseEvent.Dragging() && mouse_down)
{
- snapsel.ProcessMouseEvent(MouseEvent);
+ snapsel.ProcessMouseEvent(MouseEvent, 0, 0);
}
}
Modified: trunk/jazz/src/Song.cpp
===================================================================
--- trunk/jazz/src/Song.cpp 2009-05-17 17:27:44 UTC (rev 721)
+++ trunk/jazz/src/Song.cpp 2009-05-17 17:51:49 UTC (rev 722)
@@ -109,7 +109,7 @@
return;
}
- // Clock + Bar auf Anfang naechster Takt
+ // Clock + Bar at the beginning of the next cycle.
mClock += mTicksPerBar;
++mBarIndex;
}
Modified: trunk/jazz/src/TrackFrame.cpp
===================================================================
--- trunk/jazz/src/TrackFrame.cpp 2009-05-17 17:27:44 UTC (rev 721)
+++ trunk/jazz/src/TrackFrame.cpp 2009-05-17 17:51:49 UTC (rev 722)
@@ -65,7 +65,7 @@
#include <wx/menu.h>
#include <wx/msgdlg.h>
-#include <iostream>
+//DEBUG#include <iostream>
using namespace std;
Modified: trunk/jazz/src/TrackFrame.h
===================================================================
--- trunk/jazz/src/TrackFrame.h 2009-05-17 17:27:44 UTC (rev 721)
+++ trunk/jazz/src/TrackFrame.h 2009-05-17 17:51:49 UTC (rev 722)
@@ -55,7 +55,7 @@
void NewPlayPosition(int Clock);
- // Overridden tButtonLabelInterface finction.
+ // Overridden tButtonLabelInterface function.
virtual void ButtonLabelDisplay(const wxString& Text, bool IsButtonDown);
private:
Modified: trunk/jazz/src/TrackWindow.cpp
===================================================================
--- trunk/jazz/src/TrackWindow.cpp 2009-05-17 17:27:44 UTC (rev 721)
+++ trunk/jazz/src/TrackWindow.cpp 2009-05-17 17:51:49 UTC (rev 722)
@@ -33,9 +33,9 @@
#include <wx/dcmemory.h>
#include <wx/msgdlg.h>
-#include <iostream>
-#include <sstream>
#include <iomanip>
+//DEBUG#include <iostream>
+#include <sstream>
using namespace std;
@@ -211,18 +211,18 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZTrackWindow::Mark(int x, int y)
-{
- Marked.SetX(x2xBar(x));
- Marked.SetY(y2yLine(y));
- Marked.SetWidth(x2wBar(x));
- Marked.SetHeight(mTrackHeight);
+//void JZTrackWindow::Mark(int x, int y)
+//{
+// Marked.SetX(x2xBar(x));
+// Marked.SetY(y2yLine(y));
+// Marked.SetWidth(x2wBar(x));
+// Marked.SetHeight(mTrackHeight);
+//
+// wxDC* pDc = new wxClientDC(this);
+// LineText(*pDc, Marked.GetX(), Marked.GetY(), Marked.GetWidth(), ">");
+// delete pDc;
+//}
- wxDC* pDc = new wxClientDC(this);
- LineText(*pDc, Marked.GetX(), Marked.GetY(), Marked.GetWidth(), ">");
- delete pDc;
-}
-
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
void JZTrackWindow::UnMark()
@@ -273,15 +273,11 @@
{
JZRectangle Rectangle(
0,
- y2yLine(Point.y),
- Clock2x(mpSong->GetMaxQuarters() * mpSong->GetTicksPerQuarter()),
+ y2yLine(Point.y + mScrolledY),
+ Clock2x(mpSong->GetMaxQuarters() * mpSong->GetTicksPerQuarter()) +
+ mScrolledX,
mTrackHeight);
- mpSnapSel->Select(
- Rectangle,
- mEventsX,
- mEventsY,
- mEventsWidth,
- mEventsHeight);
+ mpSnapSel->Select(Rectangle);
SnapSelectionStop(MouseEvent);
}
else if (
@@ -289,7 +285,8 @@
Point.y >= mEventsY && Point.y < mEventsY + mEventsHeight)
{
SnapSelectionStart(MouseEvent);
- mpSnapSel->ButtonDown(MouseEvent);
+
+ mpSnapSel->ButtonDown(MouseEvent, mScrolledX, mScrolledY);
}
}
@@ -299,7 +296,7 @@
{
if (MouseEvent.LeftIsDown())
{
- mpSnapSel->Dragging(MouseEvent);
+ mpSnapSel->Dragging(MouseEvent, mScrolledX, mScrolledY);
// SnapSelectionStop(MouseEvent);
Refresh(false);
}
@@ -410,7 +407,7 @@
Point.x >= mEventsX && Point.x < mEventsX + mEventsWidth &&
Point.y >= mEventsY && Point.y < mEventsY + mEventsHeight)
{
- mpSnapSel->ButtonUp(MouseEvent);
+ mpSnapSel->ButtonUp(MouseEvent, mScrolledX, mScrolledY);
// The point is in event area.
SnapSelectionStop(MouseEvent);
@@ -585,8 +582,8 @@
// Setup the brush that is used to clear the background.
LocalDc.SetBackground(*wxWHITE_BRUSH);
- // Clear the background using the brush that was just setup,
- // in case the following drawing calls fail.
+ // Clear the background using the brush that was just setup, in case the
+ // following drawing calls fail.
LocalDc.Clear();
GetClientSize(&mCanvasWidth, &mCanvasHeight);
@@ -638,7 +635,6 @@
//DEBUG << "To X: " << Clock2x(mToClock) << '\n'
//DEBUG << endl;
-
BarInfo.SetClock(mFromClock);
mBarCount = 0;
@@ -689,6 +685,8 @@
if (mBarCount < eMaxBars)
{
mBarX[mBarCount++] = x;
+//DEBUG LocalDc.SetPen(*wxRED_PEN);
+//DEBUG LocalDc.DrawLine(x, 0, x, mCanvasHeight);
}
}
BarInfo.Next();
@@ -918,7 +916,6 @@
if (Height <= 0)
{
Height = mTrackHeight;
- y = y2yLine(y);
}
if (Width && Height)
{
@@ -1177,32 +1174,31 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-int JZTrackWindow::x2xBar(int x)
-{
- for (int i = 1; i < mBarCount; ++i)
- {
- if (x < mBarX[i])
- {
- return mBarX[i - 1];
- }
- }
- return -1;
-}
+//int JZTrackWindow::x2xBar(int x)
+//{
+// for (int i = 1; i < mBarCount; ++i)
+// {
+// if (x < mBarX[i])
+// {
+// return mBarX[i - 1];
+// }
+// }
+// return -1;
+//}
-
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-int JZTrackWindow::x2wBar(int x)
-{
- for (int i = 1; i < mBarCount; ++i)
- {
- if (x < mBarX[i])
- {
- return mBarX[i] - mBarX[i - 1];
- }
- }
- return 0;
-}
+//int JZTrackWindow::x2wBar(int x)
+//{
+// for (int i = 1; i < mBarCount; ++i)
+// {
+// if (x < mBarX[i])
+// {
+// return mBarX[i] - mBarX[i - 1];
+// }
+// }
+// return 0;
+//}
//-----------------------------------------------------------------------------
// Description:
@@ -1437,10 +1433,10 @@
//-----------------------------------------------------------------------------
void JZTrackWindow::SnapSelectionStart(wxMouseEvent& MouseEvent)
{
- mpSnapSel->SetXSnap(mBarCount, mBarX);
+ mpSnapSel->SetXSnap(mBarCount, mBarX, mScrolledX);
mpSnapSel->SetYSnap(
TrackIndex2y(mFromLine),
- mEventsY + mEventsHeight,
+ mEventsY + mEventsHeight + mScrolledY,
mTrackHeight);
}
Modified: trunk/jazz/src/TrackWindow.h
===================================================================
--- trunk/jazz/src/TrackWindow.h 2009-05-17 17:27:44 UTC (rev 721)
+++ trunk/jazz/src/TrackWindow.h 2009-05-17 17:51:49 UTC (rev 722)
@@ -138,7 +138,7 @@
int h = -1,
bool Down = false);
- void Mark(int x, int y);
+// void Mark(int x, int y);
void UnMark();
@@ -146,9 +146,9 @@
const char* GetNumberString() const;
- int x2xBar(int x);
+// int x2xBar(int x);
- int x2wBar(int x);
+// int x2wBar(int x);
int TrackIndex2y(int Track);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2009-05-17 17:27:58
|
Revision: 721
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=721&view=rev
Author: pstieber
Date: 2009-05-17 17:27:44 +0000 (Sun, 17 May 2009)
Log Message:
-----------
Added a compiler flag to ignore warning 4351. This warning was generating:
new behavior: elements of array 'JZMouseMapper::mActions' will be default initialized
Modified Paths:
--------------
trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj
Modified: trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj
===================================================================
--- trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2009-05-16 15:05:54 UTC (rev 720)
+++ trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2009-05-17 17:27:44 UTC (rev 721)
@@ -63,6 +63,7 @@
SuppressStartupBanner="true"
DebugInformationFormat="3"
CompileAs="0"
+ DisableSpecificWarnings="4351"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -163,6 +164,7 @@
SuppressStartupBanner="true"
DebugInformationFormat="3"
CompileAs="0"
+ DisableSpecificWarnings="4351"
/>
<Tool
Name="VCManagedResourceCompilerTool"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2009-05-16 15:06:04
|
Revision: 720
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=720&view=rev
Author: pstieber
Date: 2009-05-16 15:05:54 +0000 (Sat, 16 May 2009)
Log Message:
-----------
1. Added an updated cleanup dialog.
2. Changed the JZPlayer rec_info data member to mpRecordingInfo.
3. Made some cosmetic indentation changes ti the delete dialog header.
4. Removed the use of & in a wxStaticText control in the snap dialog
because it is translated into an underscore.
5. Reordered the includes in the snap dialog.
6. Made a cosmetic indentation change in the snap dialog.
Modified Paths:
--------------
trunk/jazz/src/Dialogs/DeleteDialog.h
trunk/jazz/src/Dialogs/SnapDialog.cpp
trunk/jazz/src/Dialogs.cpp
trunk/jazz/src/Dialogs.h
trunk/jazz/src/EventFrame.cpp
trunk/jazz/src/EventWindow.cpp
trunk/jazz/src/Makefile.am
trunk/jazz/src/Player.cpp
trunk/jazz/src/Player.h
trunk/jazz/src/mswin/WindowsAudioInterface.cpp
trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj
trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj
Added Paths:
-----------
trunk/jazz/src/Dialogs/CleanupDialog.cpp
trunk/jazz/src/Dialogs/CleanupDialog.h
Added: trunk/jazz/src/Dialogs/CleanupDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/CleanupDialog.cpp (rev 0)
+++ trunk/jazz/src/Dialogs/CleanupDialog.cpp 2009-05-16 15:05:54 UTC (rev 720)
@@ -0,0 +1,157 @@
+//*****************************************************************************
+// The JAZZ++ Midi Sequencer
+//
+// Copyright (C) 2009 Peter J. Stieber, all rights reserved.
+//
+// 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+//*****************************************************************************
+
+#include "CleanupDialog.h"
+
+#include "../Globals.h"
+#include "../Help.h"
+
+#include <wx/button.h>
+#include <wx/checkbox.h>
+#include <wx/choice.h>
+#include <wx/sizer.h>
+#include <wx/stattext.h>
+
+using namespace std;
+
+//*****************************************************************************
+//*****************************************************************************
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+BEGIN_EVENT_TABLE(JZCleanupDialog, wxDialog)
+
+ EVT_BUTTON(wxID_HELP, JZCleanupDialog::OnHelp)
+
+END_EVENT_TABLE()
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+JZCleanupDialog::JZCleanupDialog(
+ int& ShortestNote,
+ bool& ShortenOverlappingNotes,
+ wxWindow* pParent)
+ : wxDialog(pParent, wxID_ANY, wxString("Cleanup")),
+ mShortestNote(ShortestNote),
+ mShortenOverlappingNotes(ShortenOverlappingNotes),
+ mpShortestNoteChoice(0),
+ mpShortenOverlappingNotesCheckBox(0)
+{
+ mpShortestNoteChoice = new wxChoice(this, wxID_ANY);
+ for (
+ map<int, string>::const_iterator iLimitSteps = gLimitSteps.begin();
+ iLimitSteps != gLimitSteps.end();
+ ++iLimitSteps)
+ {
+ mpShortestNoteChoice->Append(iLimitSteps->second);
+ }
+
+ mpShortenOverlappingNotesCheckBox = new wxCheckBox(
+ this,
+ wxID_ANY,
+ "Shorten overlapping notes");
+
+ wxButton* pOkButton = new wxButton(this, wxID_OK, "&OK");
+ wxButton* pCancelButton = new wxButton(this, wxID_CANCEL, "Cancel");
+ wxButton* pHelpButton = new wxButton(this, wxID_HELP, "Help");
+ pOkButton->SetDefault();
+
+ wxBoxSizer* pTopSizer = new wxBoxSizer(wxVERTICAL);
+
+ pTopSizer->Add(
+ new wxStaticText(this, wxID_ANY, "Delete notes shorter than:"),
+ 0,
+ wxALIGN_CENTER | wxALL,
+ 5);
+
+ pTopSizer->Add(mpShortestNoteChoice, 0, wxALIGN_CENTER | wxALL, 5);
+
+ pTopSizer->Add(
+ mpShortenOverlappingNotesCheckBox,
+ 0,
+ wxALIGN_CENTER | wxALL,
+ 10);
+
+ wxBoxSizer* pButtonSizer = new wxBoxSizer(wxHORIZONTAL);
+ pButtonSizer->Add(pOkButton, 0, wxALL, 5);
+ pButtonSizer->Add(pCancelButton, 0, wxALL, 5);
+ pButtonSizer->Add(pHelpButton, 0, wxALL, 5);
+
+ pTopSizer->Add(pButtonSizer, 0, wxALIGN_CENTER | wxBOTTOM, 6);
+
+ SetAutoLayout(true);
+ SetSizer(pTopSizer);
+
+ pTopSizer->SetSizeHints(this);
+ pTopSizer->Fit(this);
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+bool JZCleanupDialog::TransferDataToWindow()
+{
+ int Selection = 0;
+ for (
+ map<int, string>::const_iterator iLimitSteps = gLimitSteps.begin();
+ iLimitSteps != gLimitSteps.end();
+ ++iLimitSteps, ++Selection)
+ {
+ const int& Value = iLimitSteps->first;
+ if (Value >= mShortestNote)
+ {
+ break;
+ }
+ }
+ mpShortestNoteChoice->SetSelection(Selection);
+
+ mpShortenOverlappingNotesCheckBox->SetValue(mShortenOverlappingNotes);
+
+ return true;
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+bool JZCleanupDialog::TransferDataFromWindow()
+{
+ wxString SelectedValue = mpShortestNoteChoice->GetStringSelection();
+ string SelectedString = SelectedValue.c_str();
+ for (
+ map<int, string>::const_iterator iLimitSteps = gLimitSteps.begin();
+ iLimitSteps != gLimitSteps.end();
+ ++iLimitSteps)
+ {
+ const string& String = iLimitSteps->second;
+ if (SelectedString == String)
+ {
+ mShortestNote = iLimitSteps->first;
+ break;
+ }
+ }
+
+ mShortenOverlappingNotes = mpShortenOverlappingNotesCheckBox->GetValue();
+
+ return true;
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+void JZCleanupDialog::OnHelp(wxCommandEvent& Event)
+{
+ gpHelpInstance->ShowTopic("Cleanup");
+}
Property changes on: trunk/jazz/src/Dialogs/CleanupDialog.cpp
___________________________________________________________________
Added: svn:eol-style
+ native
Added: trunk/jazz/src/Dialogs/CleanupDialog.h
===================================================================
--- trunk/jazz/src/Dialogs/CleanupDialog.h (rev 0)
+++ trunk/jazz/src/Dialogs/CleanupDialog.h 2009-05-16 15:05:54 UTC (rev 720)
@@ -0,0 +1,61 @@
+//*****************************************************************************
+// The JAZZ++ Midi Sequencer
+//
+// Copyright (C) 2009 Peter J. Stieber, all rights reserved.
+//
+// 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+//*****************************************************************************
+
+#ifndef JZ_CLEANUPDIALOG_H
+#define JZ_CLEANUPDIALOG_H
+
+#include <wx/dialog.h>
+
+class wxChoice;
+class wxCheckBox;
+
+//*****************************************************************************
+//*****************************************************************************
+class JZCleanupDialog : public wxDialog
+{
+ public:
+
+ JZCleanupDialog(
+ int& ShortestNote,
+ bool& ShortenOverlappingNotes,
+ wxWindow* pParent);
+
+ private:
+
+ bool TransferDataToWindow();
+
+ bool TransferDataFromWindow();
+
+ void OnHelp(wxCommandEvent& Event);
+
+ private:
+
+ int& mShortestNote;
+
+ bool& mShortenOverlappingNotes;
+
+ wxChoice* mpShortestNoteChoice;
+
+ wxCheckBox* mpShortenOverlappingNotesCheckBox;
+
+ DECLARE_EVENT_TABLE();
+};
+
+#endif // !defined(JZ_CLEANUPDIALOG_H)
Property changes on: trunk/jazz/src/Dialogs/CleanupDialog.h
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: trunk/jazz/src/Dialogs/DeleteDialog.h
===================================================================
--- trunk/jazz/src/Dialogs/DeleteDialog.h 2009-05-16 04:16:22 UTC (rev 719)
+++ trunk/jazz/src/Dialogs/DeleteDialog.h 2009-05-16 15:05:54 UTC (rev 720)
@@ -43,9 +43,9 @@
private:
- bool& mLeaveSpace;
+ bool& mLeaveSpace;
- wxCheckBox* mpLeaveSpaceCheckBox;
+ wxCheckBox* mpLeaveSpaceCheckBox;
DECLARE_EVENT_TABLE();
};
Modified: trunk/jazz/src/Dialogs/SnapDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/SnapDialog.cpp 2009-05-16 04:16:22 UTC (rev 719)
+++ trunk/jazz/src/Dialogs/SnapDialog.cpp 2009-05-16 15:05:54 UTC (rev 720)
@@ -23,8 +23,8 @@
#include "../Globals.h"
#include "../Help.h"
+#include <wx/button.h>
#include <wx/choice.h>
-#include <wx/button.h>
#include <wx/sizer.h>
#include <wx/stattext.h>
@@ -64,7 +64,7 @@
wxBoxSizer* pTopSizer = new wxBoxSizer(wxVERTICAL);
pTopSizer->Add(
- new wxStaticText(this, wxID_ANY, "Quantize Cut & Paste Events"),
+ new wxStaticText(this, wxID_ANY, "Quantize Cut and Paste Events"),
0,
wxALIGN_CENTER | wxALL,
5);
@@ -125,7 +125,7 @@
}
}
- return true;
+ return true;
}
//-----------------------------------------------------------------------------
Modified: trunk/jazz/src/Dialogs.cpp
===================================================================
--- trunk/jazz/src/Dialogs.cpp 2009-05-16 04:16:22 UTC (rev 719)
+++ trunk/jazz/src/Dialogs.cpp 2009-05-16 15:05:54 UTC (rev 720)
@@ -102,88 +102,7 @@
//}
-//*****************************************************************************
-// Cleanup
-//*****************************************************************************
-int tCleanupDlg::lowLimit = 48;
-bool tCleanupDlg::shortenOverlaps = 1;
-
-
-
-tCleanupDlg::tCleanupDlg(JZEventWindow* w, JZFilter *f)
- : tPropertyListDlg( "Clean up events" )
-{
- Filter = f;
- Song = f->GetSong();
-}
-
-
-
-bool tCleanupDlg::OnClose()
-{
- int limit = Song->GetTicksPerQuarter() * 4 / lowLimit;
- cout
- << "tCleanupDlg::OnClose " << lowLimit << ' ' << shortenOverlaps
- << endl;
- tCmdCleanup cln(Filter, limit, shortenOverlaps);
- cln.Execute();
-
- JZProjectManager::Instance()->UpdateAllViews();
-
- //wxForm::OnOk();
- return false;
-}
-
-void tCleanupDlg::OnHelp()
-{
- gpHelpInstance->ShowTopic("Cleanup");
-}
-
-
-//IMPLEMENT_DYNAMIC_CLASS(tNamedValueListValue, wxPropertyValue)
-
-void tCleanupDlg::AddProperties()
-{
- // JAVE this doesnt work
-// sheet->AddProperty(new wxProperty(
-// "Delete notes shorther than",
-// wxPropertyValue("1/8"),
-// "props",
-// Steps.GetStringListValidator()));
-
- // how it ought to work
- // gLimitSteps is a name/value pair vector
-// sheet->AddProperty(new wxProperty(
-// "Delete notes shorther than",
-// wxPropertyValue(&lowLimit),
-// "props",
-// new tNamedValueListValidator(gLimitSteps)));
-
- // How it really ought to work (except the validator might ask the "value"
- // for the list of allowed values).
- // http://sourceforge.net/tracker/?group_id=9863&atid=109863 wx bugracker
-// tNamedValueListValue val1 = tNamedValueListValue(
-// &lowLimit,
-// gLimitSteps);
-
-// wxPropertyValue& val = val1;
-// cout << "little test:" << val.GetStringRepresentation() << endl;
-// sheet->AddProperty(new wxProperty(
-// "Delete shorther than",
-// (tNamedValueListValue&)val1,
-// "props",
-// new tNamedValueListValidator(gLimitSteps)));
-
- sheet->AddProperty(new wxProperty(
- "Shorten overlapping",
- wxPropertyValue((bool*)&shortenOverlaps), "bool"));
-
- // There seems to be a padding limit in
- // wxPropertyListView::MakeNameValueString set to 25.
-}
-
-
//*****************************************************************************
// SearchReplace
//*****************************************************************************
Modified: trunk/jazz/src/Dialogs.h
===================================================================
--- trunk/jazz/src/Dialogs.h 2009-05-16 04:16:22 UTC (rev 719)
+++ trunk/jazz/src/Dialogs.h 2009-05-16 15:05:54 UTC (rev 720)
@@ -50,23 +50,6 @@
// void OnHelp();
//};
-class tCleanupDlg : public tPropertyListDlg
-{
- public:
-
- static int lowLimit; // 1/32
- static bool shortenOverlaps;
-
- JZFilter *Filter;
- JZSong *Song;
-
- tCleanupDlg(JZEventWindow* w, JZFilter *f);
- void AddProperties();
- //tNamedChoice Steps;
- bool OnClose();
- void OnHelp();
-};
-
class tSearchReplaceDlg : public tPropertyListDlg
{
public:
Modified: trunk/jazz/src/EventFrame.cpp
===================================================================
--- trunk/jazz/src/EventFrame.cpp 2009-05-16 04:16:22 UTC (rev 719)
+++ trunk/jazz/src/EventFrame.cpp 2009-05-16 15:05:54 UTC (rev 720)
@@ -39,6 +39,9 @@
EVT_UPDATE_UI(ID_SHIFT, JZEventFrame::OnUpdateEventsSelected)
EVT_MENU(ID_SHIFT, JZEventFrame::OnShift)
+ EVT_UPDATE_UI(ID_CLEANUP, JZEventFrame::OnUpdateEventsSelected)
+ EVT_MENU(ID_CLEANUP, JZEventFrame::OnCleanup)
+
EVT_UPDATE_UI(ID_QUANTIZE, JZEventFrame::OnUpdateEventsSelected)
EVT_MENU(ID_QUANTIZE, JZEventFrame::OnQuantize)
Modified: trunk/jazz/src/EventWindow.cpp
===================================================================
--- trunk/jazz/src/EventWindow.cpp 2009-05-16 04:16:22 UTC (rev 719)
+++ trunk/jazz/src/EventWindow.cpp 2009-05-16 15:05:54 UTC (rev 720)
@@ -23,6 +23,7 @@
#include "EventWindow.h"
#include "Command.h"
+#include "Dialogs/CleanupDialog.h"
#include "Dialogs/DeleteDialog.h"
#include "Dialogs/LengthDialog.h"
#include "Dialogs/MidiChannelDialog.h"
@@ -288,8 +289,24 @@
//-----------------------------------------------------------------------------
void JZEventWindow::Cleanup()
{
- tCleanupDlg * dlg = new tCleanupDlg(this, mpFilter);
- dlg->Create();
+ int ShortestNote = 48;
+ bool ShortenOverlappingNotes = false;
+
+ JZCleanupDialog CleanupDialog(ShortestNote, ShortenOverlappingNotes, this);
+ if (CleanupDialog.ShowModal() == wxID_OK)
+ {
+ int LengthLimit =
+ mpFilter->GetSong()->GetTicksPerQuarter() * 4 / ShortestNote;
+
+ tCmdCleanup CleanupCommand(
+ mpFilter,
+ LengthLimit,
+ ShortenOverlappingNotes);
+
+ CleanupCommand.Execute();
+
+ JZProjectManager::Instance()->UpdateAllViews();
+ }
}
//-----------------------------------------------------------------------------
Modified: trunk/jazz/src/Makefile.am
===================================================================
--- trunk/jazz/src/Makefile.am 2009-05-16 04:16:22 UTC (rev 719)
+++ trunk/jazz/src/Makefile.am 2009-05-16 15:05:54 UTC (rev 720)
@@ -22,6 +22,7 @@
DeprecatedWx/prop.cpp \
DeprecatedWx/propform.cpp \
DeprecatedWx/proplist.cpp \
+Dialogs/CleanupDialog.cpp \
Dialogs/DeleteDialog.cpp \
Dialogs/FilterDialog.cpp \
Dialogs/IntegerEdit.cpp \
@@ -107,6 +108,7 @@
DeprecatedWx/prop.cpp \
DeprecatedWx/propform.cpp \
DeprecatedWx/proplist.cpp \
+Dialogs/CleanupDialog.cpp \
Dialogs/DeleteDialog.cpp \
Dialogs/FilterDialog.cpp \
Dialogs/IntegerEdit.cpp \
@@ -197,6 +199,7 @@
DeprecatedWx/propform.h \
DeprecatedWx/proplist.h \
DeprecatedStringUtils.h \
+Dialogs/CleanupDialog.h \
Dialogs/DeleteDialog.h \
Dialogs/FilterDialog.h \
Dialogs/IntegerEdit.h \
Modified: trunk/jazz/src/Player.cpp
===================================================================
--- trunk/jazz/src/Player.cpp 2009-05-16 04:16:22 UTC (rev 719)
+++ trunk/jazz/src/Player.cpp 2009-05-16 15:05:54 UTC (rev 720)
@@ -191,7 +191,7 @@
Playing = false;
PlayLoop = new tPlayLoop();
AudioBuffer = 0;
- rec_info = 0;
+ mpRecordingInfo = 0;
}
//-----------------------------------------------------------------------------
Modified: trunk/jazz/src/Player.h
===================================================================
--- trunk/jazz/src/Player.h 2009-05-16 04:16:22 UTC (rev 719)
+++ trunk/jazz/src/Player.h 2009-05-16 15:05:54 UTC (rev 720)
@@ -139,7 +139,7 @@
tPlayLoop* PlayLoop;
// timer value for polling the record queue
int poll_millisec;
- JZRecordingInfo* rec_info; // 0 == not recording
+ JZRecordingInfo* mpRecordingInfo; // 0 == not recording
public:
@@ -157,7 +157,7 @@
tEventArray mRecdBuffer;
void SetRecordInfo(JZRecordingInfo* inf)
{
- rec_info = inf;
+ mpRecordingInfo = inf;
}
bool IsPlaying() const
Modified: trunk/jazz/src/mswin/WindowsAudioInterface.cpp
===================================================================
--- trunk/jazz/src/mswin/WindowsAudioInterface.cpp 2009-05-16 04:16:22 UTC (rev 719)
+++ trunk/jazz/src/mswin/WindowsAudioInterface.cpp 2009-05-16 15:05:54 UTC (rev 720)
@@ -61,7 +61,7 @@
mpPlayer->mpListener = this;
// Indicate that we are not recording!
- mpPlayer->rec_info = 0;
+ mpPlayer->mpRecordingInfo = 0;
mChannels = mpPlayer->mSamples.GetChannels();
@@ -88,7 +88,7 @@
mpPlayer->mpListener = this;
// Indicate that we are not recording!
- mpPlayer->rec_info = 0;
+ mpPlayer->mpRecordingInfo = 0;
mChannels = mpPlayer->mSamples.GetChannels();
@@ -633,10 +633,10 @@
mSamples.StopPlay();
if (RecordMode())
{
- long frc = rec_info->mFromClock;
+ long frc = mpRecordingInfo->mFromClock;
if (frc < start_clock)
frc = start_clock;
- long toc = rec_info->mToClock;
+ long toc = mpRecordingInfo->mToClock;
long play_clock = Time2Clock(mpState->play_time);
if (toc > play_clock)
toc = play_clock;
@@ -708,5 +708,5 @@
//-----------------------------------------------------------------------------
int JZWindowsAudioPlayer::RecordMode() const
{
- return rec_info != 0 && rec_info->mpTrack->GetAudioMode();
+ return mpRecordingInfo != 0 && mpRecordingInfo->mpTrack->GetAudioMode();
}
Modified: trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj
===================================================================
--- trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj 2009-05-16 04:16:22 UTC (rev 719)
+++ trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj 2009-05-16 15:05:54 UTC (rev 720)
@@ -827,6 +827,14 @@
Name="Dialog Source Files"
>
<File
+ RelativePath="..\src\Dialogs\CleanupDialog.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\src\Dialogs\CleanupDialog.h"
+ >
+ </File>
+ <File
RelativePath="..\src\Dialogs\DeleteDialog.cpp"
>
</File>
Modified: trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj
===================================================================
--- trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2009-05-16 04:16:22 UTC (rev 719)
+++ trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2009-05-16 15:05:54 UTC (rev 720)
@@ -845,6 +845,14 @@
Name="Dialog Source Files"
>
<File
+ RelativePath="..\src\Dialogs\CleanupDialog.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\src\Dialogs\CleanupDialog.h"
+ >
+ </File>
+ <File
RelativePath="..\src\Dialogs\DeleteDialog.cpp"
>
</File>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2009-05-16 04:16:34
|
Revision: 719
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=719&view=rev
Author: pstieber
Date: 2009-05-16 04:16:22 +0000 (Sat, 16 May 2009)
Log Message:
-----------
Fixed snap selection so recording works.
Modified Paths:
--------------
trunk/jazz/src/EventWindow.cpp
trunk/jazz/src/EventWindow.h
trunk/jazz/src/PianoWindow.cpp
trunk/jazz/src/PianoWindow.h
trunk/jazz/src/TrackWindow.cpp
trunk/jazz/src/TrackWindow.h
Modified: trunk/jazz/src/EventWindow.cpp
===================================================================
--- trunk/jazz/src/EventWindow.cpp 2009-03-13 21:06:09 UTC (rev 718)
+++ trunk/jazz/src/EventWindow.cpp 2009-05-16 04:16:22 UTC (rev 719)
@@ -536,13 +536,13 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZEventWindow::SnapSelStart(wxMouseEvent& MouseEvent)
+void JZEventWindow::SnapSelectionStart(wxMouseEvent& MouseEvent)
{
}
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZEventWindow::SnapSelStop(wxMouseEvent& MouseEvent)
+void JZEventWindow::SnapSelectionStop(wxMouseEvent& MouseEvent)
{
}
@@ -563,7 +563,7 @@
if (MouseEvent.LeftDown())
{
{
- SnapSelStart(MouseEvent);
+ SnapSelectionStart(MouseEvent);
// if (mpSnapSel->IsSelected())
// {
@@ -587,7 +587,7 @@
if (mpMouseAction == mpSnapSel)
{
- SnapSelStop(MouseEvent);
+ SnapSelectionStop(MouseEvent);
// inefficient, invalidate rect first instead.
Refresh();
Modified: trunk/jazz/src/EventWindow.h
===================================================================
--- trunk/jazz/src/EventWindow.h 2009-03-13 21:06:09 UTC (rev 718)
+++ trunk/jazz/src/EventWindow.h 2009-05-16 04:16:22 UTC (rev 719)
@@ -102,9 +102,9 @@
int SnapClock(int Clock, bool Up);
- virtual void SnapSelStart(wxMouseEvent& MouseEvent);
+ virtual void SnapSelectionStart(wxMouseEvent& MouseEvent);
- virtual void SnapSelStop(wxMouseEvent& MouseEvent);
+ virtual void SnapSelectionStop(wxMouseEvent& MouseEvent);
void DrawVerticalLine(wxDC& Dc, int XPosition) const;
Modified: trunk/jazz/src/PianoWindow.cpp
===================================================================
--- trunk/jazz/src/PianoWindow.cpp 2009-03-13 21:06:09 UTC (rev 718)
+++ trunk/jazz/src/PianoWindow.cpp 2009-05-16 04:16:22 UTC (rev 719)
@@ -1827,7 +1827,7 @@
//-----------------------------------------------------------------------------
// Snapper
//-----------------------------------------------------------------------------
-void JZPianoWindow::SnapSelStop(wxMouseEvent& MouseEvent)
+void JZPianoWindow::SnapSelectionStop(wxMouseEvent& MouseEvent)
{
if (mpSnapSel->IsSelected())
{
@@ -1885,7 +1885,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZPianoWindow::SnapSelStart(wxMouseEvent& MouseEvent)
+void JZPianoWindow::SnapSelectionStart(wxMouseEvent& MouseEvent)
{
mSnapCount = 0;
int clk = SnapClock(mFromClock, false);
@@ -2020,7 +2020,7 @@
if (MouseEvent.LeftDown())
{
{
- SnapSelStart(MouseEvent);
+ SnapSelectionStart(MouseEvent);
// if (mpSnapSel->IsSelected())
// {
@@ -2044,7 +2044,7 @@
if (mpMouseAction == mpSnapSel)
{
- SnapSelStop(MouseEvent);
+ SnapSelectionStop(MouseEvent);
// inefficient, invalidate rect first instead.
Refresh();
Modified: trunk/jazz/src/PianoWindow.h
===================================================================
--- trunk/jazz/src/PianoWindow.h 2009-03-13 21:06:09 UTC (rev 718)
+++ trunk/jazz/src/PianoWindow.h 2009-05-16 04:16:22 UTC (rev 719)
@@ -113,10 +113,6 @@
int SnapClock(int Clock, bool Up = false);
- virtual void SnapSelStart(wxMouseEvent& MouseEvent);
-
- virtual void SnapSelStop(wxMouseEvent& MouseEvent);
-
int SnapClocks();
void SetSnapDenom(int Value);
@@ -187,6 +183,12 @@
void ActivateSequenceLengthDialog();
+ protected:
+
+ virtual void SnapSelectionStart(wxMouseEvent& MouseEvent);
+
+ virtual void SnapSelectionStop(wxMouseEvent& MouseEvent);
+
private:
JZPianoFrame* mpPianoFrame;
Modified: trunk/jazz/src/TrackWindow.cpp
===================================================================
--- trunk/jazz/src/TrackWindow.cpp 2009-03-13 21:06:09 UTC (rev 718)
+++ trunk/jazz/src/TrackWindow.cpp 2009-05-16 04:16:22 UTC (rev 719)
@@ -282,7 +282,7 @@
mEventsY,
mEventsWidth,
mEventsHeight);
- SnapSelStop(MouseEvent);
+ SnapSelectionStop(MouseEvent);
}
else if (
Point.x >= mEventsX && Point.x < mEventsX + mEventsWidth &&
Modified: trunk/jazz/src/TrackWindow.h
===================================================================
--- trunk/jazz/src/TrackWindow.h 2009-03-13 21:06:09 UTC (rev 718)
+++ trunk/jazz/src/TrackWindow.h 2009-05-16 04:16:22 UTC (rev 719)
@@ -85,10 +85,10 @@
protected:
- virtual void SnapSelStop(wxMouseEvent& MouseEvent)
- {
- }
+ virtual void SnapSelectionStart(wxMouseEvent& MouseEvent);
+ virtual void SnapSelectionStop(wxMouseEvent& MouseEvent);
+
private:
void OnSize(wxSizeEvent& Event);
@@ -146,10 +146,6 @@
const char* GetNumberString() const;
- void SnapSelectionStart(wxMouseEvent& MouseEvent);
-
- void SnapSelectionStop(wxMouseEvent& MouseEvent);
-
int x2xBar(int x);
int x2wBar(int x);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
