From: <pst...@us...> - 2008-03-17 06:22:17
|
Revision: 326 http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=326&view=rev Author: pstieber Date: 2008-03-16 23:22:14 -0700 (Sun, 16 Mar 2008) Log Message: ----------- Added a knob to the build. This will be used in dialogs. Modified Paths: -------------- trunk/jazz/src/Makefile.am trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj Added Paths: ----------- trunk/jazz/src/Knob.cpp trunk/jazz/src/Knob.h Added: trunk/jazz/src/Knob.cpp =================================================================== --- trunk/jazz/src/Knob.cpp (rev 0) +++ trunk/jazz/src/Knob.cpp 2008-03-17 06:22:14 UTC (rev 326) @@ -0,0 +1,314 @@ +//***************************************************************************** +// The JAZZ++ Midi Sequencer +// +// Copyright (C) 2008 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 +// 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 "WxWidgets.h" + +#include <wx/dcbuffer.h> + +#include "Knob.h" +#include "Globals.h" + +#include <cmath> + +//***************************************************************************** +// Description: +// This is the knob class definition. +//***************************************************************************** +//----------------------------------------------------------------------------- +//----------------------------------------------------------------------------- +BEGIN_EVENT_TABLE(JZKnob,wxControl) + EVT_SIZE(JZKnob::OnSize) + EVT_ERASE_BACKGROUND(JZKnob::OnEraseBackground) + EVT_PAINT(JZKnob::OnPaint) + EVT_LEFT_DOWN(JZKnob::OnMouse) + EVT_LEFT_UP(JZKnob::OnMouse) + EVT_MOTION(JZKnob::OnMouse) + EVT_MOUSEWHEEL(JZKnob::OnMouse) +END_EVENT_TABLE() + +//----------------------------------------------------------------------------- +//----------------------------------------------------------------------------- +JZKnob::JZKnob() + : wxControl() +{ +} + +//----------------------------------------------------------------------------- +//----------------------------------------------------------------------------- +JZKnob::JZKnob( + wxWindow* pParent, + wxWindowID Id, + int Value, + int MinValue, + int MaxValue, + unsigned int MinAngle, + unsigned int Range, + const wxPoint& Position, + const wxSize& Size, + long WindowStyle, + const wxValidator& Validator, + const wxString& Name) + : wxControl() +{ + Create( + pParent, + Id, + Value, + MinValue, + MaxValue, + MinAngle, + Range, + Position, + Size, + WindowStyle, + Validator, + Name); +} + +//----------------------------------------------------------------------------- +//----------------------------------------------------------------------------- +void JZKnob::Create( + wxWindow* pParent, + wxWindowID Id, + int Value, + int MinValue, + int MaxValue, + unsigned int MinAngle, + unsigned int Range, + const wxPoint& Position, + const wxSize& Size, + long WindowStyle, + const wxValidator& Validator, + const wxString& Name) +{ + wxControl::Create( + pParent, + Id, + Position, + Size, + WindowStyle | wxNO_BORDER, + Validator, + Name); + + SetInitialSize(Size); + + mMin = MinValue; + mMax = MaxValue; + Range %= 360; + MinAngle %= 360; + mMaxAngle = (MinAngle + 360 - Range) % 360; + + mRange = Range; + SetValue(Value); +} + +//----------------------------------------------------------------------------- +//----------------------------------------------------------------------------- +void JZKnob::SetRange(int MinValue, int MaxValue) +{ + if (MinValue < MaxValue) + { + mMin = MinValue; + mMax = MaxValue; + SetValue(mSetting); + } +} + +//----------------------------------------------------------------------------- +//----------------------------------------------------------------------------- +int JZKnob::SetValue(int Value) +{ + if (Value < mMin) + { + Value = mMin; + } + if (Value > mMax) + { + Value = mMax; + } + + if (Value != mSetting) + { + mSetting = Value; + Refresh(false); + Update(); + } + return mSetting; +} + +//----------------------------------------------------------------------------- +//----------------------------------------------------------------------------- +void JZKnob::OnSize(wxSizeEvent& Event) +{ + int Width, Height; + GetClientSize(&Width, &Height); + if (Width > 0 && Height > 0) + { + mBuffer.Create(Width, Height); + } +} + +//----------------------------------------------------------------------------- +// Description: +// This code always erasew when painting so we override this function to +// avoid flicker. +//----------------------------------------------------------------------------- +void JZKnob::OnEraseBackground(wxEraseEvent& Event) +{ +} + +//----------------------------------------------------------------------------- +//----------------------------------------------------------------------------- +void JZKnob::OnPaint(wxPaintEvent& Event) +{ + wxSize Size = GetSize(); + + double Theta = gDegreesToRadians * + (mMaxAngle + (((double)mMax - mSetting) / (mMax - mMin)) * mRange); + + double DeltaX = cos(Theta); + + // Negate because of the upside down coordinates + double DeltaY = -sin(Theta); + + wxPaintDC PaintDc(this); + + wxBufferedDC Dc(&PaintDc, mBuffer); + + Dc.SetBackground(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE))); + + Dc.Clear(); + + int XCenter, YCenter; + GetCenter(XCenter, YCenter); + + int OuterRadius = static_cast<int>( + (((Size.x < Size.y) ? Size.x : Size.y) * .48) + 0.5); + int InnerRadius = static_cast<int>(OuterRadius * 0.6 + 0.5); + + wxColour Color(120, 100, 100); + wxBrush Brush(Color, wxSOLID); + wxPen Pen(Color); + int KnobRadius = OuterRadius; + for (unsigned char Red = 120; KnobRadius > 0 && Red < 250; Red += 5) + { + Color.Set(Red, 100, 100); + Brush.SetColour(Color); + Pen.SetColour(Color); + Dc.SetBrush(Brush); + Dc.SetPen(Pen); + Dc.DrawCircle(XCenter, YCenter, KnobRadius); + --KnobRadius; + } + + wxPen WhitePen(*wxWHITE, 3); + Dc.SetPen(WhitePen); + Dc.DrawLine( + XCenter + static_cast<int>(OuterRadius * DeltaX + 0.5), + YCenter + static_cast<int>(OuterRadius * DeltaY + 0.5), + XCenter + static_cast<int>(InnerRadius * DeltaX + 0.5), + YCenter + static_cast<int>(InnerRadius * DeltaY + 0.5)); +} + +//----------------------------------------------------------------------------- +//----------------------------------------------------------------------------- +void JZKnob::OnMouse(wxMouseEvent& Event) +{ + wxEventType ScrollEvent = wxEVT_NULL; + + if (Event.Moving()) + { + Event.Skip(); + return; + } + + if (Event.GetWheelRotation() < 0) + { + SetValue(GetValue() - 1); + Event.Skip(); + return; + } + + if (Event.GetWheelRotation() > 0) + { + SetValue(GetValue() + 1); + Event.Skip(); + return; + } + + int XCenter, YCenter; + GetCenter(XCenter, YCenter); + + double DeltaX = Event.m_x - XCenter; + double DeltaY = YCenter - Event.m_y; + if (DeltaX == 0.0 && DeltaY == 0.0) + { + return; + } + + double Theta = atan2(DeltaY, DeltaX) * gRadiansToDegrees; + if (Theta < 0.0) + { + Theta += 360.0; + } + + double DeltaTheta = Theta - mMaxAngle; + if (DeltaTheta < 0.0) + { + DeltaTheta += 360; + } + if (DeltaTheta > mRange) + { + return; + } + int NewValue = int(mMax - (DeltaTheta / mRange) * (mMax - mMin)); + + SetValue(NewValue); + if (Event.Dragging() || Event.ButtonUp()) + { + if (Event.ButtonUp()) + { + ScrollEvent = wxEVT_SCROLL_THUMBRELEASE; + } + else + { + ScrollEvent = wxEVT_SCROLL_THUMBTRACK; + } + + wxScrollEvent ScrollEvent(ScrollEvent, m_windowId); + ScrollEvent.SetPosition(NewValue); + ScrollEvent.SetEventObject(this); + GetEventHandler()->ProcessEvent(ScrollEvent); + + wxCommandEvent CommandEvent(wxEVT_COMMAND_SLIDER_UPDATED, m_windowId); + CommandEvent.SetInt(NewValue); + CommandEvent.SetEventObject(this); + GetEventHandler()->ProcessEvent(CommandEvent); + } +} + +//----------------------------------------------------------------------------- +//----------------------------------------------------------------------------- +void JZKnob::GetCenter(int& x, int& y) const +{ + wxSize Size = GetSize(); + x = Size.x / 2; + y = Size.y / 2; +} Property changes on: trunk/jazz/src/Knob.cpp ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/jazz/src/Knob.h =================================================================== --- trunk/jazz/src/Knob.h (rev 0) +++ trunk/jazz/src/Knob.h 2008-03-17 06:22:14 UTC (rev 326) @@ -0,0 +1,171 @@ +//***************************************************************************** +// The JAZZ++ Midi Sequencer +// +// Copyright (C) 2008 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 +// 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_KNOB_H +#define JZ_KNOB_H + +//***************************************************************************** +// Description: +// This is the knob class declaration. This is a custom control that looks +// like a mixer knob. +//***************************************************************************** +class JZKnob : public wxControl +{ + public: + + JZKnob(); + + JZKnob( + wxWindow* pParent, + wxWindowID Id, + int Value, + int MinValue, + int MaxValue, + unsigned int MinAngle = 240, + unsigned int Range = 300, + const wxPoint& Position = wxDefaultPosition, + const wxSize& Size = wxSize(40, 40), + long WindowStyle = wxNO_BORDER, + const wxValidator& Validator = wxDefaultValidator, + const wxString& Name = wxT("knob")); + + void Create( + wxWindow* pParent, + wxWindowID Id, + int Value, + int MinValue, + int MaxValue, + unsigned int MinAngle = 240, + unsigned int Range = 300, + const wxPoint& Position = wxDefaultPosition, + const wxSize& Size = wxSize(40, 40), + long WindowStyle = wxNO_BORDER, + const wxValidator& Validator = wxDefaultValidator, + const wxString& Name = wxT("knob")); + + // Retrieve/change the range + void SetRange(int MinValue, int MaxValue); + + int GetMin() const; + + int GetMax() const; + + void SetMin(int MinValue); + + void SetMax(int MaxValue); + + unsigned int GetMinAngle() const; + + int GetMaxAngle() const; + + int GetValue() const; + + int SetValue(int Value); + + private: + + void GetCenter(int& x, int& y) const; + + void OnSize(wxSizeEvent& Event); + + void OnEraseBackground(wxEraseEvent& Event); + + void OnPaint(wxPaintEvent& Event); + + void OnMouse(wxMouseEvent& Event); + + private: + + int mMin; + + int mMax; + + int mSetting; + + unsigned int mMaxAngle; + + unsigned int mRange; + + wxBitmap mBuffer; + + DECLARE_EVENT_TABLE() +}; + +//***************************************************************************** +// Description: +// These are the knob inline member functions. +//***************************************************************************** +//----------------------------------------------------------------------------- +//----------------------------------------------------------------------------- +inline +int JZKnob::GetMin() const +{ + return mMin; +} + +//----------------------------------------------------------------------------- +//----------------------------------------------------------------------------- +inline +int JZKnob::GetMax() const +{ + return mMax; +} + +//----------------------------------------------------------------------------- +//----------------------------------------------------------------------------- +inline +void JZKnob::SetMin(int MinValue) +{ + SetRange(MinValue, GetMax()); +} + +//----------------------------------------------------------------------------- +//----------------------------------------------------------------------------- +inline +void JZKnob::SetMax(int MaxValue) +{ + SetRange(GetMin(), MaxValue); +} + +//----------------------------------------------------------------------------- +//----------------------------------------------------------------------------- +inline +unsigned int JZKnob::GetMinAngle() const +{ + return (mMaxAngle - mRange) % 360; +} + +//----------------------------------------------------------------------------- +//----------------------------------------------------------------------------- +inline +int JZKnob::GetMaxAngle() const +{ + return mMaxAngle; +} + +//----------------------------------------------------------------------------- +//----------------------------------------------------------------------------- +inline +int JZKnob::GetValue() const +{ + return mSetting; +} + +#endif // !defined(JZ_KNOB_H) Property changes on: trunk/jazz/src/Knob.h ___________________________________________________________________ Name: svn:eol-style + native Modified: trunk/jazz/src/Makefile.am =================================================================== --- trunk/jazz/src/Makefile.am 2008-03-17 05:16:19 UTC (rev 325) +++ trunk/jazz/src/Makefile.am 2008-03-17 06:22:14 UTC (rev 326) @@ -39,6 +39,7 @@ JazzPlusPlusApplication.cpp \ KeyDialog.cpp \ KeyStringConverters.cpp \ +Knob.cpp \ Mapper.cpp \ MeasureChoice.cpp \ MidiDeviceDialog.cpp \ Modified: trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj =================================================================== --- trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj 2008-03-17 05:16:19 UTC (rev 325) +++ trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj 2008-03-17 06:22:14 UTC (rev 326) @@ -453,6 +453,14 @@ > </File> <File + RelativePath="..\src\Knob.cpp" + > + </File> + <File + RelativePath="..\src\Knob.h" + > + </File> + <File RelativePath="..\src\Mapper.cpp" > </File> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pst...@us...> - 2008-03-30 15:37:22
|
Revision: 374 http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=374&view=rev Author: pstieber Date: 2008-03-30 08:37:16 -0700 (Sun, 30 Mar 2008) Log Message: ----------- Added some code for reading and writing MIDI files in ASCII format for debug purposes. This was ported from version 4.1.3 in branches. Modified Paths: -------------- trunk/jazz/src/Makefile.am trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj Added Paths: ----------- trunk/jazz/src/AsciiMidiFile.cpp trunk/jazz/src/AsciiMidiFile.h Added: trunk/jazz/src/AsciiMidiFile.cpp =================================================================== --- trunk/jazz/src/AsciiMidiFile.cpp (rev 0) +++ trunk/jazz/src/AsciiMidiFile.cpp 2008-03-30 15:37:16 UTC (rev 374) @@ -0,0 +1,192 @@ +//***************************************************************************** +// The JAZZ++ Midi Sequencer +// +// Copyright (C) 1994-2000 Andreas Voss and Per Sigmond, all rights reserved. +// Modifications Copyright (C) 2008 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 +// 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 "WxWidgets.h" + +#include "AsciiMidiFile.h" + +//***************************************************************************** +//***************************************************************************** +//----------------------------------------------------------------------------- +//----------------------------------------------------------------------------- +int JZAsciiRead::Open(const char* pFileName) +{ + int TrackCount, TicksPerQuarter; + if ( + fscanf( + mpFd, + "Tracks %d, TicksPerQuarter %d\n", + &TrackCount, + &TicksPerQuarter) != 2) + { + return 0; + } + return TrackCount; +} + +//----------------------------------------------------------------------------- +//----------------------------------------------------------------------------- +JZEvent* JZAsciiRead::Read() +{ + JZEvent* pEvent = 0; + + long Clock; + int sta, cha, Length; + if (fscanf(mpFd, "%6lu %02x %2d %d ", &Clock, &sta, &cha, &Length) != 4) + { + return pEvent; + } + + unsigned char* pBuffer = new unsigned char[Length]; + for (int i = 0; i < Length; ++i) + { + int d; + fscanf(mpFd, "%02x ", &d); + pBuffer[i] = (unsigned char)d; + } + + switch (sta) + { + case StatUnknown: + break; + + case StatKeyOff: + pEvent = new tKeyOff(Clock, cha, pBuffer[0]); + break; + + case StatKeyOn: + pEvent = new tKeyOn(Clock, cha, pBuffer[0], pBuffer[1]); + break; + + case StatControl: + pEvent = new tControl(Clock, cha, pBuffer[0], pBuffer[1]); + break; + + case StatPitch: + pEvent = new tPitch(Clock, cha, pBuffer[0], pBuffer[1]); + break; + + case StatProgram: + pEvent = new tProgram(Clock, cha, pBuffer[0]); + break; + + case StatText: + pEvent = new tText(Clock, pBuffer, Length); + break; + + case StatTrackName: + pEvent = new tTrackName(Clock, pBuffer, Length); + break; + + case StatMarker: + pEvent = new tMarker(Clock, pBuffer, Length); + break; + + case StatEndOfTrack: + break; + + case StatSetTempo: + pEvent = new tSetTempo(Clock, pBuffer[0], pBuffer[1], pBuffer[2]); + break; + + case StatTimeSignat: + pEvent = new tTimeSignat( + Clock, + pBuffer[0], + pBuffer[1], + pBuffer[2], + pBuffer[3]); + break; + + case StatSysEx: + pEvent = new tSysEx(Clock, pBuffer, Length); + break; + } + + delete [] pBuffer; + + return pEvent; +} + +//----------------------------------------------------------------------------- +//----------------------------------------------------------------------------- +int JZAsciiRead::NextTrack() +{ + return fscanf(mpFd, "NextTrack\n") == 0; +} + +//***************************************************************************** +// Description: +// Ascii-Output (debug) +//***************************************************************************** +//----------------------------------------------------------------------------- +//----------------------------------------------------------------------------- +int JZAsciiWrite::Open( + const char* pFileName, + int TrackCount, + int TicksPerQuarter) +{ + if (!JZWriteBase::Open(pFileName, TrackCount, TicksPerQuarter)) + { + return 0; + } + + fprintf( + mpFd, + "Tracks %d, TicksPerQuarter %d\n", + TrackCount, + TicksPerQuarter); + + return TrackCount; +} + +//----------------------------------------------------------------------------- +//----------------------------------------------------------------------------- +int JZAsciiWrite::Write(JZEvent* pEvent, unsigned char* pData, int Length) +{ + tChannelEvent *ce; + + fprintf(mpFd, "%6ld %02x ", pEvent->GetClock(), pEvent->Stat); + if ((ce = pEvent->IsChannelEvent()) != 0) + { + fprintf(mpFd, "%2d ", ce->Channel); + } + else + { + fprintf(mpFd, "-1 "); + } + + fprintf(mpFd, "%d ", Length); + for (int i = 0; i < Length; ++i) + { + fprintf(mpFd, "%02x ", pData[i]); + } + fprintf(mpFd, "\n"); + + return 0; +} + +//----------------------------------------------------------------------------- +//----------------------------------------------------------------------------- +void JZAsciiWrite::NextTrack() +{ + fprintf(mpFd, "NextTrack\n"); +} Property changes on: trunk/jazz/src/AsciiMidiFile.cpp ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/jazz/src/AsciiMidiFile.h =================================================================== --- trunk/jazz/src/AsciiMidiFile.h (rev 0) +++ trunk/jazz/src/AsciiMidiFile.h 2008-03-30 15:37:16 UTC (rev 374) @@ -0,0 +1,57 @@ +//***************************************************************************** +// The JAZZ++ Midi Sequencer +// +// Copyright (C) 1994-2000 Andreas Voss and Per Sigmond, all rights reserved. +// Modifications Copyright (C) 2008 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 +// 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_ASCIIMIDIFILE_H +#define JZ_ASCIIMIDIFILE_H + +#include "Events.h" + +//***************************************************************************** +//***************************************************************************** +class JZAsciiRead : public JZReadBase +{ + public: + + virtual int Open(const char* pFileName); + + virtual JZEvent* Read(); + + virtual int NextTrack(); +}; + +//***************************************************************************** +//***************************************************************************** +class JZAsciiWrite : public JZWriteBase +{ + public: + + virtual int Open( + const char* pFileName, + int TrackCount, + int TicksPerQuarter); + + virtual int Write(JZEvent* pEvent, unsigned char* pData, int Length); + + virtual void NextTrack(); +}; + + +#endif // !defined(JZ_ASCIIMIDIFILE_H) Property changes on: trunk/jazz/src/AsciiMidiFile.h ___________________________________________________________________ Name: svn:eol-style + native Modified: trunk/jazz/src/Makefile.am =================================================================== --- trunk/jazz/src/Makefile.am 2008-03-30 15:21:52 UTC (rev 373) +++ trunk/jazz/src/Makefile.am 2008-03-30 15:37:16 UTC (rev 374) @@ -7,6 +7,7 @@ AlsaDriver.cpp \ AlsaPlayer.cpp \ AlsaThru.cpp \ +AsciiMidiFile.cpp \ Audio.cpp \ AudioDriver.cpp \ ClockDialog.cpp \ @@ -80,6 +81,7 @@ AlsaDriver.h \ AlsaPlayer.h \ AlsaThru.h \ +AsciiMidiFile.h \ Audio.h \ AudioDriver.h \ ClockDialog.h \ Modified: trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj =================================================================== --- trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj 2008-03-30 15:21:52 UTC (rev 373) +++ trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj 2008-03-30 15:37:16 UTC (rev 374) @@ -229,6 +229,14 @@ > </File> <File + RelativePath="..\src\AsciiMidiFile.cpp" + > + </File> + <File + RelativePath="..\src\AsciiMidiFile.h" + > + </File> + <File RelativePath="..\src\Audio.cpp" > </File> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pst...@us...> - 2008-04-05 01:30:54
|
Revision: 393 http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=393&view=rev Author: pstieber Date: 2008-04-04 18:30:50 -0700 (Fri, 04 Apr 2008) Log Message: ----------- 1. Removed rebuild because I don't want to encourage developers to build the code under the source directory. 2. Removed the doxygen configuration file because I'm not using this tool. Removed Paths: ------------- trunk/jazz/jazz.doxy trunk/jazz/rebuild Deleted: trunk/jazz/jazz.doxy =================================================================== --- trunk/jazz/jazz.doxy 2008-04-03 05:13:17 UTC (rev 392) +++ trunk/jazz/jazz.doxy 2008-04-05 01:30:50 UTC (rev 393) @@ -1,1109 +0,0 @@ -# Doxyfile 1.3.3 - -# This file describes the settings to be used by the documentation system -# doxygen (www.doxygen.org) for a project -# -# All text after a hash (#) is considered a comment and will be ignored -# The format is: -# TAG = value [value, ...] -# For lists items can also be appended using: -# TAG += value [value, ...] -# Values that contain spaces should be placed between quotes (" ") - -#--------------------------------------------------------------------------- -# General configuration options -#--------------------------------------------------------------------------- - -# The PROJECT_NAME tag is a single word (or a sequence of words surrounded -# by quotes) that should identify the project. - -PROJECT_NAME = JazzPlusPlus - -# The PROJECT_NUMBER tag can be used to enter a project or revision number. -# This could be handy for archiving the generated documentation or -# if some version control system is used. - -PROJECT_NUMBER = - -# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) -# base path where the generated documentation will be put. -# If a relative path is entered, it will be relative to the location -# where doxygen was started. If left blank the current directory will be used. - -OUTPUT_DIRECTORY = doc - -# The OUTPUT_LANGUAGE tag is used to specify the language in which all -# documentation generated by doxygen is written. Doxygen will use this -# information to generate all constant output in the proper language. -# The default language is English, other supported languages are: -# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, -# Finnish, French, German, Greek, Hungarian, Italian, Japanese, Japanese-en -# (Japanese with English messages), Korean, Norwegian, Polish, Portuguese, -# Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian. - -OUTPUT_LANGUAGE = English - -# This tag can be used to specify the encoding used in the generated output. -# The encoding is not always determined by the language that is chosen, -# but also whether or not the output is meant for Windows or non-Windows users. -# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES -# forces the Windows encoding (this is the default for the Windows binary), -# whereas setting the tag to NO uses a Unix-style encoding (the default for -# all platforms other than Windows). - -USE_WINDOWS_ENCODING = NO - -# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in -# documentation are documented, even if no documentation was available. -# Private class members and static file members will be hidden unless -# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES - -EXTRACT_ALL = YES - -# If the EXTRACT_PRIVATE tag is set to YES all private members of a class -# will be included in the documentation. - -EXTRACT_PRIVATE = YES - -# If the EXTRACT_STATIC tag is set to YES all static members of a file -# will be included in the documentation. - -EXTRACT_STATIC = YES - -# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) -# defined locally in source files will be included in the documentation. -# If set to NO only classes defined in header files are included. - -EXTRACT_LOCAL_CLASSES = YES - -# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all -# undocumented members of documented classes, files or namespaces. -# If set to NO (the default) these members will be included in the -# various overviews, but no documentation section is generated. -# This option has no effect if EXTRACT_ALL is enabled. - -HIDE_UNDOC_MEMBERS = NO - -# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all -# undocumented classes that are normally visible in the class hierarchy. -# If set to NO (the default) these classes will be included in the various -# overviews. This option has no effect if EXTRACT_ALL is enabled. - -HIDE_UNDOC_CLASSES = NO - -# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all -# friend (class|struct|union) declarations. -# If set to NO (the default) these declarations will be included in the -# documentation. - -HIDE_FRIEND_COMPOUNDS = NO - -# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any -# documentation blocks found inside the body of a function. -# If set to NO (the default) these blocks will be appended to the -# function's detailed documentation block. - -HIDE_IN_BODY_DOCS = NO - -# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will -# include brief member descriptions after the members that are listed in -# the file and class documentation (similar to JavaDoc). -# Set to NO to disable this. - -BRIEF_MEMBER_DESC = YES - -# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend -# the brief description of a member or function before the detailed description. -# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the -# brief descriptions will be completely suppressed. - -REPEAT_BRIEF = YES - -# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then -# Doxygen will generate a detailed section even if there is only a brief -# description. - -ALWAYS_DETAILED_SEC = NO - -# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all inherited -# members of a class in the documentation of that class as if those members were -# ordinary class members. Constructors, destructors and assignment operators of -# the base classes will not be shown. - -INLINE_INHERITED_MEMB = NO - -# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full -# path before files name in the file list and in the header files. If set -# to NO the shortest path that makes the file name unique will be used. - -FULL_PATH_NAMES = NO - -# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag -# can be used to strip a user-defined part of the path. Stripping is -# only done if one of the specified strings matches the left-hand part of -# the path. It is allowed to use relative paths in the argument list. - -STRIP_FROM_PATH = - -# The INTERNAL_DOCS tag determines if documentation -# that is typed after a \internal command is included. If the tag is set -# to NO (the default) then the documentation will be excluded. -# Set it to YES to include the internal documentation. - -INTERNAL_DOCS = NO - -# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate -# file names in lower-case letters. If set to YES upper-case letters are also -# allowed. This is useful if you have classes or files whose names only differ -# in case and if your file system supports case sensitive file names. Windows -# users are advised to set this option to NO. - -CASE_SENSE_NAMES = YES - -# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter -# (but less readable) file names. This can be useful is your file systems -# doesn't support long names like on DOS, Mac, or CD-ROM. - -SHORT_NAMES = NO - -# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen -# will show members with their full class and namespace scopes in the -# documentation. If set to YES the scope will be hidden. - -HIDE_SCOPE_NAMES = NO - -# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen -# will put a list of the files that are included by a file in the documentation -# of that file. - -SHOW_INCLUDE_FILES = YES - -# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen -# will interpret the first line (until the first dot) of a JavaDoc-style -# comment as the brief description. If set to NO, the JavaDoc -# comments will behave just like the Qt-style comments (thus requiring an -# explict @brief command for a brief description. - -JAVADOC_AUTOBRIEF = NO - -# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen -# treat a multi-line C++ special comment block (i.e. a block of //! or /// -# comments) as a brief description. This used to be the default behaviour. -# The new default is to treat a multi-line C++ comment block as a detailed -# description. Set this tag to YES if you prefer the old behaviour instead. - -MULTILINE_CPP_IS_BRIEF = NO - -# If the DETAILS_AT_TOP tag is set to YES then Doxygen -# will output the detailed description near the top, like JavaDoc. -# If set to NO, the detailed description appears after the member -# documentation. - -DETAILS_AT_TOP = NO - -# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented -# member inherits the documentation from any documented member that it -# reimplements. - -INHERIT_DOCS = YES - -# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] -# is inserted in the documentation for inline members. - -INLINE_INFO = YES - -# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen -# will sort the (detailed) documentation of file and class members -# alphabetically by member name. If set to NO the members will appear in -# declaration order. - -SORT_MEMBER_DOCS = YES - -# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC -# tag is set to YES, then doxygen will reuse the documentation of the first -# member in the group (if any) for the other members of the group. By default -# all members of a group must be documented explicitly. - -DISTRIBUTE_GROUP_DOC = NO - -# The TAB_SIZE tag can be used to set the number of spaces in a tab. -# Doxygen uses this value to replace tabs by spaces in code fragments. - -TAB_SIZE = 8 - -# The GENERATE_TODOLIST tag can be used to enable (YES) or -# disable (NO) the todo list. This list is created by putting \todo -# commands in the documentation. - -GENERATE_TODOLIST = YES - -# The GENERATE_TESTLIST tag can be used to enable (YES) or -# disable (NO) the test list. This list is created by putting \test -# commands in the documentation. - -GENERATE_TESTLIST = YES - -# The GENERATE_BUGLIST tag can be used to enable (YES) or -# disable (NO) the bug list. This list is created by putting \bug -# commands in the documentation. - -GENERATE_BUGLIST = YES - -# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or -# disable (NO) the deprecated list. This list is created by putting -# \deprecated commands in the documentation. - -GENERATE_DEPRECATEDLIST= YES - -# This tag can be used to specify a number of aliases that acts -# as commands in the documentation. An alias has the form "name=value". -# For example adding "sideeffect=\par Side Effects:\n" will allow you to -# put the command \sideeffect (or @sideeffect) in the documentation, which -# will result in a user-defined paragraph with heading "Side Effects:". -# You can put \n's in the value part of an alias to insert newlines. - -ALIASES = - -# The ENABLED_SECTIONS tag can be used to enable conditional -# documentation sections, marked by \if sectionname ... \endif. - -ENABLED_SECTIONS = - -# The MAX_INITIALIZER_LINES tag determines the maximum number of lines -# the initial value of a variable or define consists of for it to appear in -# the documentation. If the initializer consists of more lines than specified -# here it will be hidden. Use a value of 0 to hide initializers completely. -# The appearance of the initializer of individual variables and defines in the -# documentation can be controlled using \showinitializer or \hideinitializer -# command in the documentation regardless of this setting. - -MAX_INITIALIZER_LINES = 30 - -# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources -# only. Doxygen will then generate output that is more tailored for C. -# For instance, some of the names that are used will be different. The list -# of all members will be omitted, etc. - -OPTIMIZE_OUTPUT_FOR_C = NO - -# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources -# only. Doxygen will then generate output that is more tailored for Java. -# For instance, namespaces will be presented as packages, qualified scopes -# will look different, etc. - -OPTIMIZE_OUTPUT_JAVA = NO - -# Set the SHOW_USED_FILES tag to NO to disable the list of files generated -# at the bottom of the documentation of classes and structs. If set to YES the -# list will mention the files that were used to generate the documentation. - -SHOW_USED_FILES = YES - -# Set the SUBGROUPING tag to YES (the default) to allow class member groups of -# the same type (for instance a group of public functions) to be put as a -# subgroup of that type (e.g. under the Public Functions section). Set it to -# NO to prevent subgrouping. Alternatively, this can be done per class using -# the \nosubgrouping command. - -SUBGROUPING = YES - -#--------------------------------------------------------------------------- -# configuration options related to warning and progress messages -#--------------------------------------------------------------------------- - -# The QUIET tag can be used to turn on/off the messages that are generated -# by doxygen. Possible values are YES and NO. If left blank NO is used. - -QUIET = NO - -# The WARNINGS tag can be used to turn on/off the warning messages that are -# generated by doxygen. Possible values are YES and NO. If left blank -# NO is used. - -WARNINGS = YES - -# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings -# for undocumented members. If EXTRACT_ALL is set to YES then this flag will -# automatically be disabled. - -WARN_IF_UNDOCUMENTED = YES - -# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for -# potential errors in the documentation, such as not documenting some -# parameters in a documented function, or documenting parameters that -# don't exist or using markup commands wrongly. - -WARN_IF_DOC_ERROR = YES - -# The WARN_FORMAT tag determines the format of the warning messages that -# doxygen can produce. The string should contain the $file, $line, and $text -# tags, which will be replaced by the file and line number from which the -# warning originated and the warning text. - -WARN_FORMAT = "$file:$line: $text" - -# The WARN_LOGFILE tag can be used to specify a file to which warning -# and error messages should be written. If left blank the output is written -# to stderr. - -WARN_LOGFILE = - -#--------------------------------------------------------------------------- -# configuration options related to the input files -#--------------------------------------------------------------------------- - -# The INPUT tag can be used to specify the files and/or directories that contain -# documented source files. You may enter file names like "myfile.cpp" or -# directories like "/usr/src/myproject". Separate the files or directories -# with spaces. - -INPUT = src - -# If the value of the INPUT tag contains directories, you can use the -# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank the following patterns are tested: -# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp -# *.h++ *.idl *.odl *.cs - -FILE_PATTERNS = - -# The RECURSIVE tag can be used to turn specify whether or not subdirectories -# should be searched for input files as well. Possible values are YES and NO. -# If left blank NO is used. - -RECURSIVE = YES - -# The EXCLUDE tag can be used to specify files and/or directories that should -# excluded from the INPUT source files. This way you can easily exclude a -# subdirectory from a directory tree whose root is specified with the INPUT tag. - -EXCLUDE = - -# The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories -# that are symbolic links (a Unix filesystem feature) are excluded from the input. - -EXCLUDE_SYMLINKS = NO - -# If the value of the INPUT tag contains directories, you can use the -# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude -# certain files from those directories. - -EXCLUDE_PATTERNS = - -# The EXAMPLE_PATH tag can be used to specify one or more files or -# directories that contain example code fragments that are included (see -# the \include command). - -EXAMPLE_PATH = - -# If the value of the EXAMPLE_PATH tag contains directories, you can use the -# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank all files are included. - -EXAMPLE_PATTERNS = - -# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be -# searched for input files to be used with the \include or \dontinclude -# commands irrespective of the value of the RECURSIVE tag. -# Possible values are YES and NO. If left blank NO is used. - -EXAMPLE_RECURSIVE = NO - -# The IMAGE_PATH tag can be used to specify one or more files or -# directories that contain image that are included in the documentation (see -# the \image command). - -IMAGE_PATH = - -# The INPUT_FILTER tag can be used to specify a program that doxygen should -# invoke to filter for each input file. Doxygen will invoke the filter program -# by executing (via popen()) the command <filter> <input-file>, where <filter> -# is the value of the INPUT_FILTER tag, and <input-file> is the name of an -# input file. Doxygen will then use the output that the filter program writes -# to standard output. - -INPUT_FILTER = - -# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using -# INPUT_FILTER) will be used to filter the input files when producing source -# files to browse (i.e. when SOURCE_BROWSER is set to YES). - -FILTER_SOURCE_FILES = NO - -#--------------------------------------------------------------------------- -# configuration options related to source browsing -#--------------------------------------------------------------------------- - -# If the SOURCE_BROWSER tag is set to YES then a list of source files will -# be generated. Documented entities will be cross-referenced with these sources. - -SOURCE_BROWSER = YES - -# Setting the INLINE_SOURCES tag to YES will include the body -# of functions and classes directly in the documentation. - -INLINE_SOURCES = NO - -# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct -# doxygen to hide any special comment blocks from generated source code -# fragments. Normal C and C++ comments will always remain visible. - -STRIP_CODE_COMMENTS = YES - -# If the REFERENCED_BY_RELATION tag is set to YES (the default) -# then for each documented function all documented -# functions referencing it will be listed. - -REFERENCED_BY_RELATION = YES - -# If the REFERENCES_RELATION tag is set to YES (the default) -# then for each documented function all documented entities -# called/used by that function will be listed. - -REFERENCES_RELATION = YES - -# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen -# will generate a verbatim copy of the header file for each class for -# which an include is specified. Set to NO to disable this. - -VERBATIM_HEADERS = YES - -#--------------------------------------------------------------------------- -# configuration options related to the alphabetical class index -#--------------------------------------------------------------------------- - -# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index -# of all compounds will be generated. Enable this if the project -# contains a lot of classes, structs, unions or interfaces. - -ALPHABETICAL_INDEX = YES - -# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then -# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns -# in which this list will be split (can be a number in the range [1..20]) - -COLS_IN_ALPHA_INDEX = 5 - -# In case all classes in a project start with a common prefix, all -# classes will be put under the same header in the alphabetical index. -# The IGNORE_PREFIX tag can be used to specify one or more prefixes that -# should be ignored while generating the index headers. - -IGNORE_PREFIX = - -#--------------------------------------------------------------------------- -# configuration options related to the HTML output -#--------------------------------------------------------------------------- - -# If the GENERATE_HTML tag is set to YES (the default) Doxygen will -# generate HTML output. - -GENERATE_HTML = YES - -# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `html' will be used as the default path. - -HTML_OUTPUT = html - -# The HTML_FILE_EXTENSION tag can be used to specify the file extension for -# each generated HTML page (for example: .htm,.php,.asp). If it is left blank -# doxygen will generate files with .html extension. - -HTML_FILE_EXTENSION = .html - -# The HTML_HEADER tag can be used to specify a personal HTML header for -# each generated HTML page. If it is left blank doxygen will generate a -# standard header. - -HTML_HEADER = - -# The HTML_FOOTER tag can be used to specify a personal HTML footer for -# each generated HTML page. If it is left blank doxygen will generate a -# standard footer. - -HTML_FOOTER = - -# The HTML_STYLESHEET tag can be used to specify a user-defined cascading -# style sheet that is used by each HTML page. It can be used to -# fine-tune the look of the HTML output. If the tag is left blank doxygen -# will generate a default style sheet - -HTML_STYLESHEET = - -# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, -# files or namespaces will be aligned in HTML using tables. If set to -# NO a bullet list will be used. - -HTML_ALIGN_MEMBERS = YES - -# If the GENERATE_HTMLHELP tag is set to YES, additional index files -# will be generated that can be used as input for tools like the -# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) -# of the generated HTML documentation. - -GENERATE_HTMLHELP = NO - -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can -# be used to specify the file name of the resulting .chm file. You -# can add a path in front of the file if the result should not be -# written to the html output dir. - -CHM_FILE = - -# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can -# be used to specify the location (absolute path including file name) of -# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run -# the HTML help compiler on the generated index.hhp. - -HHC_LOCATION = - -# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag -# controls if a separate .chi index file is generated (YES) or that -# it should be included in the master .chm file (NO). - -GENERATE_CHI = NO - -# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag -# controls whether a binary table of contents is generated (YES) or a -# normal table of contents (NO) in the .chm file. - -BINARY_TOC = NO - -# The TOC_EXPAND flag can be set to YES to add extra items for group members -# to the contents of the HTML help documentation and to the tree view. - -TOC_EXPAND = NO - -# The DISABLE_INDEX tag can be used to turn on/off the condensed index at -# top of each HTML page. The value NO (the default) enables the index and -# the value YES disables it. - -DISABLE_INDEX = NO - -# This tag can be used to set the number of enum values (range [1..20]) -# that doxygen will group on one line in the generated HTML documentation. - -ENUM_VALUES_PER_LINE = 4 - -# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be -# generated containing a tree-like index structure (just like the one that -# is generated for HTML Help). For this to work a browser that supports -# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, -# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are -# probably better off using the HTML help feature. - -GENERATE_TREEVIEW = YES - -# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be -# used to set the initial width (in pixels) of the frame in which the tree -# is shown. - -TREEVIEW_WIDTH = 250 - -#--------------------------------------------------------------------------- -# configuration options related to the LaTeX output -#--------------------------------------------------------------------------- - -# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will -# generate Latex output. - -GENERATE_LATEX = YES - -# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `latex' will be used as the default path. - -LATEX_OUTPUT = latex - -# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be -# invoked. If left blank `latex' will be used as the default command name. - -LATEX_CMD_NAME = latex - -# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to -# generate index for LaTeX. If left blank `makeindex' will be used as the -# default command name. - -MAKEINDEX_CMD_NAME = makeindex - -# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact -# LaTeX documents. This may be useful for small projects and may help to -# save some trees in general. - -COMPACT_LATEX = NO - -# The PAPER_TYPE tag can be used to set the paper type that is used -# by the printer. Possible values are: a4, a4wide, letter, legal and -# executive. If left blank a4wide will be used. - -PAPER_TYPE = a4wide - -# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX -# packages that should be included in the LaTeX output. - -EXTRA_PACKAGES = - -# The LATEX_HEADER tag can be used to specify a personal LaTeX header for -# the generated latex document. The header should contain everything until -# the first chapter. If it is left blank doxygen will generate a -# standard header. Notice: only use this tag if you know what you are doing! - -LATEX_HEADER = - -# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated -# is prepared for conversion to pdf (using ps2pdf). The pdf file will -# contain links (just like the HTML output) instead of page references -# This makes the output suitable for online browsing using a pdf viewer. - -PDF_HYPERLINKS = NO - -# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of -# plain latex in the generated Makefile. Set this option to YES to get a -# higher quality PDF documentation. - -USE_PDFLATEX = NO - -# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. -# command to the generated LaTeX files. This will instruct LaTeX to keep -# running if errors occur, instead of asking the user for help. -# This option is also used when generating formulas in HTML. - -LATEX_BATCHMODE = NO - -# If LATEX_HIDE_INDICES is set to YES then doxygen will not -# include the index chapters (such as File Index, Compound Index, etc.) -# in the output. - -LATEX_HIDE_INDICES = NO - -#--------------------------------------------------------------------------- -# configuration options related to the RTF output -#--------------------------------------------------------------------------- - -# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output -# The RTF output is optimised for Word 97 and may not look very pretty with -# other RTF readers or editors. - -GENERATE_RTF = NO - -# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `rtf' will be used as the default path. - -RTF_OUTPUT = rtf - -# If the COMPACT_RTF tag is set to YES Doxygen generates more compact -# RTF documents. This may be useful for small projects and may help to -# save some trees in general. - -COMPACT_RTF = NO - -# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated -# will contain hyperlink fields. The RTF file will -# contain links (just like the HTML output) instead of page references. -# This makes the output suitable for online browsing using WORD or other -# programs which support those fields. -# Note: wordpad (write) and others do not support links. - -RTF_HYPERLINKS = NO - -# Load stylesheet definitions from file. Syntax is similar to doxygen's -# config file, i.e. a series of assigments. You only have to provide -# replacements, missing definitions are set to their default value. - -RTF_STYLESHEET_FILE = - -# Set optional variables used in the generation of an rtf document. -# Syntax is similar to doxygen's config file. - -RTF_EXTENSIONS_FILE = - -#--------------------------------------------------------------------------- -# configuration options related to the man page output -#--------------------------------------------------------------------------- - -# If the GENERATE_MAN tag is set to YES (the default) Doxygen will -# generate man pages - -GENERATE_MAN = NO - -# The MAN_OUTPUT tag is used to specify where the man pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `man' will be used as the default path. - -MAN_OUTPUT = man - -# The MAN_EXTENSION tag determines the extension that is added to -# the generated man pages (default is the subroutine's section .3) - -MAN_EXTENSION = .3 - -# If the MAN_LINKS tag is set to YES and Doxygen generates man output, -# then it will generate one additional man file for each entity -# documented in the real man page(s). These additional files -# only source the real man page, but without them the man command -# would be unable to find the correct page. The default is NO. - -MAN_LINKS = NO - -#--------------------------------------------------------------------------- -# configuration options related to the XML output -#--------------------------------------------------------------------------- - -# If the GENERATE_XML tag is set to YES Doxygen will -# generate an XML file that captures the structure of -# the code including all documentation. Note that this -# feature is still experimental and incomplete at the -# moment. - -GENERATE_XML = NO - -# The XML_OUTPUT tag is used to specify where the XML pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `xml' will be used as the default path. - -XML_OUTPUT = xml - -# The XML_SCHEMA tag can be used to specify an XML schema, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - -XML_SCHEMA = - -# The XML_DTD tag can be used to specify an XML DTD, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - -XML_DTD = - -#--------------------------------------------------------------------------- -# configuration options for the AutoGen Definitions output -#--------------------------------------------------------------------------- - -# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will -# generate an AutoGen Definitions (see autogen.sf.net) file -# that captures the structure of the code including all -# documentation. Note that this feature is still experimental -# and incomplete at the moment. - -GENERATE_AUTOGEN_DEF = NO - -#--------------------------------------------------------------------------- -# configuration options related to the Perl module output -#--------------------------------------------------------------------------- - -# If the GENERATE_PERLMOD tag is set to YES Doxygen will -# generate a Perl module file that captures the structure of -# the code including all documentation. Note that this -# feature is still experimental and incomplete at the -# moment. - -GENERATE_PERLMOD = NO - -# If the PERLMOD_LATEX tag is set to YES Doxygen will generate -# the necessary Makefile rules, Perl scripts and LaTeX code to be able -# to generate PDF and DVI output from the Perl module output. - -PERLMOD_LATEX = NO - -# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be -# nicely formatted so it can be parsed by a human reader. This is useful -# if you want to understand what is going on. On the other hand, if this -# tag is set to NO the size of the Perl module output will be much smaller -# and Perl will parse it just the same. - -PERLMOD_PRETTY = YES - -# The names of the make variables in the generated doxyrules.make file -# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. -# This is useful so different doxyrules.make files included by the same -# Makefile don't overwrite each other's variables. - -PERLMOD_MAKEVAR_PREFIX = - -#--------------------------------------------------------------------------- -# Configuration options related to the preprocessor -#--------------------------------------------------------------------------- - -# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will -# evaluate all C-preprocessor directives found in the sources and include -# files. - -ENABLE_PREPROCESSING = YES - -# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro -# names in the source code. If set to NO (the default) only conditional -# compilation will be performed. Macro expansion can be done in a controlled -# way by setting EXPAND_ONLY_PREDEF to YES. - -MACRO_EXPANSION = NO - -# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES -# then the macro expansion is limited to the macros specified with the -# PREDEFINED and EXPAND_AS_PREDEFINED tags. - -EXPAND_ONLY_PREDEF = NO - -# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files -# in the INCLUDE_PATH (see below) will be search if a #include is found. - -SEARCH_INCLUDES = YES - -# The INCLUDE_PATH tag can be used to specify one or more directories that -# contain include files that are not input files but should be processed by -# the preprocessor. - -INCLUDE_PATH = - -# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard -# patterns (like *.h and *.hpp) to filter out the header-files in the -# directories. If left blank, the patterns specified with FILE_PATTERNS will -# be used. - -INCLUDE_FILE_PATTERNS = - -# The PREDEFINED tag can be used to specify one or more macro names that -# are defined before the preprocessor is started (similar to the -D option of -# gcc). The argument of the tag is a list of macros of the form: name -# or name=definition (no spaces). If the definition and the = are -# omitted =1 is assumed. - -PREDEFINED = - -# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then -# this tag can be used to specify a list of macro names that should be expanded. -# The macro definition that is found in the sources will be used. -# Use the PREDEFINED tag if you want to use a different macro definition. - -EXPAND_AS_DEFINED = - -# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then -# doxygen's preprocessor will remove all function-like macros that are alone -# on a line, have an all uppercase name, and do not end with a semicolon. Such -# function macros are typically used for boiler-plate code, and will confuse the -# parser if not removed. - -SKIP_FUNCTION_MACROS = YES - -#--------------------------------------------------------------------------- -# Configuration::addtions related to external references -#--------------------------------------------------------------------------- - -# The TAGFILES option can be used to specify one or more tagfiles. -# Optionally an initial location of the external documentation -# can be added for each tagfile. The format of a tag file without -# this location is as follows: -# TAGFILES = file1 file2 ... -# Adding location for the tag files is done as follows: -# TAGFILES = file1=loc1 "file2 = loc2" ... -# where "loc1" and "loc2" can be relative or absolute paths or -# URLs. If a location is present for each tag, the installdox tool -# does not have to be run to correct the links. -# Note that each tag file must have a unique name -# (where the name does NOT include the path) -# If a tag file is not located in the directory in which doxygen -# is run, you must also specify the path to the tagfile here. - -TAGFILES = - -# When a file name is specified after GENERATE_TAGFILE, doxygen will create -# a tag file that is based on the input files it reads. - -GENERATE_TAGFILE = - -# If the ALLEXTERNALS tag is set to YES all external classes will be listed -# in the class index. If set to NO only the inherited external classes -# will be listed. - -ALLEXTERNALS = NO - -# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed -# in the modules index. If set to NO, only the current project's groups will -# be listed. - -EXTERNAL_GROUPS = YES - -# The PERL_PATH should be the absolute path and name of the perl script -# interpreter (i.e. the result of `which perl'). - -PERL_PATH = /usr/bin/perl - -#--------------------------------------------------------------------------- -# Configuration options related to the dot tool -#--------------------------------------------------------------------------- - -# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will -# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base or -# super classes. Setting the tag to NO turns the diagrams off. Note that this -# option is superceded by the HAVE_DOT option below. This is only a fallback. It is -# recommended to install and use dot, since it yields more powerful graphs. - -CLASS_DIAGRAMS = YES - -# If set to YES, the inheritance and collaboration graphs will hide -# inheritance and usage relations if the target is undocumented -# or is not a class. - -HIDE_UNDOC_RELATIONS = YES - -# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is -# available from the path. This tool is part of Graphviz, a graph visualization -# toolkit from AT&T and Lucent Bell Labs. The other options in this section -# have no effect if this option is set to NO (the default) - -HAVE_DOT = NO - -# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect inheritance relations. Setting this tag to YES will force the -# the CLASS_DIAGRAMS tag to NO. - -CLASS_GRAPH = YES - -# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect implementation dependencies (inheritance, containment, and -# class references variables) of the class with other documented classes. - -COLLABORATION_GRAPH = YES - -# If the UML_LOOK tag is set to YES doxygen will generate inheritance and -# collaboration diagrams in a style similiar to the OMG's Unified Modeling -# Language. - -UML_LOOK = NO - -# If set to YES, the inheritance and collaboration graphs will show the -# relations between templates and their instances. - -TEMPLATE_RELATIONS = NO - -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT -# tags are set to YES then doxygen will generate a graph for each documented -# file showing the direct and indirect include dependencies of the file with -# other documented files. - -INCLUDE_GRAPH = YES - -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and -# HAVE_DOT tags are set to YES then doxygen will generate a graph for each -# documented header file showing the documented files that directly or -# indirectly include this file. - -INCLUDED_BY_GRAPH = YES - -# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will -# generate a call dependency graph for every global function or class method. -# Note that enabling this option will significantly increase the time of a run. -# So in most cases it will be better to enable call graphs for selected -# functions only using the \callgraph command. - -CALL_GRAPH = NO - -# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen -# will graphical hierarchy of all classes instead of a textual one. - -GRAPHICAL_HIERARCHY = YES - -# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images -# generated by dot. Possible values are png, jpg, or gif -# If left blank png will be used. - -DOT_IMAGE_FORMAT = png - -# The tag DOT_PATH can be used to specify the path where the dot tool can be -# found. If left blank, it is assumed the dot tool can be found on the path. - -DOT_PATH = - -# The DOTFILE_DIRS tag can be used to specify one or more directories that -# contain dot files that are included in the documentation (see the -# \dotfile command). - -DOTFILE_DIRS = - -# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width -# (in pixels) of the graphs generated by dot. If a graph becomes larger than -# this value, doxygen will try to truncate the graph, so that it fits within -# the specified constraint. Beware that most browsers cannot cope with very -# large images. - -MAX_DOT_GRAPH_WIDTH = 1024 - -# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height -# (in pixels) of the graphs generated by dot. If a graph becomes larger than -# this value, doxygen will try to truncate the graph, so that it fits within -# the specified constraint. Beware that most browsers cannot cope with very -# large images. - -MAX_DOT_GRAPH_HEIGHT = 1024 - -# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the -# graphs generated by dot. A depth value of 3 means that only nodes reachable -# from the root by following a path via at most 3 edges will be shown. Nodes that -# lay further from the root node will be omitted. Note that setting this option to -# 1 or 2 may greatly reduce the computation time needed for large code bases. Also -# note that a graph may be further truncated if the graph's image dimensions are -# not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH and MAX_DOT_GRAPH_HEIGHT). -# If 0 is used for the depth value (the default), the graph is not depth-constrained. - -MAX_DOT_GRAPH_DEPTH = 0 - -# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will -# generate a legend page explaining the meaning of the various boxes and -# arrows in the dot generated graphs. - -GENERATE_LEGEND = YES - -# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will -# remove the intermediate dot files that are used to generate -# the various graphs. - -DOT_CLEANUP = YES - -#--------------------------------------------------------------------------- -# Configuration::addtions related to the search engine -#--------------------------------------------------------------------------- - -# The SEARCHENGINE tag specifies whether or not a search engine should be -# used. If set to NO the values of all tags below this one will be ignored. - -SEARCHENGINE = NO - -# The CGI_NAME tag should be the name of the CGI script that -# starts the search engine (doxysearch) with the correct parameters. -# A script with this name will be generated by doxygen. - -CGI_NAME = search.cgi - -# The CGI_URL tag should be the absolute URL to the directory where the -# cgi binaries are located. See the documentation of your http daemon for -# details. - -CGI_URL = - -# The DOC_URL tag should be the absolute URL to the directory where the -# documentation is located. If left blank the absolute path to the -# documentation, with file:// prepended to it, will be used. - -DOC_URL = - -# The DOC_ABSPATH tag should be the absolute path to the directory where the -# documentation is located. If left blank the directory on the local machine -# will be used. - -DOC_ABSPATH = - -# The BIN_ABSPATH tag must point to the directory where the doxysearch binary -# is installed. - -BIN_ABSPATH = /usr/local/bin/ - -# The EXT_DOC_PATHS tag can be used to specify one or more paths to -# documentation generated for other projects. This allows doxysearch to search -# the documentation for these projects as well. - -EXT_DOC_PATHS = Deleted: trunk/jazz/rebuild =================================================================== --- trunk/jazz/rebuild 2008-04-03 05:13:17 UTC (rev 392) +++ trunk/jazz/rebuild 2008-04-05 01:30:50 UTC (rev 393) @@ -1,12 +0,0 @@ -#!/bin/sh - -# The CVS contains some files that technically aren't needed to build from the -# bare bottom of the source. To remove those files, run: -# make really-clean -# To recreate those files, two things need to be done: -# ./bootstrap -# cd bitmaps; make - -./bootstrap -./configure --enable-alsa=yes --enable-sequencer2=yes -make This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pst...@us...> - 2008-04-05 01:35:15
|
Revision: 394 http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=394&view=rev Author: pstieber Date: 2008-04-04 18:35:12 -0700 (Fri, 04 Apr 2008) Log Message: ----------- Removed the force option from autoreconf. Modified Paths: -------------- trunk/jazz/bootstrap trunk/jazz/config/config.guess trunk/jazz/config/config.sub trunk/jazz/config/ltmain.sh trunk/jazz/src/AlsaDriver.cpp trunk/jazz/src/JazzPlusPlusApplication.cpp trunk/jazz/src/Project.cpp Modified: trunk/jazz/bootstrap =================================================================== --- trunk/jazz/bootstrap 2008-04-05 01:30:50 UTC (rev 393) +++ trunk/jazz/bootstrap 2008-04-05 01:35:12 UTC (rev 394) @@ -1,2 +1,2 @@ #! /bin/sh -autoreconf --install --verbose --force +autoreconf --install --verbose Modified: trunk/jazz/config/config.guess =================================================================== --- trunk/jazz/config/config.guess 2008-04-05 01:30:50 UTC (rev 393) +++ trunk/jazz/config/config.guess 2008-04-05 01:35:12 UTC (rev 394) @@ -1,10 +1,9 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -# Inc. +# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -timestamp='2006-07-02' +timestamp='2005-12-13' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -107,7 +106,7 @@ trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; : ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; @@ -207,11 +206,8 @@ *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} exit ;; - *:SolidBSD:*:*) - echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} - exit ;; macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd${UNAME_RELEASE} + echo powerppc-unknown-mirbsd${UNAME_RELEASE} exit ;; *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} @@ -768,14 +764,7 @@ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - esac + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin @@ -790,12 +779,9 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - x86:Interix*:[3456]*) - echo i586-pc-interix${UNAME_RELEASE} + x86:Interix*:[345]*) + echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' exit ;; - EM64T:Interix*:[3456]*) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; @@ -831,9 +817,6 @@ arm*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; - avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; cris:Linux:*:*) echo cris-axis-linux-gnu exit ;; @@ -868,11 +851,7 @@ #endif #endif EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`" test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; mips64:Linux:*:*) @@ -891,11 +870,7 @@ #endif #endif EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`" test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) @@ -992,7 +967,7 @@ LIBC=gnulibc1 # endif #else - #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) + #if defined(__INTEL_COMPILER) || defined(__PGI) LIBC=gnu #else LIBC=gnuaout @@ -1002,11 +977,7 @@ LIBC=dietlibc #endif EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^LIBC/{ - s: ::g - p - }'`" + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^LIBC/{s: ::g;p;}'`" test x"${LIBC}" != x && { echo "${UNAME_MACHINE}-pc-linux-${LIBC}" exit Modified: trunk/jazz/config/config.sub =================================================================== --- trunk/jazz/config/config.sub 2008-04-05 01:30:50 UTC (rev 393) +++ trunk/jazz/config/config.sub 2008-04-05 01:35:12 UTC (rev 394) @@ -1,10 +1,9 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -# Inc. +# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -timestamp='2006-09-20' +timestamp='2005-12-11' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -241,7 +240,7 @@ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ @@ -249,8 +248,7 @@ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore \ + | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -270,25 +268,26 @@ | mn10200 | mn10300 \ | mt \ | msp430 \ - | nios | nios2 \ | ns16k | ns32k \ | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | score \ - | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b \ | spu | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; + m32c) + basic_machine=$basic_machine-unknown + ;; m6811 | m68hc11 | m6812 | m68hc12) # Motorola 68HC11/12. basic_machine=$basic_machine-unknown @@ -318,7 +317,7 @@ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* | avr32-* \ + | avr-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | craynv-* | cydra-* \ @@ -329,7 +328,7 @@ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ - | m32c-* | m32r-* | m32rle-* \ + | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | maxq-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ @@ -351,28 +350,29 @@ | mmix-* \ | mt-* \ | msp430-* \ - | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ | xstormy16-* | xtensa-* \ | ymp-* \ | z8k-*) ;; + m32c-*) + ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) @@ -818,12 +818,6 @@ pc532 | pc532-*) basic_machine=ns32k-pc532 ;; - pc98) - basic_machine=i386-pc - ;; - pc98-*) - basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; @@ -910,10 +904,6 @@ sb1el) basic_machine=mipsisa64sb1el-unknown ;; - sde) - basic_machine=mipsisa32-sde - os=-elf - ;; sei) basic_machine=mips-sei os=-seiux @@ -1130,7 +1120,7 @@ sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) + sparc | sparcv8 | sparcv9 | sparcv9b) basic_machine=sparc-sun ;; cydra) @@ -1203,8 +1193,7 @@ | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -openbsd* | -solidbsd* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ @@ -1219,7 +1208,7 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers*) + | -skyos* | -haiku* | -rdos*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1371,12 +1360,9 @@ # system, and we'll never get to this point. case $basic_machine in - score-*) + spu-*) os=-elf ;; - spu-*) - os=-elf - ;; *-acorn) os=-riscix1.2 ;; @@ -1386,9 +1372,9 @@ arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff - ;; + c4x-* | tic4x-*) + os=-coff + ;; # This must come before the *-dec entry. pdp10-*) os=-tops20 Modified: trunk/jazz/config/ltmain.sh =================================================================== --- trunk/jazz/config/ltmain.sh 2008-04-05 01:30:50 UTC (rev 393) +++ trunk/jazz/config/ltmain.sh 2008-04-05 01:35:12 UTC (rev 394) @@ -1,8 +1,8 @@ # 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. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 +# Free Software Foundation, Inc. # Originally by Gordon Matzigkeit <go...@gn...>, 1996 # # This program is free software; you can redistribute it and/or modify @@ -33,6 +33,9 @@ # function. progpath="$0" +# define SED for historic ltconfig's generated by Libtool 1.3 +test -z "$SED" && SED=sed + # The name of this program: progname=`echo "$progpath" | $SED $basename` modename="$progname" @@ -43,8 +46,8 @@ PROGRAM=ltmain.sh PACKAGE=libtool -VERSION=1.5.24 -TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)" +VERSION=1.5.22 +TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)" # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -57,8 +60,6 @@ else case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac fi -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 @@ -116,10 +117,10 @@ for lt_var in LANG 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 - export $lt_var - fi" + save_$lt_var=\$$lt_var + $lt_var=C + export $lt_var + fi" done # Make sure IFS has a sensible default @@ -208,13 +209,7 @@ 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 - } - }'` + $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";; @@ -348,11 +343,11 @@ 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 + *" $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" @@ -416,8 +411,19 @@ ##################################### # Darwin sucks +#eval std_shrext=\"$shrext_cmds\" + +# And fixing for Darwin sucks for everybody else +if test -z "$shrext_cmds" && test -n "$shrext"; then + eval shrext_cmds=\"$shrext\" +fi + eval std_shrext=\"$shrext_cmds\" +# This value is evaluated to 32768, so place it here as a compatilibity hack +# because older libtool.m4 didn't define this variable +test -z "$max_cmd_len" && max_cmd_len=32768 + disable_libs=no # Parse our command line options once, thoroughly. @@ -482,12 +488,11 @@ ;; --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." + $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP" + $echo + $echo "Copyright (C) 2005 Free Software Foundation, Inc." + $echo "This is free software; see the source for copying conditions. There is NO" + $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." exit $? ;; @@ -784,7 +789,7 @@ *.class) xform=class ;; *.cpp) xform=cpp ;; *.cxx) xform=cxx ;; - *.[fF][09]?) xform=[fF][09]. ;; + *.f90) xform=f90 ;; *.for) xform=for ;; *.java) xform=java ;; *.obj) xform=obj ;; @@ -1169,8 +1174,8 @@ do case $arg in -all-static | -static | -static-libtool-libs) - case $arg in - -all-static) + case $arg in + -all-static) if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2 fi @@ -1179,19 +1184,19 @@ fi prefer_static_libs=yes ;; - -static) + -static) if test -z "$pic_flag" && test -n "$link_static_flag"; then dlopen_self=$dlopen_self_static fi prefer_static_libs=built ;; - -static-libtool-libs) - if test -z "$pic_flag" && test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - prefer_static_libs=yes - ;; - esac + -static-libtool-libs) + if test -z "$pic_flag" && test -n "$link_static_flag"; then + dlopen_self=$dlopen_self_static + fi + prefer_static_libs=yes + ;; + esac build_libtool_libs=no build_old_libs=yes break @@ -1639,7 +1644,7 @@ continue ;; - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) compiler_flags="$compiler_flags $arg" compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" @@ -1659,11 +1664,10 @@ # -m* pass through architecture-specific compiler args for GCC # -m*, -t[45]*, -txscale* pass through architecture-specific # compiler args for GCC - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC - # -F/path gives path to uninstalled frameworks, gcc on darwin + # -pg pass through profiling flag for GCC # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ + -t[45]*|-txscale*|@*) # Unknown arguments in both finalize_command and compile_command need # to be aesthetically quoted because they are evaled later. @@ -1691,9 +1695,9 @@ -no-install) case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) # The PATH hackery in wrapper scripts is required on Windows - # and Darwin in order for the loader to find any dlls it needs. + # in order for the loader to find any dlls it needs. $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2 $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2 fast_install=no @@ -2134,7 +2138,7 @@ lib= found=no case $deplib in - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) if test "$linkmode,$pass" = "prog,link"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" @@ -2530,9 +2534,9 @@ if test "$linkmode,$pass" = "prog,link"; then if test -n "$library_names" && - { { test "$prefer_static_libs" = no || - test "$prefer_static_libs,$installed" = "built,yes"; } || - test -z "$old_library"; }; then + { { test "$prefer_static_libs" = no || + test "$prefer_static_libs,$installed" = "built,yes"; } || + test -z "$old_library"; }; then # We need to hardcode the library path if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then # Make sure the rpath contains only unique directories. @@ -3239,10 +3243,9 @@ age="0" ;; irix|nonstopux) - current=`expr $number_major + $number_minor` + current=`expr $number_major + $number_minor - 1` age="$number_minor" revision="$number_minor" - lt_irix_increment=no ;; esac ;; @@ -3301,8 +3304,7 @@ versuffix="$major.$age.$revision" # Darwin ld doesn't like 0 for these options... minor_current=`expr $current + 1` - xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" - verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" + verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" ;; freebsd-aout) @@ -3316,11 +3318,8 @@ ;; irix | nonstopux) - if test "X$lt_irix_increment" = "Xno"; then - major=`expr $current - $age` - else - major=`expr $current - $age + 1` - fi + major=`expr $current - $age + 1` + case $version_type in nonstopux) verstring_prefix=nonstopux ;; *) verstring_prefix=sgi ;; @@ -3457,11 +3456,11 @@ fi # Eliminate all temporary directories. - #for path in $notinst_path; do - # lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"` - # deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"` - # dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"` - #done +# for path in $notinst_path; do +# lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"` +# deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"` +# dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"` +# done if test -n "$xrpath"; then # If the user specified any rpath flags, then add them. @@ -3562,7 +3561,7 @@ int main() { return 0; } EOF $rm conftest - if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then + if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then ldd_output=`ldd conftest` for i in $deplibs; do name=`expr $i : '-l\(.*\)'` @@ -3924,10 +3923,7 @@ test -n "$hardcode_libdirs"; then libdir="$hardcode_libdirs" if test -n "$hardcode_libdir_flag_spec_ld"; then - case $archive_cmds in - *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;; - *) eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;; - esac + eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" else eval dep_rpath=\"$hardcode_libdir_flag_spec\" fi @@ -4015,15 +4011,23 @@ fi tmp_deplibs= + inst_prefix_arg= for test_deplib in $deplibs; do case " $convenience " in *" $test_deplib "*) ;; *) - tmp_deplibs="$tmp_deplibs $test_deplib" + if test -n "$inst_prefix_dir" && (echo "$test_deplib" | grep -- "$inst_prefix_dir" >/dev/null); then + inst_prefix_arg="$inst_prefix_arg $test_deplib" + else + tmp_deplibs="$tmp_deplibs $test_deplib" + fi ;; esac done deplibs="$tmp_deplibs" + if test -n "$inst_prefix_arg"; then + deplibs="$inst_prefix_arg $deplibs" + fi if test -n "$convenience"; then if test -n "$whole_archive_flag_spec"; then @@ -4293,7 +4297,7 @@ if test -n "$convenience"; then if test -n "$whole_archive_flag_spec"; then eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" - reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'` + reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'` else gentop="$output_objdir/${obj}x" generated="$generated $gentop" @@ -5313,8 +5317,6 @@ else case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. @@ -6411,10 +6413,8 @@ if test -f "$dir/$objdir/$dlname"; then dir="$dir/$objdir" else - if test ! -f "$dir/$dlname"; then - $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 - exit $EXIT_FAILURE - fi + $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 + exit $EXIT_FAILURE fi ;; @@ -6480,11 +6480,14 @@ # Restore saved environment variables for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES do - eval "if test \"\${save_$lt_var+set}\" = set; then - $lt_var=\$save_$lt_var; export $lt_var - fi" + eval "if test \"\${save_$lt_var+set}\" = set; then + $lt_var=\$save_$lt_var; export $lt_var + else + $lt_unset $lt_var + fi" done + # Now prepare to actually exec the command. exec_cmd="\$cmd$args" else Modified: trunk/jazz/src/AlsaDriver.cpp =================================================================== --- trunk/jazz/src/AlsaDriver.cpp 2008-04-05 01:30:50 UTC (rev 393) +++ trunk/jazz/src/AlsaDriver.cpp 2008-04-05 01:35:12 UTC (rev 394) @@ -48,117 +48,123 @@ #define snd_pcm_write(pcm,data,size) snd_pcm_writei(pcm,data,size) #define snd_pcm_read(pcm,data,size) snd_pcm_readi(pcm,data,size) -#define MAX_FRAGS 16 // enough large? +#define MAX_FRAGS 16 // enough large? class tAlsaAudioListener : public wxTimer { public: - tAlsaAudioListener(tAlsaAudioPlayer *p, int key) - { - hard_exit = TRUE; - player = p; - player->listener = this; - player->rec_info = 0; // not recording! - player->running_mode = 0; - - // SYNC seems not to work?? so add 8 more silent buffers - // to hear the end of the sample too. - player->OpenDsp(tAlsaAudioPlayer::PLAYBACK, 0); - count = 8 + player->samples.PrepareListen(key); - Start(20); - } + tAlsaAudioListener(tAlsaAudioPlayer *p, int key) + { + hard_exit = TRUE; + player = p; + player->listener = this; + player->rec_info = 0; // not recording! + player->running_mode = 0; + + // SYNC seems not to work?? so add 8 more silent buffers + // to hear the end of the sample too. + player->OpenDsp(tAlsaAudioPlayer::PLAYBACK, 0); + count = 8 + player->samples.PrepareListen(key); + Start(20); + } - tAlsaAudioListener(tAlsaAudioPlayer *p, tSample &spl, long fr_smpl, long to_smpl) { - hard_exit = TRUE; - player = p; - player->listener = this; - player->rec_info = 0; // not recording! - player->running_mode = 0; + tAlsaAudioListener(tAlsaAudioPlayer *p, tSample &spl, long fr_smpl, long to_smpl) + { + hard_exit = TRUE; + player = p; + player->listener = this; + player->rec_info = 0; // not recording! + player->running_mode = 0; - player->OpenDsp(tAlsaAudioPlayer::PLAYBACK, 0); - player->samples.ResetBufferSize(player->frag_byte_size[tAlsaAudioPlayer::PLAYBACK]); - count = 8 + player->samples.PrepareListen(&spl, fr_smpl, to_smpl); - Start(20); - } + player->OpenDsp(tAlsaAudioPlayer::PLAYBACK, 0); + player->samples.ResetBufferSize(player->frag_byte_size[tAlsaAudioPlayer::PLAYBACK]); + count = 8 + player->samples.PrepareListen(&spl, fr_smpl, to_smpl); + Start(20); + } - ~tAlsaAudioListener() - { - Stop(); - player->CloseDsp(hard_exit); - player->listener = 0; - } + ~tAlsaAudioListener() + { + Stop(); + player->CloseDsp(hard_exit); + player->listener = 0; + } - virtual void Notify() - { - count -= player->WriteSamples(); - count += player->samples.ContinueListen(); - if (count <= 0) { - hard_exit = FALSE; - delete this; - } - } + virtual void Notify() + { + count -= player->WriteSamples(); + count += player->samples.ContinueListen(); + if (count <= 0) + { + hard_exit = FALSE; + delete this; + } + } - long GetPlayPosition() - { - return player->GetCurrentPosition(tAlsaAudioPlayer::PLAYBACK); - } + long GetPlayPosition() + { + return player->GetCurrentPosition(tAlsaAudioPlayer::PLAYBACK); + } -private: - tAlsaAudioPlayer *player; - int count; - int hard_exit; + private: + tAlsaAudioPlayer *player; + int count; + int hard_exit; }; tAlsaAudioPlayer::tAlsaAudioPlayer(JZSong *song) - : tAlsaPlayer(song) + : tAlsaPlayer(song) { - AudioBuffer = new tEventArray(); - installed = 0; - audio_enabled = 0; - listener = 0; - can_duplex = 0; // no duplex yet. - pcm[PLAYBACK] = NULL; - pcm[CAPTURE] = NULL; + AudioBuffer = new tEventArray(); + installed = 0; + audio_enabled = 0; + listener = 0; + can_duplex = 0; // no duplex yet. + pcm[PLAYBACK] = NULL; + pcm[CAPTURE] = NULL; - dev[PLAYBACK] = gpConfig->StrValue(C_AlsaAudioOutputDevice); - dev[CAPTURE] = gpConfig->StrValue(C_AlsaAudioInputDevice); - can_duplex = 1; /* FIXME */ - installed = 1; - audio_enabled = 1; + dev[PLAYBACK] = gpConfig->StrValue(C_AlsaAudioOutputDevice); + dev[CAPTURE] = gpConfig->StrValue(C_AlsaAudioInputDevice); + can_duplex = 1; /* FIXME */ + installed = 1; + audio_enabled = 1; } tAlsaAudioPlayer::~tAlsaAudioPlayer() { - delete listener; - delete AudioBuffer; - if (pcm[PLAYBACK]) { - snd_pcm_close(pcm[PLAYBACK]); - pcm[PLAYBACK] = NULL; - } - if (pcm[CAPTURE]) { - snd_pcm_close(pcm[CAPTURE]); - pcm[CAPTURE] = NULL; - } + cout << "Deleting ALSA audio driver start..." << endl; + delete listener; + delete AudioBuffer; + if (pcm[PLAYBACK]) + { + snd_pcm_close(pcm[PLAYBACK]); + pcm[PLAYBACK] = NULL; + } + if (pcm[CAPTURE]) + { + snd_pcm_close(pcm[CAPTURE]); + pcm[CAPTURE] = NULL; + } + cout << "Done." << endl; } int tAlsaAudioPlayer::LoadSamples(const char *filename) { - return samples.Load(filename); + return samples.Load(filename); } int tAlsaAudioPlayer::RecordMode() const { - return running_mode & (1 << CAPTURE); + return running_mode & (1 << CAPTURE); } int tAlsaAudioPlayer::PlayBackMode() const { - return running_mode & (1 << PLAYBACK); + return running_mode & (1 << PLAYBACK); } void tAlsaAudioPlayer::StartPlay(long clock, long loopClock, int cont) @@ -211,214 +217,240 @@ void tAlsaAudioPlayer::StartAudio() { - if (pcm[PLAYBACK]) - snd_pcm_start(pcm[PLAYBACK]); - if (pcm[CAPTURE]) - snd_pcm_start(pcm[CAPTURE]); + if (pcm[PLAYBACK]) + snd_pcm_start(pcm[PLAYBACK]); + if (pcm[CAPTURE]) + snd_pcm_start(pcm[CAPTURE]); } void tAlsaAudioPlayer::OpenDsp(int mode, int sync_mode) { - if (!audio_enabled) - return; + if (!audio_enabled) + return; - unsigned int channels; - snd_pcm_format_t format; - snd_pcm_uframes_t buffer_size, period_size; + unsigned int channels; + snd_pcm_format_t format; + snd_pcm_uframes_t buffer_size, period_size; - frame_shift[mode] = 0; - if (samples.BitsPerSample() == 8) - format = SND_PCM_FORMAT_U8; - else { - format = SND_PCM_FORMAT_S16_LE; - frame_shift[mode]++; - } - channels = samples.GetChannels(); - if (channels > 1) - frame_shift[mode]++; + frame_shift[mode] = 0; + if (samples.BitsPerSample() == 8) + format = SND_PCM_FORMAT_U8; + else { + format = SND_PCM_FORMAT_S16_LE; + frame_shift[mode]++; + } + channels = samples.GetChannels(); + if (channels > 1) + frame_shift[mode]++; - snd_pcm_stream_t stream = (mode == PLAYBACK) ? - SND_PCM_STREAM_PLAYBACK : SND_PCM_STREAM_CAPTURE; - if (snd_pcm_open(&pcm[mode], dev[mode], stream, SND_PCM_NONBLOCK) < 0) - { - perror("snd_pcm_open"); - audio_enabled = 0; - return; - } + snd_pcm_stream_t stream = (mode == PLAYBACK) ? + SND_PCM_STREAM_PLAYBACK : SND_PCM_STREAM_CAPTURE; + if (snd_pcm_open(&pcm[mode], dev[mode], stream, SND_PCM_NONBLOCK) < 0) + { + perror("snd_pcm_open"); + audio_enabled = 0; + return; + } - snd_pcm_hw_params_t *hw; - snd_pcm_hw_params_alloca(&hw); - snd_pcm_hw_params_any(pcm[mode], hw); - if (snd_pcm_hw_params_set_access(pcm[mode], hw, SND_PCM_ACCESS_RW_INTERLEAVED) < 0) { - perror("cannot set interleaved access"); - goto __error; - } - if (snd_pcm_hw_params_set_format(pcm[mode], hw, format) < 0) { - perror("cannot set audio format"); - goto __error; - } - if (snd_pcm_hw_params_set_channels(pcm[mode], hw, channels) < 0) { - perror("cannot set audio channels"); - goto __error; - } - if (snd_pcm_hw_params_set_rate(pcm[mode], hw, samples.GetSpeed(), 0) < 0) { - cerr << "cannot set audio rate: " << samples.GetSpeed() << endl; - goto __error; - } + snd_pcm_hw_params_t *hw; + snd_pcm_hw_params_alloca(&hw); + snd_pcm_hw_params_any(pcm[mode], hw); + if (snd_pcm_hw_params_set_access(pcm[mode], hw, SND_PCM_ACCESS_RW_INTERLEAVED) < 0) + { + perror("cannot set interleaved access"); + goto __error; + } + if (snd_pcm_hw_params_set_format(pcm[mode], hw, format) < 0) + { + perror("cannot set audio format"); + goto __error; + } + if (snd_pcm_hw_params_set_channels(pcm[mode], hw, channels) < 0) + { + perror("cannot set audio channels"); + goto __error; + } + if (snd_pcm_hw_params_set_rate(pcm[mode], hw, samples.GetSpeed(), 0) < 0) + { + cerr << "cannot set audio rate: " << samples.GetSpeed() << endl; + goto __error; + } - period_size = FRAGBYTES >> frame_shift[mode]; - if ((period_size = snd_pcm_hw_params_set_period_size_near(pcm[mode], hw, &period_size, 0)) < 0) { - perror("cannot set audio period"); - goto __error; - } - buffer_size = period_size * MAX_FRAGS; - if ((buffer_size = snd_pcm_hw_params_set_buffer_size_near(pcm[mode], hw, &buffer_size)) < 0) { - perror("cannot set audio buffer"); - goto __error; - } - if (snd_pcm_hw_params(pcm[mode], hw) < 0) { - perror("snd_pcm_hw_params"); - goto __error; - } + period_size = FRAGBYTES >> frame_shift[mode]; + if ((period_size = snd_pcm_hw_params_set_period_size_near(pcm[mode], hw, &period_size, 0)) < 0) + { + perror("cannot set audio period"); + goto __error; + } + buffer_size = period_size * MAX_FRAGS; + if ((buffer_size = snd_pcm_hw_params_set_buffer_size_near(pcm[mode], hw, &buffer_size)) < 0) + { + perror("cannot set audio buffer"); + goto __error; + } + if (snd_pcm_hw_params(pcm[mode], hw) < 0) + { + perror("snd_pcm_hw_params"); + goto __error; + } - frag_size[mode] = period_size; /* in frames */ - frag_byte_size[mode] = period_size << frame_shift[mode]; - frame_boundary[mode] = 0x7fffffff; + frag_size[mode] = period_size; /* in frames */ + frag_byte_size[mode] = period_size << frame_shift[mode]; + frame_boundary[mode] = 0x7fffffff; - snd_pcm_sw_params_t *sw; + snd_pcm_sw_params_t *sw; - snd_pcm_sw_params_alloca(&sw); - snd_pcm_sw_params_current(pcm[mode], sw); - if (sync_mode) - snd_pcm_sw_params_set_start_threshold(pcm[mode], sw, 0x7fffffff); /* FIXME */ - else - snd_pcm_sw_params_set_start_threshold(pcm[mode], sw, 1); - if (snd_pcm_sw_params(pcm[mode], sw) < 0) { - perror("snd_pcm_sw_params"); - goto __error; - } + snd_pcm_sw_params_alloca(&sw); + snd_pcm_sw_params_current(pcm[mode], sw); + if (sync_mode) + snd_pcm_sw_params_set_start_threshold(pcm[mode], sw, 0x7fffffff); /* FIXME */ + else + snd_pcm_sw_params_set_start_threshold(pcm[mode], sw, 1); + if (snd_pcm_sw_params(pcm[mode], sw) < 0) + { + perror("snd_pcm_sw_params"); + goto __error; + } - running_mode |= (1 << mode); + running_mode |= (1 << mode); - return; + return; __error: - snd_pcm_close(pcm[mode]); - pcm[mode] = NULL; - audio_enabled = 0; - return; + snd_pcm_close(pcm[mode]); + pcm[mode] = NULL; + audio_enabled = 0; + return; } void tAlsaAudioPlayer::CloseDsp(int reset) { - if (pcm) { - if (reset) { - if (pcm[PLAYBACK]) { - if (snd_pcm_drop(pcm[PLAYBACK]) < 0) - perror("playback drop"); - } - } else { - if (pcm[PLAYBACK]) { - if (snd_pcm_drain(pcm[PLAYBACK]) < 0 ) - perror("playback drain"); - } - if (pcm[CAPTURE]) { - if (snd_pcm_drain(pcm[CAPTURE]) < 0 ) - perror("capture drain"); - } - } - if (pcm[PLAYBACK]) { - snd_pcm_close(pcm[PLAYBACK]); - pcm[PLAYBACK] = NULL; - } - if (pcm[CAPTURE]) { - snd_pcm_close(pcm[CAPTURE]); - pcm[CAPTURE] = NULL; - } - } + if (pcm) + { + if (reset) + { + if (pcm[PLAYBACK]) + { + if (snd_pcm_drop(pcm[PLAYBACK]) < 0) + perror("playback drop"); + } + } + else + { + if (pcm[PLAYBACK]) + { + if (snd_pcm_drain(pcm[PLAYBACK]) < 0 ) + perror("playback drain"); + } + if (pcm[CAPTURE]) + { + if (snd_pcm_drain(pcm[CAPTURE]) < 0 ) + perror("capture drain"); + } + } + if (pcm[PLAYBACK]) + { + snd_pcm_close(pcm[PLAYBACK]); + pcm[PLAYBACK] = NULL; + } + if (pcm[CAPTURE]) + { + snd_pcm_close(pcm[CAPTURE]); + pcm[CAPTURE] = NULL; + } + } } void tAlsaAudioPlayer::Notify() { - if (audio_enabled) { - if (pcm[PLAYBACK]) { - WriteSamples(); - // here it may hang when swapping in pages - samples.FillBuffers(OutClock); - WriteSamples(); - } - if (pcm[CAPTURE]) - ReadSamples(); + if (audio_enabled) + { + if (pcm[PLAYBACK]) + { + WriteSamples(); + // here it may hang when swapping in pages + samples.FillBuffers(OutClock); + WriteSamples(); + } + if (pcm[CAPTURE]) + ReadSamples(); - if (pcm[PLAYBACK] && samples.softsync) - MidiSync(); - } - tAlsaPlayer::Notify(); + if (pcm[PLAYBACK] && samples.softsync) + MidiSync(); + } + tAlsaPlayer::Notify(); } // number of frames (or bytes) free int tAlsaAudioPlayer::GetFreeSpace(int mode) { - snd_pcm_status_t *info; - snd_pcm_status_alloca(&info); - if (snd_pcm_status(pcm[mode], info) < 0) { - perror("snd_pcm_status"); - return 0; - } - return snd_pcm_status_get_avail(info); /* in frames */ + snd_pcm_status_t *info; + snd_pcm_status_alloca(&info); + if (snd_pcm_status(pcm[mode], info) < 0) + { + perror("snd_pcm_status"); + return 0; + } + return snd_pcm_status_get_avail(info); /* in frames */ } int tAlsaAudioPlayer::WriteSamples() { - if (!audio_enabled || pcm[PLAYBACK] == NULL) - return 0; + if (!audio_enabled || pcm[PLAYBACK] == NULL) + return 0; - int blocks_written = 0; - int room; + int blocks_written = 0; + int room; - room = GetFreeSpace(PLAYBACK); + room = GetFreeSpace(PLAYBACK); - for (; room > frag_size[PLAYBACK]; room -= frag_size[PLAYBACK]) { - tAudioBuffer *buf = samples.full_buffers.Get(); - if (buf == 0) - break; - ssize_t written = snd_pcm_writei(pcm[PLAYBACK], buf->Data(), frag_size[PLAYBACK]); - if (written < 0) { - if (written == -EPIPE) { - cerr << "xrun!!" << endl; - snd_pcm_prepare(pcm[PLAYBACK]); - } else { - perror("audio write"); - } - } - if (written > 0) - cur_scount += written; - blocks_written++; - samples.free_buffers.Put(buf); - } + for (; room > frag_size[PLAYBACK]; room -= frag_size[PLAYBACK]) + { + tAudioBuffer *buf = samples.full_buffers.Get(); + if (buf == 0) + break; + ssize_t written = snd_pcm_writei(pcm[PLAYBACK], buf->Data(), frag_size[PLAYBACK]); + if (written < 0) { + if (written == -EPIPE) + { + cerr << "xrun!!" << endl; + snd_pcm_prepare(pcm[PLAYBACK]); + } + else + { + perror("audio write"); + } + } + if (written > 0) + cur_scount += written; + blocks_written++; + samples.free_buffers.Put(buf); + } - return blocks_written; + return blocks_written; } void tAlsaAudioPlayer::ReadSamples() { - if (!audio_enabled || pcm[CAPTURE] == NULL) - return; + if (!audio_enabled || pcm[CAPTURE] == NULL) + return; - int room = GetFreeSpace(CAPTURE); + int room = GetFreeSpace(CAPTURE); - for (; room > frag_size[CAPTURE]; room -= frag_size[CAPTURE]) { - short *b = recbuffers.RequestBuffer()->data; - if (snd_pcm_read(pcm[CAPTURE], b, frag_size[CAPTURE]) != - frag_size[CAPTURE]) { - recbuffers.UndoRequest(); - break; - } - } + for (; room > frag_size[CAPTURE]; room -= frag_size[CAPTURE]) + { + short *b = recbuffers.RequestBuffer()->data; + if (snd_pcm_read(pcm[CAPTURE], b, frag_size[CAPTURE]) != + frag_size[CAPTURE]) + { + recbuffers.UndoRequest(); + break; + } + } } @@ -437,71 +469,74 @@ long tAlsaAudioPlayer::GetCurrentPosition(int mode) { - return cur_scount; + return cur_scount; } void tAlsaAudioPlayer::MidiSync() { - if (!audio_enabled) - return; + if (!audio_enabled) + return; - int mode; - if (pcm[PLAYBACK]) - mode = PLAYBACK; - else if (pcm[CAPTURE]) - mode = CAPTURE; - else - return; // disabled + int mode; + if (pcm[PLAYBACK]) + mode = PLAYBACK; + else if (pcm[CAPTURE]) + mode = CAPTURE; + else + return; // disabled - long scount = GetCurrentPosition(mode); + long scount = GetCurrentPosition(mode); - // get realtime info for audio/midi sync - if (scount != last_scount) { - unsigned int qtick; - snd_seq_queue_status_t *status; - snd_seq_queue_status_alloca(&status); - if (snd_seq_get_queue_status(handle, queue, status) < 0) { - perror("snd_seq_get_queue_status"); - return; - } - qtick = snd_seq_queue_status_get_tick_time(status); - int samplediff; - if (scount < last_scount) - samplediff = frame_boundary[mode] - (last_scount - scount); - else - samplediff = scount - last_scount; - last_scount = scount; - cur_pos += samplediff; - long audio_clock = (long)samples.Samples2Ticks(cur_pos) + audio_clock_offset; - int delta_clock = audio_clock - qtick; - int new_speed = midi_speed + delta_clock; + // get realtime info for audio/midi sync + if (scount != last_scount) + { + unsigned int qtick; + snd_seq_queue_status_t *status; + snd_seq_queue_status_alloca(&status); + if (snd_seq_get_queue_status(handle, queue, status) < 0) + { + perror("snd_seq_get_queue_status"); + return; + } + qtick = snd_seq_queue_status_get_tick_time(status); + int samplediff; + if (scount < last_scount) + samplediff = frame_boundary[mode] - (last_scount - scount); + else + samplediff = scount - last_scount; + last_scount = scount; + cur_pos += samplediff; + long audio_clock = (long)samples.Samples2Ticks(cur_pos) + audio_clock_offset; + int delta_clock = audio_clock - qtick; + int new_speed = midi_speed + delta_clock; - // limit speed changes to some reasonable values - const int limit = 1; - if (new_speed > midi_speed + limit) - { - new_speed = midi_speed + limit; - } - if (midi_speed - limit > new_speed) - { - new_speed = midi_speed - limit; - } + // limit speed changes to some reasonable values + const int limit = 1; + if (new_speed > midi_speed + limit) + { + new_speed = midi_speed + limit; + } + if (midi_speed - limit > new_speed) + { + new_speed = midi_speed - limit; + } - if (new_speed != curr_speed) { - snd_seq_event_t ev; - memset(&ev, 0, sizeof(ev)); - snd_seq_ev_set_source(&ev, self.port); - snd_seq_ev_set_subs(&ev); - snd_seq_ev_set_direct(&ev); - snd_seq_ev_set_fixed(&ev); - int us = (int)( 60.0E6 / (double)new_speed ); - snd_seq_ev_set_queue_tempo(&ev, queue, us); - write(&ev, 1); - curr_speed = new_speed; - // xview has reentrancy problems!! - // gpTrackWindow->DrawSpeed(curr_speed); - } - } + if (new_speed != curr_speed) + { + snd_seq_event_t ev; + memset(&ev, 0, sizeof(ev)); + snd_seq_ev_set_source(&ev, self.port); + snd_seq_ev_set_subs(&ev); + snd_seq_ev_set_direct(&ev); + snd_seq_ev_set_fixed(&ev); + int us = (int)( 60.0E6 / (double)new_speed ); + snd_seq_ev_set_queue_tempo(&ev, queue, us); + write(&ev, 1); + curr_speed = new_speed; + // xview has reentrancy problems!! + // gpTrackWindow->DrawSpeed(curr_speed); + } + } } void tAlsaAudioPlayer::StopPlay() @@ -533,46 +568,46 @@ // gpTrackWindow->DrawSpeed(midi_speed); } - - void tAlsaAudioPlayer::ListenAudio(int key, int start_stop_mode) { - if (!audio_enabled) - return; + if (!audio_enabled) + return; - // when already listening then stop listening - if (listener) { - delete listener; - listener = 0; - if (start_stop_mode) - return; - } - if (key < 0) - return; + // when already listening then stop listening + if (listener) + { + delete listener; + listener = 0; + if (start_stop_mode) + return; + } + if (key < 0) + return; - if (pcm[PLAYBACK]) // device busy (playing) - return; - listener = new tAlsaAudioListener(this, key); + if (pcm[PLAYBACK]) // device busy (playing) + return; + listener = new tAlsaAudioListener(this, key); } void tAlsaAudioPlayer::ListenAudio(tSample &spl, long fr_smpl, long to_smpl) { - if (!audio_enabled) - return; + if (!audio_enabled) + return; - // when already listening then stop listening - if (listener) { - delete listener; - listener = 0; - } - if (pcm[PLAYBACK]) // device busy (playing) - return; - listener = new tAlsaAudioListener(this, spl, fr_smpl, to_smpl); + // when already listening then stop listening + if (listener) + { + delete listener; + listener = 0; + } + if (pcm[PLAYBACK]) // device busy (playing) + return; + listener = new tAlsaAudioListener(this, spl, fr_smpl, to_smpl); } long tAlsaAudioPlayer::GetListenerPlayPosition() { - if (!listener) - return -1L; - return listener->GetPlayPosition(); + if (!listener) + return -1L; + return listener->GetPlayPosition(); } Modified: trunk/jazz/src/JazzPlusPlusApplication.cpp =================================================================== --- trunk/jazz/src/JazzPlusPlusApplication.cpp 2008-04-05 01:30:50 UTC (rev 393) +++ trunk/jazz/src/JazzPlusPlusApplication.cpp 2008-04-05 01:35:12 UTC (rev 394) @@ -47,6 +47,10 @@ #endif +#include <iostream> + +using namespace std; + //***************************************************************************** // Description: // This is the JazzPlusPlus application class definition. @@ -104,6 +108,7 @@ //----------------------------------------------------------------------------- JZJazzPlusPlusApplication::~JZJazzPlusPlusApplication() { + cout << "In the application desstructor" << endl; } //----------------------------------------------------------------------------- @@ -167,6 +172,7 @@ // Prevent reported leaks from the configuration class. delete wxConfigBase::Set(0); + cout << "Done in OnExit" << endl; return 0; } Modified: trunk/jazz/src/Project.cpp =================================================================== --- trunk/jazz/src/Project.cpp 2008-04-05 01:30:50 UTC (rev 393) +++ trunk/jazz/src/Project.cpp 2008-04-05 01:35:12 UTC (rev 394) @@ -325,6 +325,7 @@ delete mpSynth; delete mpRecInfo; delete mpConfig; + cout << "Done Deleting the project." << endl; } //----------------------------------------------------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pst...@us...> - 2008-04-06 22:54:06
|
Revision: 429 http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=429&view=rev Author: pstieber Date: 2008-04-06 15:54:03 -0700 (Sun, 06 Apr 2008) Log Message: ----------- Moved the synthesizer dialog under the Dialogs directory and adjusted the builds accordingly. Modified Paths: -------------- trunk/jazz/src/Makefile.am trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj Added Paths: ----------- trunk/jazz/src/Dialogs/SynthesizerSettingsDialog.cpp trunk/jazz/src/Dialogs/SynthesizerSettingsDialog.h Removed Paths: ------------- trunk/jazz/src/SynthesizerSettingsDialog.cpp trunk/jazz/src/SynthesizerSettingsDialog.h Copied: trunk/jazz/src/Dialogs/SynthesizerSettingsDialog.cpp (from rev 427, trunk/jazz/src/SynthesizerSettingsDialog.cpp) =================================================================== --- trunk/jazz/src/Dialogs/SynthesizerSettingsDialog.cpp (rev 0) +++ trunk/jazz/src/Dialogs/SynthesizerSettingsDialog.cpp 2008-04-06 22:54:03 UTC (rev 429) @@ -0,0 +1,166 @@ +//***************************************************************************** +// The JAZZ++ Midi Sequencer +// +// Copyright (C) 2008 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 "WxWidgets.h" + +#include "SynthesizerSettingsDialog.h" +#include "../Configuration.h" +#include "../Globals.h" + +using namespace std; + +//***************************************************************************** +//***************************************************************************** +//----------------------------------------------------------------------------- +//----------------------------------------------------------------------------- +BEGIN_EVENT_TABLE(JZSynthesizerDialog, wxDialog) + + EVT_BUTTON(wxID_HELP, JZSynthesizerDialog::OnHelp) + +END_EVENT_TABLE() + +//----------------------------------------------------------------------------- +//----------------------------------------------------------------------------- +JZSynthesizerDialog::JZSynthesizerDialog(wxWindow* pParent) + : wxDialog(pParent, wxID_ANY, wxString("Synthesizer Settings")), + mpSynthesizerListbox(0), + mpStartListbox(0) +{ + mpSynthesizerListbox = new wxListBox(this, wxID_ANY); + + for ( + vector<pair<string, int> >::const_iterator iPair = + gSynthesizerTypes.begin(); + iPair != gSynthesizerTypes.end(); + ++iPair) + { + mpSynthesizerListbox->Append(iPair->first.c_str()); + } + + mpStartListbox = new wxListBox(this, wxID_ANY); + + mpStartListbox->Append("Never"); + mpStartListbox->Append("Song Start"); + mpStartListbox->Append("Start Play"); + + 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); + wxBoxSizer* pListControlSizer = new wxBoxSizer(wxHORIZONTAL); + wxBoxSizer* pButtonSizer = new wxBoxSizer(wxHORIZONTAL); + + wxBoxSizer* pLeftSizer = new wxBoxSizer(wxVERTICAL); + wxBoxSizer* pRightSizer = new wxBoxSizer(wxVERTICAL); + + pLeftSizer->Add( + new wxStaticText(this, wxID_ANY, "Synthesizer Type"), + 0, + wxALL, + 2); + pLeftSizer->Add(mpSynthesizerListbox, 0, wxGROW | wxALL, 2); + + pRightSizer->Add( + new wxStaticText(this, wxID_ANY, "Send MIDI Reset"), + 0, + wxALL, + 2); + pRightSizer->Add(mpStartListbox, 0, wxALL, 2); + + pListControlSizer->Add(pLeftSizer, 0, wxALL, 3); + pListControlSizer->Add(pRightSizer, 0, wxALL, 3); + + pTopSizer->Add(pListControlSizer, 0, wxCENTER); + + 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 JZSynthesizerDialog::TransferDataToWindow() +{ + int Selection(0), Index(0); + for ( + vector<pair<string, int> >::const_iterator iPair = + gSynthesizerTypes.begin(); + iPair != gSynthesizerTypes.end(); + ++iPair, ++Index) + { + if (strcmp(iPair->first.c_str(), gpConfig->StrValue(C_SynthType)) == 0) + { + mOldSynthTypeName = iPair->first; + Selection = Index; + } + } + mpSynthesizerListbox->SetSelection(Selection); + + mpStartListbox->SetSelection(gpConfig->GetValue(C_SendSynthReset)); + + return true; +} + +//----------------------------------------------------------------------------- +//----------------------------------------------------------------------------- +bool JZSynthesizerDialog::TransferDataFromWindow() +{ + string SynthTypeName(mOldSynthTypeName); + wxString SelectionString = mpSynthesizerListbox->GetStringSelection(); + if (!SelectionString.empty()) + { + SynthTypeName = SelectionString; + } + + int Selection = mpStartListbox->GetSelection(); + if (Selection != wxNOT_FOUND) + { + gpConfig->Put(C_SendSynthReset, Selection); + } + + if (mOldSynthTypeName != SynthTypeName) + { + gpConfig->Put(C_SynthType, SynthTypeName.c_str()); + + ::wxMessageBox( + "Restart jazz for the synthesizer type change to take effect", + "Info", + wxOK); + } + + return true; +} + +//----------------------------------------------------------------------------- +//----------------------------------------------------------------------------- +void JZSynthesizerDialog::OnHelp(wxCommandEvent& Event) +{ +// gpHelpInstance->ShowTopic("Synthesizer Type Settings"); +} Copied: trunk/jazz/src/Dialogs/SynthesizerSettingsDialog.h (from rev 427, trunk/jazz/src/SynthesizerSettingsDialog.h) =================================================================== --- trunk/jazz/src/Dialogs/SynthesizerSettingsDialog.h (rev 0) +++ trunk/jazz/src/Dialogs/SynthesizerSettingsDialog.h 2008-04-06 22:54:03 UTC (rev 429) @@ -0,0 +1,53 @@ +//***************************************************************************** +// The JAZZ++ Midi Sequencer +// +// Copyright (C) 2008 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_SYNTHESIZERSETTINGDIALOG_H +#define JZ_SYNTHESIZERSETTINGDIALOG_H + +#include <string> + +//***************************************************************************** +//***************************************************************************** +class JZSynthesizerDialog : public wxDialog +{ + public: + + JZSynthesizerDialog(wxWindow* pParent); + + private: + + virtual bool TransferDataToWindow(); + + virtual bool TransferDataFromWindow(); + + void OnHelp(wxCommandEvent& Event); + + private: + + std::string mOldSynthTypeName; + + wxListBox* mpSynthesizerListbox; + + wxListBox* mpStartListbox; + + DECLARE_EVENT_TABLE(); +}; + +#endif // !defined(JZ_SYNTHESIZERSETTINGDIALOG_H) Modified: trunk/jazz/src/Makefile.am =================================================================== --- trunk/jazz/src/Makefile.am 2008-04-06 22:49:11 UTC (rev 428) +++ trunk/jazz/src/Makefile.am 2008-04-06 22:54:03 UTC (rev 429) @@ -19,6 +19,7 @@ DeprecatedWx/propform.cpp \ DeprecatedWx/proplist.cpp \ Dialogs/MetronomeSettingsDialog.cpp \ +Dialogs/SynthesizerSettingsDialog.cpp \ Dialogs.cpp \ DynamicArray.cpp \ ErrorMessage.cpp \ @@ -71,7 +72,6 @@ StandardFile.cpp \ StringReadWrite.cpp \ Synth.cpp \ -SynthesizerSettingsDialog.cpp \ ToolBar.cpp \ Track.cpp \ TrackFrame.cpp \ @@ -94,6 +94,7 @@ DeprecatedWx/proplist.h \ DeprecatedStringUtils.h \ Dialogs/MetronomeSettingsDialog.cpp \ +Dialogs/SynthesizerSettingsDialog.h \ Dialogs.h \ DynamicArray.h \ ErrorMessage.h \ @@ -148,7 +149,6 @@ StandardFile.h \ StringReadWrite.h \ Synth.h \ -SynthesizerSettingsDialog.h \ ToolBar.h \ TrackFrame.h \ Track.h \ Deleted: trunk/jazz/src/SynthesizerSettingsDialog.cpp =================================================================== --- trunk/jazz/src/SynthesizerSettingsDialog.cpp 2008-04-06 22:49:11 UTC (rev 428) +++ trunk/jazz/src/SynthesizerSettingsDialog.cpp 2008-04-06 22:54:03 UTC (rev 429) @@ -1,166 +0,0 @@ -//***************************************************************************** -// The JAZZ++ Midi Sequencer -// -// Copyright (C) 2008 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 "WxWidgets.h" - -#include "SynthesizerSettingsDialog.h" -#include "Configuration.h" -#include "Globals.h" - -using namespace std; - -//***************************************************************************** -//***************************************************************************** -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(JZSynthesizerDialog, wxDialog) - - EVT_BUTTON(wxID_HELP, JZSynthesizerDialog::OnHelp) - -END_EVENT_TABLE() - -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -JZSynthesizerDialog::JZSynthesizerDialog(wxWindow* pParent) - : wxDialog(pParent, wxID_ANY, wxString("Synthesizer Settings")), - mpSynthesizerListbox(0), - mpStartListbox(0) -{ - mpSynthesizerListbox = new wxListBox(this, wxID_ANY); - - for ( - vector<pair<string, int> >::const_iterator iPair = - gSynthesizerTypes.begin(); - iPair != gSynthesizerTypes.end(); - ++iPair) - { - mpSynthesizerListbox->Append(iPair->first.c_str()); - } - - mpStartListbox = new wxListBox(this, wxID_ANY); - - mpStartListbox->Append("Never"); - mpStartListbox->Append("Song Start"); - mpStartListbox->Append("Start Play"); - - 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); - wxBoxSizer* pListControlSizer = new wxBoxSizer(wxHORIZONTAL); - wxBoxSizer* pButtonSizer = new wxBoxSizer(wxHORIZONTAL); - - wxBoxSizer* pLeftSizer = new wxBoxSizer(wxVERTICAL); - wxBoxSizer* pRightSizer = new wxBoxSizer(wxVERTICAL); - - pLeftSizer->Add( - new wxStaticText(this, wxID_ANY, "Synthesizer Type"), - 0, - wxALL, - 2); - pLeftSizer->Add(mpSynthesizerListbox, 0, wxGROW | wxALL, 2); - - pRightSizer->Add( - new wxStaticText(this, wxID_ANY, "Send MIDI Reset"), - 0, - wxALL, - 2); - pRightSizer->Add(mpStartListbox, 0, wxALL, 2); - - pListControlSizer->Add(pLeftSizer, 0, wxALL, 3); - pListControlSizer->Add(pRightSizer, 0, wxALL, 3); - - pTopSizer->Add(pListControlSizer, 0, wxCENTER); - - 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 JZSynthesizerDialog::TransferDataToWindow() -{ - int Selection(0), Index(0); - for ( - vector<pair<string, int> >::const_iterator iPair = - gSynthesizerTypes.begin(); - iPair != gSynthesizerTypes.end(); - ++iPair, ++Index) - { - if (strcmp(iPair->first.c_str(), gpConfig->StrValue(C_SynthType)) == 0) - { - mOldSynthTypeName = iPair->first; - Selection = Index; - } - } - mpSynthesizerListbox->SetSelection(Selection); - - mpStartListbox->SetSelection(gpConfig->GetValue(C_SendSynthReset)); - - return true; -} - -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -bool JZSynthesizerDialog::TransferDataFromWindow() -{ - string SynthTypeName(mOldSynthTypeName); - wxString SelectionString = mpSynthesizerListbox->GetStringSelection(); - if (!SelectionString.empty()) - { - SynthTypeName = SelectionString; - } - - int Selection = mpStartListbox->GetSelection(); - if (Selection != wxNOT_FOUND) - { - gpConfig->Put(C_SendSynthReset, Selection); - } - - if (mOldSynthTypeName != SynthTypeName) - { - gpConfig->Put(C_SynthType, SynthTypeName.c_str()); - - ::wxMessageBox( - "Restart jazz for the synthesizer type change to take effect", - "Info", - wxOK); - } - - return true; -} - -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -void JZSynthesizerDialog::OnHelp(wxCommandEvent& Event) -{ -// gpHelpInstance->ShowTopic("Synthesizer Type Settings"); -} Deleted: trunk/jazz/src/SynthesizerSettingsDialog.h =================================================================== --- trunk/jazz/src/SynthesizerSettingsDialog.h 2008-04-06 22:49:11 UTC (rev 428) +++ trunk/jazz/src/SynthesizerSettingsDialog.h 2008-04-06 22:54:03 UTC (rev 429) @@ -1,53 +0,0 @@ -//***************************************************************************** -// The JAZZ++ Midi Sequencer -// -// Copyright (C) 2008 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_SYNTHESIZERSETTINGDIALOG_H -#define JZ_SYNTHESIZERSETTINGDIALOG_H - -#include <string> - -//***************************************************************************** -//***************************************************************************** -class JZSynthesizerDialog : public wxDialog -{ - public: - - JZSynthesizerDialog(wxWindow* pParent); - - private: - - virtual bool TransferDataToWindow(); - - virtual bool TransferDataFromWindow(); - - void OnHelp(wxCommandEvent& Event); - - private: - - std::string mOldSynthTypeName; - - wxListBox* mpSynthesizerListbox; - - wxListBox* mpStartListbox; - - DECLARE_EVENT_TABLE(); -}; - -#endif // !defined(JZ_SYNTHESIZERSETTINGDIALOG_H) Modified: trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj =================================================================== --- trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj 2008-04-06 22:49:11 UTC (rev 428) +++ trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj 2008-04-06 22:54:03 UTC (rev 429) @@ -733,14 +733,6 @@ > </File> <File - RelativePath="..\src\SynthesizerSettingsDialog.cpp" - > - </File> - <File - RelativePath="..\src\SynthesizerSettingsDialog.h" - > - </File> - <File RelativePath="..\src\ToolBar.cpp" > </File> @@ -829,6 +821,14 @@ RelativePath="..\src\Dialogs\MetronomeSettingsDialog.h" > </File> + <File + RelativePath="..\src\Dialogs\SynthesizerSettingsDialog.cpp" + > + </File> + <File + RelativePath="..\src\Dialogs\SynthesizerSettingsDialog.h" + > + </File> </Filter> </Files> <Globals> Modified: trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj =================================================================== --- trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2008-04-06 22:49:11 UTC (rev 428) +++ trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2008-04-06 22:54:03 UTC (rev 429) @@ -732,14 +732,6 @@ > </File> <File - RelativePath="..\src\SynthesizerSettingsDialog.cpp" - > - </File> - <File - RelativePath="..\src\SynthesizerSettingsDialog.h" - > - </File> - <File RelativePath="..\src\ToolBar.cpp" > </File> @@ -828,6 +820,14 @@ RelativePath="..\src\Dialogs\MetronomeSettingsDialog.h" > </File> + <File + RelativePath="..\src\Dialogs\SynthesizerSettingsDialog.cpp" + > + </File> + <File + RelativePath="..\src\Dialogs\SynthesizerSettingsDialog.h" + > + </File> </Filter> </Files> <Globals> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pst...@us...> - 2008-04-06 23:58:34
|
Revision: 431 http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=431&view=rev Author: pstieber Date: 2008-04-06 16:58:31 -0700 (Sun, 06 Apr 2008) Log Message: ----------- Removed white space from the ends of lines. Modified Paths: -------------- trunk/jazz/contrib/CakeWalk-Converter/jazzconvert.cpp trunk/jazz/doc/jazz.tex trunk/jazz/midinetd/main.c trunk/jazz/midinetd/reader.c trunk/jazz/src/AboutDialog.cpp trunk/jazz/src/AlsaPlayer.h trunk/jazz/src/AlsaThru.cpp trunk/jazz/src/Audio.h trunk/jazz/src/ClockDialog.cpp trunk/jazz/src/Command.cpp trunk/jazz/src/Configuration.cpp trunk/jazz/src/ControlEdit.cpp trunk/jazz/src/DeprecatedWx/proplist.cpp trunk/jazz/src/Dialogs.h trunk/jazz/src/EventWindow.cpp trunk/jazz/src/EventWindow.h trunk/jazz/src/Events.h trunk/jazz/src/FileSelector.cpp trunk/jazz/src/FindFile.cpp trunk/jazz/src/FindFile.h trunk/jazz/src/Harmony.cpp trunk/jazz/src/Harmony.h trunk/jazz/src/KeyDialog.cpp trunk/jazz/src/MouseAction.cpp trunk/jazz/src/PianoFrame.cpp trunk/jazz/src/PianoWindow.cpp trunk/jazz/src/Player.cpp trunk/jazz/src/Player.h trunk/jazz/src/Project.cpp trunk/jazz/src/PropertyListDialog.h trunk/jazz/src/ResourceDialog.cpp trunk/jazz/src/Sample.cpp trunk/jazz/src/SampleDialog.cpp trunk/jazz/src/SliderWindow.cpp trunk/jazz/src/Song.cpp trunk/jazz/src/Track.cpp trunk/jazz/src/TrackWindow.cpp Modified: trunk/jazz/contrib/CakeWalk-Converter/jazzconvert.cpp =================================================================== --- trunk/jazz/contrib/CakeWalk-Converter/jazzconvert.cpp 2008-04-06 23:00:36 UTC (rev 430) +++ trunk/jazz/contrib/CakeWalk-Converter/jazzconvert.cpp 2008-04-06 23:58:31 UTC (rev 431) @@ -7,7 +7,7 @@ #define FALSE 0 #define TRUE 1 -enum sections +enum sections { none, patchNames, @@ -16,7 +16,7 @@ instrumentDefinitions }; -void trimend(char *t) +void trimend(char *t) { char *x = t + strlen(t) - 1; @@ -27,7 +27,7 @@ } } -int countPatches(char *fname) +int countPatches(char *fname) { FILE *f = fopen(fname, "r"); @@ -38,11 +38,11 @@ bzero(t, 80); fgets(t, 79, f); trimend(t); - while (!feof(f)) + while (!feof(f)) { - if (strncmp(t, ".Patch Names", 12) == 0) + if (strncmp(t, ".Patch Names", 12) == 0) patches = TRUE; - else if (t[0] == '.') + else if (t[0] == '.') patches = FALSE; else if (patches && isdigit(t[0])) ret++; @@ -54,9 +54,9 @@ return ret; } -int main(int argc, char *argv[]) +int main(int argc, char *argv[]) { - if (argc != 2) + if (argc != 2) { cerr << "Usage: " << argv[0] << " cakewalkfile.ins\n"; exit(-1); @@ -76,26 +76,26 @@ int numpatches = countPatches(argv[1]); fgets(t, 255, inf); trimend(t); - while (!feof(inf)) + while (!feof(inf)) { - if (t[0] == ';') + if (t[0] == ';') { // Comment line, change first character only t[0] = '#'; fprintf(outf, "%s\n", t); } - else if (strlen(t) == 1) + else if (strlen(t) == 1) { // Blank line, don't change at all fprintf(outf, "\n"); - } + } else if (t[0] == '[') { switch (currentSection) { case (patchNames): // New bank - if (b_programs != 0) + if (b_programs != 0) { - cout << "\no Processed " << b_programs + cout << "\no Processed " << b_programs << " programs.\n\n"; } cout << "o Reading bank " << t << " (#" << ++bank @@ -106,15 +106,15 @@ break; } } - else if (strncmp(t, ".Patch Names", 12) == 0) + else if (strncmp(t, ".Patch Names", 12) == 0) { // Patch names directive - fprintf(outf, ".max_voice_names %d\n", + fprintf(outf, ".max_voice_names %d\n", numpatches); fprintf(outf, ".voicenames\n"); currentSection = patchNames; } else if (strncmp(t, ".Note Names", 11) == 0) - { // Note names section + { // Note names section fprintf(outf, ".drumnames\n"); currentSection = noteNames; @@ -134,16 +134,16 @@ char *tok; int patchnum, controllernumber, notenum; - switch (currentSection) + switch (currentSection) { case (patchNames): tok = strtok(t, "=\n"); patchnum = atoi(tok); tok = strtok(NULL, "=\n"); fprintf(outf, "%d %s %d %s\n", - (bank * 256 + patchnum), + (bank * 256 + patchnum), bankname, patchnum, tok); - printf("o \t%d %s\n", patchnum, tok); + printf("o \t%d %s\n", patchnum, tok); b_programs++; t_programs++; break; case (controllerNames): Modified: trunk/jazz/doc/jazz.tex =================================================================== --- trunk/jazz/doc/jazz.tex 2008-04-06 23:00:36 UTC (rev 430) +++ trunk/jazz/doc/jazz.tex 2008-04-06 23:58:31 UTC (rev 431) @@ -120,7 +120,7 @@ \section{Copyright}\label{copyright} -The JAZZ++ MIDI Sequencer is copyright (C) 1994-2000 Andreas Voss and +The JAZZ++ MIDI Sequencer is copyright (C) 1994-2000 Andreas Voss and Per Sigmond, all rights reserved. JAZZ++ program is free software; you can redistribute it and/or modify @@ -1527,8 +1527,8 @@ text in the Event List Editor and finally convert it back to midi events. The Event List Editor allows to filter events. The Editor will show only those -events that are currently enabled in the \helpref{Filter Dialog}{midifilter} -in the Settings menu. As we already know, changing the filter settings +events that are currently enabled in the \helpref{Filter Dialog}{midifilter} +in the Settings menu. As we already know, changing the filter settings affects most of the other edit functions too, e.g erase will erase only those events, that are enabled in the Filter Dialog. @@ -1536,7 +1536,7 @@ \begin{itemize} \item {\tt 1:2:030 key 1 4C 90 200}\\ - A note event. 1:2:030 is the timing information, it means bar 1, + A note event. 1:2:030 is the timing information, it means bar 1, beat 2 plus 30 ticks. The string key indicates that this line corresponds to a note on event. The following 1 is the midi channel (numbered from 1 to 16), 4C is the octave and pitch, 90 @@ -1559,7 +1559,7 @@ A pitchbend event, valid values are in -8191 .. 8191 \item {\tt 1:2:030 sys f0 11 22 33 44 f7}\\ - A system exclusive message, hex values including the start- + A system exclusive message, hex values including the start- (f0) and stop- (f7) byte. \item {\tt 1:2:030 txt here is some text}\\ Modified: trunk/jazz/midinetd/main.c =================================================================== --- trunk/jazz/midinetd/main.c 2008-04-06 23:00:36 UTC (rev 430) +++ trunk/jazz/midinetd/main.c 2008-04-06 23:58:31 UTC (rev 431) @@ -138,7 +138,7 @@ printerror("bind"); exit(1); } - + /* Issue listen-command */ if (listen(sd1,5) < 0) { printerror("listen"); @@ -149,7 +149,7 @@ /* (hangs until call arrives) */ fprintf(stderr,"Start accepting\n"); tcp_sd = accept(sd1,(struct sockaddr*) remote_tcp_addr_ptr,addlen_ptr); - + if (tcp_sd < 0) { printerror("accept"); exit(1); Modified: trunk/jazz/midinetd/reader.c =================================================================== --- trunk/jazz/midinetd/reader.c 2008-04-06 23:00:36 UTC (rev 430) +++ trunk/jazz/midinetd/reader.c 2008-04-06 23:58:31 UTC (rev 431) @@ -143,7 +143,7 @@ written to the midi device. On play/record stop JAZZ will send one byte through the TCP-connection as a command and will wait for the function to send the recorded midi data - through the TCP-connection. This will be caught by the select-statement. + through the TCP-connection. This will be caught by the select-statement. After sending the record buffer the function will clear the buffer and allocate a new one. @@ -210,7 +210,7 @@ for (k = 0; k < filebytes; k++) { ch = filebuf[k]; if (ch == 0xff) continue; - /* I sometimes get these 0xff bytes, + /* I sometimes get these 0xff bytes, don't know why but they are of no use */ /* clock-to-host received ? */ Modified: trunk/jazz/src/AboutDialog.cpp =================================================================== --- trunk/jazz/src/AboutDialog.cpp 2008-04-06 23:00:36 UTC (rev 430) +++ trunk/jazz/src/AboutDialog.cpp 2008-04-06 23:58:31 UTC (rev 431) @@ -83,7 +83,7 @@ // wxString Paragraph2String = "Jazz++ is a MIDI sequencer program."; - wxString HtmlString = + wxString HtmlString = "<html>" "<head><META http-equiv=\"Content-Type\" content=\"text/html; charset=" + LocaleString + "\"></head>" Modified: trunk/jazz/src/AlsaPlayer.h =================================================================== --- trunk/jazz/src/AlsaPlayer.h 2008-04-06 23:00:36 UTC (rev 430) +++ trunk/jazz/src/AlsaPlayer.h 2008-04-06 23:58:31 UTC (rev 431) @@ -76,7 +76,7 @@ int inp_dev, outp_dev; // input/output device index int sync_in, sync_in_dev, sync_in_mtcType; int sync_out, sync_out_dev, sync_out_mtcType; - + int installed; static int create_port(snd_seq_t *handle, const char *name); Modified: trunk/jazz/src/AlsaThru.cpp =================================================================== --- trunk/jazz/src/AlsaThru.cpp 2008-04-06 23:00:36 UTC (rev 430) +++ trunk/jazz/src/AlsaThru.cpp 2008-04-06 23:58:31 UTC (rev 431) @@ -50,8 +50,8 @@ #include "AlsaPlayer.h" /* -** midi thru for alsa. it creates a new process (because threads dont work -** with wxwin) that copies from input to output. +** midi thru for alsa. it creates a new process (because threads dont work +** with wxwin) that copies from input to output. */ tAlsaThru::tAlsaThru() @@ -158,7 +158,7 @@ // thread version -void tAlsaThru::stopworker(int sig) +void tAlsaThru::stopworker(int sig) { running = 0; snd_seq_close(handle); @@ -176,7 +176,7 @@ return 0; } -void tAlsaThru::Start() +void tAlsaThru::Start() { if (!running) pthread_create(&worker, (void *)0, startworker, (void *)this); @@ -185,7 +185,7 @@ void tAlsaThru::Stop() { if (running) - pthread_kill(worker, SIGHUP); + pthread_kill(worker, SIGHUP); } @@ -196,13 +196,13 @@ static snd_seq_t *static_handle; // ugly!! -void tAlsaThru::stopworker(int sig) +void tAlsaThru::stopworker(int sig) { snd_seq_close(static_handle); exit(0); } -void tAlsaThru::Start() +void tAlsaThru::Start() { if (!running) { worker = fork(); Modified: trunk/jazz/src/Audio.h =================================================================== --- trunk/jazz/src/Audio.h 2008-04-06 23:00:36 UTC (rev 430) +++ trunk/jazz/src/Audio.h 2008-04-06 23:58:31 UTC (rev 431) @@ -245,7 +245,7 @@ void Edit(int key); - int GetSpeed() const + int GetSpeed() const { return speed; } Modified: trunk/jazz/src/ClockDialog.cpp =================================================================== --- trunk/jazz/src/ClockDialog.cpp 2008-04-06 23:00:36 UTC (rev 430) +++ trunk/jazz/src/ClockDialog.cpp 2008-04-06 23:58:31 UTC (rev 431) @@ -57,7 +57,7 @@ return new wxProperty( mpTitle, wxPropertyValue((char**)&mpString), - "string"); + "string"); } //----------------------------------------------------------------------------- Modified: trunk/jazz/src/Command.cpp =================================================================== --- trunk/jazz/src/Command.cpp 2008-04-06 23:00:36 UTC (rev 430) +++ trunk/jazz/src/Command.cpp 2008-04-06 23:58:31 UTC (rev 431) @@ -535,7 +535,7 @@ */ void tCmdSeqLength::ExecuteEvent(JZTrack *t, JZEvent *e) { - //make a copy of the current event + // Make a copy of the current event. JZEvent *k; k = (tKeyOn *)e->Copy(); @@ -548,7 +548,6 @@ k->SetClock((long int)(((k->GetClock()-startClock)*scale) + startClock ) ); t->Kill(e); t->Put(k); - } @@ -593,7 +592,7 @@ 0x37ff, 0x3fff }; - + long startvelocity=0; long startkey=0; while (e) @@ -651,16 +650,17 @@ { tKeyOn *k; - for(int i=1; i< repeat; i++) + for (int i = 1; i < repeat; ++i) { - if(e->IsKeyOn()){ //only echo note events + if (e->IsKeyOn()) + { + //only echo note events k = (tKeyOn *)e->Copy(); - k->SetClock(k->GetClock()+ clockDelay*i ); - k->Veloc=(unsigned char)(pow(scale,i)*k->Veloc); - t->Put(k); - } + k->SetClock(k->GetClock()+ clockDelay * i); + k->Veloc = (unsigned char)(pow(scale, i) * k->Veloc); + t->Put(k); } - + } } Modified: trunk/jazz/src/Configuration.cpp =================================================================== --- trunk/jazz/src/Configuration.cpp 2008-04-06 23:00:36 UTC (rev 430) +++ trunk/jazz/src/Configuration.cpp 2008-04-06 23:58:31 UTC (rev 431) @@ -94,12 +94,12 @@ tConfigEntry::~tConfigEntry() { delete [] Name; - delete [] StrValue; + delete [] StrValue; } void tConfigEntry::SetStrValue(const char* pStringValue) { - delete [] StrValue; + delete [] StrValue; if (pStringValue) { StrValue = new char[strlen(pStringValue) + 1]; Modified: trunk/jazz/src/ControlEdit.cpp =================================================================== --- trunk/jazz/src/ControlEdit.cpp 2008-04-06 23:00:36 UTC (rev 430) +++ trunk/jazz/src/ControlEdit.cpp 2008-04-06 23:58:31 UTC (rev 431) @@ -100,10 +100,9 @@ panel->SetAutoLayout( TRUE ); // tell dialog to use sizer panel->SetSizer( topsizer ); // actually set the sizer - - topsizer->Fit( panel ); // set size to minimum size as calculated by the sizer - topsizer->SetSizeHints( panel ); // set size hints to honour mininum size + topsizer->Fit( panel ); // set size to minimum size as calculated by the sizer + topsizer->SetSizeHints( panel ); // set size hints to honour mininum size } Modified: trunk/jazz/src/DeprecatedWx/proplist.cpp =================================================================== --- trunk/jazz/src/DeprecatedWx/proplist.cpp 2008-04-06 23:00:36 UTC (rev 430) +++ trunk/jazz/src/DeprecatedWx/proplist.cpp 2008-04-06 23:58:31 UTC (rev 431) @@ -1811,7 +1811,7 @@ if (sel == wxNOT_FOUND) return; - wxStringList::compatibility_iterator* node = + wxStringList::compatibility_iterator* node = (wxStringList::compatibility_iterator*) m_listBox->wxListBox::GetClientData(sel); if (!node) Modified: trunk/jazz/src/Dialogs.h =================================================================== --- trunk/jazz/src/Dialogs.h 2008-04-06 23:00:36 UTC (rev 430) +++ trunk/jazz/src/Dialogs.h 2008-04-06 23:58:31 UTC (rev 431) @@ -39,11 +39,11 @@ long mSteps; // 0 was static long mUnit; - + JZEventFrame* mpEventWindow; JZFilter* mpFilter; JZSong* mpSong; - + tShiftDlg(JZEventFrame* pEventWindow, JZFilter* pFilter, long Unit); void AddProperties(); bool OnClose(); Modified: trunk/jazz/src/EventWindow.cpp =================================================================== --- trunk/jazz/src/EventWindow.cpp 2008-04-06 23:00:36 UTC (rev 430) +++ trunk/jazz/src/EventWindow.cpp 2008-04-06 23:58:31 UTC (rev 431) @@ -220,7 +220,7 @@ // //onpaint never seems to get called, but ondraw does get called // int x = 0, y = 0; // GetViewStart(&x, &y); -// EventWin->OnPaintSub(Dc, x * mScrollSize, y * mScrollSize); +// EventWin->OnPaintSub(Dc, x * mScrollSize, y * mScrollSize); // cout << "JZEventWindow::OnDraw << endl; //} @@ -362,7 +362,7 @@ */ //void JZEventFrame::CreateCanvas() //{ -// cout << "CreateCanvas" << endl; +// cout << "CreateCanvas" << endl; // int Width, Height; // GetClientSize(&Width, &Height); // mpEventWindow = new JZEventWindow(this, 0, 0, Width, Height); @@ -414,7 +414,7 @@ /** -this onsize handler is supposed to take care of handling of the resizing the two subwindows sizes to +this onsize handler is supposed to take care of handling of the resizing the two subwindows sizes to they dont overlap */ void JZEventFrame::OnSize(wxSizeEvent& Event) @@ -451,7 +451,7 @@ int frameWidth, frameHeight; GetClientSize(&frameWidth, &frameHeight); - + // if (mpEventWindow) // // mpEventWindow->SetSize(0, (int)offset, (int)frameWidth, (int)(frameHeight - offset)); // mpEventWindow->SetSize(0, (int)0, (int)frameWidth, (int)(frameHeight)); @@ -607,7 +607,7 @@ dc is the device context to draw in, normally generated from the framework from ondraw x and y is the coordinates of the start of the view - + */ void JZEventFrame::OnPaintSub(wxDC *dc, int x, int y) { @@ -625,7 +625,7 @@ mEventsWidth = CanvasW - mLeftInfoWidth; mEventsHeight = CanvasH - mTopInfoHeight; - FromLine = CanvasY / mTrackHeight; + FromLine = CanvasY / mTrackHeight; ToLine = (CanvasY + CanvasH - mTopInfoHeight) / mTrackHeight; FromClock = CanvasX * ClocksPerPixel; ToClock = x2Clock(CanvasX + CanvasW); Modified: trunk/jazz/src/EventWindow.h =================================================================== --- trunk/jazz/src/EventWindow.h 2008-04-06 23:00:36 UTC (rev 430) +++ trunk/jazz/src/EventWindow.h 2008-04-06 23:58:31 UTC (rev 431) @@ -241,7 +241,7 @@ void ZoomIn(); void ZoomOut(); - + protected: JZToolBar* mpToolBar; Modified: trunk/jazz/src/Events.h =================================================================== --- trunk/jazz/src/Events.h 2008-04-06 23:00:36 UTC (rev 430) +++ trunk/jazz/src/Events.h 2008-04-06 23:58:31 UTC (rev 431) @@ -734,7 +734,7 @@ void SetTrackState(char c) { Data[6] = c; } - + // Data[7] is unused unsigned char GetTrackDevice() const { @@ -963,12 +963,12 @@ } }; -/* the meaning of this event is to be able to reference a track and have that play the instant -the event is executed. you can also transpose the referenced track and loop it for the duration -of the playtrack event. this makes it possible to compose in a structured fashion. - -ececution of the events takes place in song.cpp. -*/ +// the meaning of this event is to be able to reference a track and have that +// play the instant the event is executed. You can also transpose the +// referenced track and loop it for the duration of the playtrack event. This +// makes it possible to compose in a structured fashion. +// +// Execution of the events takes place in song.cpp. class tPlayTrack : public tMetaEvent { public: @@ -977,12 +977,12 @@ int eventlength; //the length of the event, confusing with the Length field of tMetaEvent, that seems to be for serialization virtual int GetLength() { edb(); return eventlength; } - + tPlayTrack(int clk, unsigned char *chardat, unsigned short len) : tMetaEvent(clk, StatPlayTrack, chardat, len) { int *dat = (int *)chardat; - //fill in the fields from the data + //fill in the fields from the data track=0; transpose=0; eventlength=0; @@ -992,15 +992,15 @@ eventlength=dat[2]; } } - - tPlayTrack(int clk, int track, int transpose, int eventlength) - : tMetaEvent(clk, StatPlayTrack, 0, 0) - { - this->track=track; - this->transpose=transpose; - this->eventlength=eventlength; - } + tPlayTrack(int clk, int track, int transpose, int eventlength) + : tMetaEvent(clk, StatPlayTrack, 0, 0) + { + this->track=track; + this->transpose=transpose; + this->eventlength=eventlength; + } + virtual int Write(JZWriteBase &io) { @@ -1010,7 +1010,7 @@ dat[1]=transpose; dat[2]=eventlength; Length=sizeof(int)*3; - edb(); + edb(); Data[Length] = 0; return io.Write(this, Data, Length); @@ -1022,7 +1022,7 @@ edb(); return new tPlayTrack(mClock, track, transpose, eventlength); } - + //this event has no real "pitch" but the rest of jazz use the pitch, in the pianowin editor pitch is the y coord of the event virtual int GetPitch(){ return track; Modified: trunk/jazz/src/FileSelector.cpp =================================================================== --- trunk/jazz/src/FileSelector.cpp 2008-04-06 23:00:36 UTC (rev 430) +++ trunk/jazz/src/FileSelector.cpp 2008-04-06 23:58:31 UTC (rev 431) @@ -58,10 +58,10 @@ // This is the file name. //***************************************************************************** wxString file_selector( - wxString deffile, - const wxString title, - bool save, - bool changed, + wxString deffile, + const wxString title, + bool save, + bool changed, const wxString ext) { wxString s; @@ -69,10 +69,12 @@ wxString path; if (save) + { file = wxFileNameFromPath(deffile); - + } + path = wxPathOnly(deffile); - + int flags = save ? wxFD_SAVE : wxFD_OPEN; s = wxFileSelector(title, path, file, 0, ext, flags); Modified: trunk/jazz/src/FindFile.cpp =================================================================== --- trunk/jazz/src/FindFile.cpp 2008-04-06 23:00:36 UTC (rev 430) +++ trunk/jazz/src/FindFile.cpp 2008-04-06 23:58:31 UTC (rev 431) @@ -34,9 +34,9 @@ // // 1. using the passed file name // 2. appending the passed file name to the path specified by the HOME -// environment variable, if it exists +// environment variable, if it exists // 3. appending the passed file name to the path specified by the JAZZ -// environment variable, if it exists +// environment variable, if it exists // 4. appending the passed file name to the location of the jazz executable // // Returns: Modified: trunk/jazz/src/FindFile.h =================================================================== --- trunk/jazz/src/FindFile.h 2008-04-06 23:00:36 UTC (rev 430) +++ trunk/jazz/src/FindFile.h 2008-04-06 23:58:31 UTC (rev 431) @@ -30,9 +30,9 @@ // // 1. using the passed file name // 2. appending the passed file name to the path specified by the HOME -// environment variable, if it exists +// environment variable, if it exists // 3. appending the passed file name to the path specified by the JAZZ -// environment variable, if it exists +// environment variable, if it exists // 4. appending the passed file name to the location of the jazz executable // // Returns: Modified: trunk/jazz/src/Harmony.cpp =================================================================== --- trunk/jazz/src/Harmony.cpp 2008-04-06 23:00:36 UTC (rev 430) +++ trunk/jazz/src/Harmony.cpp 2008-04-06 23:58:31 UTC (rev 431) @@ -355,12 +355,12 @@ #ifdef OBSOLETE wxDialogBox *panel = new wxDialogBox(parent, "MIDI settings", FALSE ); tHBPlayerForm *form = new tHBPlayerForm; - + form->Add(wxMakeFormMessage("Note Length for paste into piano window")); form->Add(wxMakeFormNewLine()); form->Add(wxMakeFormShort("Length", ¬e_length, wxFORM_DEFAULT, new wxList(wxMakeConstraintRange(10.0, 120.0), 0))); form->Add(wxMakeFormNewLine()); - + panel->SetLabelPosition(wxHORIZONTAL); form->Add(wxMakeFormBool("Bass enable", &bass_enabled)); @@ -432,8 +432,12 @@ void TransposeSelection(); HBPlayer player; - enum {SEQMAX = 256}; + enum + { + SEQMAX = 256 + }; + HBAnalyzer * getAnalyzer(); protected: @@ -1358,7 +1362,7 @@ wxString* snames = new wxString[n_scale_names]; for (i = 0; i < n_scale_names; i++) snames[i] = (char *)scale_names[i].name; - scale_lst = new wxListBox(this, -1, wxPoint(200, y), wxSize(300, 200), n_scale_names, snames, wxLB_SINGLE| wxLB_NEEDED_SB);//"Scales", + scale_lst = new wxListBox(this, -1, wxPoint(200, y), wxSize(300, 200), n_scale_names, snames, wxLB_SINGLE| wxLB_NEEDED_SB);//"Scales", delete [] snames; // thats it Modified: trunk/jazz/src/Harmony.h =================================================================== --- trunk/jazz/src/Harmony.h 2008-04-06 23:00:36 UTC (rev 430) +++ trunk/jazz/src/Harmony.h 2008-04-06 23:58:31 UTC (rev 431) @@ -34,7 +34,9 @@ class tHBInterface { public: - virtual ~tHBInterface() {} + virtual ~tHBInterface() + { + } virtual int SeqDefined() = 0; // true = yes // return number of keys in out Modified: trunk/jazz/src/KeyDialog.cpp =================================================================== --- trunk/jazz/src/KeyDialog.cpp 2008-04-06 23:00:36 UTC (rev 430) +++ trunk/jazz/src/KeyDialog.cpp 2008-04-06 23:58:31 UTC (rev 431) @@ -50,7 +50,7 @@ wxProperty* tKeyDlg::mkProperty() { - return new wxProperty(mpTitle, wxPropertyValue((char**)&mpString), "string"); + return new wxProperty(mpTitle, wxPropertyValue((char**)&mpString), "string"); } int tKeyDlg::GetKey() Modified: trunk/jazz/src/MouseAction.cpp =================================================================== --- trunk/jazz/src/MouseAction.cpp 2008-04-06 23:00:36 UTC (rev 430) +++ trunk/jazz/src/MouseAction.cpp 2008-04-06 23:58:31 UTC (rev 431) @@ -192,8 +192,8 @@ r2 = r; r2.SetNormal(); - win->Refresh(TRUE, &r1); - win->Refresh(TRUE, &r2); + win->Refresh(TRUE, &r1); + win->Refresh(TRUE, &r2); } //invalidate both old and new rect @@ -241,7 +241,7 @@ Dc.SetLogicalFunction(wxXOR); Dc.SetBrush(*mpBackgroundBrush); - + rr.SetNormal(); if (rr.width && rr.height) { Modified: trunk/jazz/src/PianoFrame.cpp =================================================================== --- trunk/jazz/src/PianoFrame.cpp 2008-04-06 23:00:36 UTC (rev 430) +++ trunk/jazz/src/PianoFrame.cpp 2008-04-06 23:58:31 UTC (rev 431) @@ -163,9 +163,9 @@ EVT_MENU(ID_SNAP_16, JZPianoFrame::OnSnap16) EVT_MENU(ID_SNAP_16D, JZPianoFrame::OnSnap16D) - EVT_MENU(ID_SELECT, JZPianoFrame::OnMSelect) - EVT_MENU(ID_CHANGE_LENGTH, JZPianoFrame::OnMLength) - EVT_MENU(ID_EVENT_DIALOG, JZPianoFrame::OnMDialog) + EVT_MENU(ID_SELECT, JZPianoFrame::OnMSelect) + EVT_MENU(ID_CHANGE_LENGTH, JZPianoFrame::OnMLength) + EVT_MENU(ID_EVENT_DIALOG, JZPianoFrame::OnMDialog) EVT_MENU(ID_CUT_PASTE_EVENTS, JZPianoFrame::OnMCutPaste) EVT_MENU(MEN_GUITAR, JZPianoFrame::OnGuitar) @@ -266,7 +266,7 @@ delete mpPianoWindow; delete MixerForm; - + delete mpToolBar; } @@ -437,7 +437,7 @@ mpPianoWindow->Redo(); } -// Undo actions +// Undo actions void JZPianoFrame::OnUndo(wxCommandEvent& Event) { mpPianoWindow->Undo(); Modified: trunk/jazz/src/PianoWindow.cpp =================================================================== --- trunk/jazz/src/PianoWindow.cpp 2008-04-06 23:00:36 UTC (rev 430) +++ trunk/jazz/src/PianoWindow.cpp 2008-04-06 23:58:31 UTC (rev 431) @@ -368,7 +368,7 @@ int Length = Clock - Copy->GetClock(); if (Length <= 0) Length = 1; - Copy->eventlength = Length; + Copy->eventlength = Length; Win->DrawEvent(Dc, Copy, Copy->GetBrush(), 1, 1); return 0; @@ -530,7 +530,7 @@ //----------------------------------------------------------------------------- BEGIN_EVENT_TABLE(JZPianoWindow, JZEventWindow) - EVT_SIZE(JZPianoWindow::OnSize) + EVT_SIZE(JZPianoWindow::OnSize) EVT_MOUSE_EVENTS(JZPianoWindow::OnMouseEvent) @@ -628,7 +628,7 @@ int c; for (int i = 0; i < NUM_COLORS; ++i) { - c = 256 * i / NUM_COLORS; + c = 256 * i / NUM_COLORS; mpColorBrush[i].SetColour(c, 0, 127 - c / 2); mpColorBrush[i].SetStyle(wxSOLID); } @@ -679,7 +679,7 @@ // OnPaint never seems to get called, but OnDraw does get called. int x = 0, y = 0; GetViewStart(&x, &y); - OnPaintSub(Dc, x * mScrollSize, y * mScrollSize); + OnPaintSub(Dc, x * mScrollSize, y * mScrollSize); } //----------------------------------------------------------------------------- @@ -914,7 +914,7 @@ DrawEvents(Dc, mpTrack, StatSysEx, wxGREEN_BRUSH, FALSE); if (mVisiblePlayTrack) DrawEvents(Dc, mpTrack, StatPlayTrack, wxLIGHT_GREY_BRUSH, FALSE); - + DrawEvents(Dc, mpTrack, StatEndOfTrack, wxRED_BRUSH, FALSE); DrawEvents(Dc, mpTrack, StatText, wxBLACK_BRUSH, FALSE); @@ -962,7 +962,7 @@ mEventsWidth = mCanvasWidth - mLeftInfoWidth; mEventsHeight = mCanvasHeight - mTopInfoHeight; - mFromLine = mCanvasY / mTrackHeight; + mFromLine = mCanvasY / mTrackHeight; mToLine = (mCanvasY + mCanvasHeight - mTopInfoHeight) / mTrackHeight; mFromClock = mCanvasX * mClockTicsPerPixel; mToClock = x2Clock(mCanvasX + mCanvasWidth); @@ -1275,7 +1275,7 @@ } int x = Clock2x(pEvent->GetClock()); int y = Pitch2y(pEvent->GetPitch()); - if (!xoor) + if (!xoor) { Dc.SetBrush(*wxWHITE_BRUSH); Dc.DrawRectangle(x, y + mLittleBit, length, mTrackHeight - 2 * mLittleBit); @@ -1369,17 +1369,17 @@ // end velocity colors Dc.DrawRectangle(x1, y1 + mLittleBit, DrawLength, mTrackHeight - 2 * mLittleBit); - //shouldnt it be in drawevent? odd. + //shouldnt it be in drawevent? odd. if (pEvent->IsPlayTrack()) { Dc.SetPen(*wxBLACK_PEN); ostringstream Oss; - Oss << "Track:" << pEvent->IsPlayTrack()->track; + Oss << "Track:" << pEvent->IsPlayTrack()->track; Dc.DrawText(Oss.str().c_str(), x1, y1 + mLittleBit); } } - + if (Clock + Length >= mFromClock) { //thesse events are always visible in vertical @@ -1388,10 +1388,10 @@ Dc.SetPen(*wxRED_PEN); Dc.VLine(x1); //draw a vertical bar Dc.SetPen(*wxBLACK_PEN); - sprintf(buf, "EOT"); + sprintf(buf, "EOT"); Dc.DrawText(buf, x1, y1 + mLittleBit); } - + if (pEvent->IsText()) { Dc.SetPen(*wxGREEN_PEN); @@ -1400,8 +1400,8 @@ sprintf(buf, (const char*)pEvent->IsText()->GetText()); int textX; int textY; - - Dc.GetTextExtent((const char*)pEvent->IsText()->GetText(), &textX, &textY); + + Dc.GetTextExtent((const char*)pEvent->IsText()->GetText(), &textX, &textY); Dc.SetBrush(*wxWHITE_BRUSH); int textlabely = mCanvasY + mTopInfoHeight;//text labels drawn at top Dc.DrawRectangle(x1-textX, textlabely + mLittleBit, textX, textY);//mTrackHeight - 2 * mLittleBit); @@ -1814,7 +1814,7 @@ Dc.SetLogicalFunction(wxXOR); Dc.SetBrush(*wxBLUE_BRUSH); - if (mMouseLine >= 0) + if (mMouseLine >= 0) { // Erase the previous highlight. Dc.DrawRectangle( @@ -2299,7 +2299,7 @@ CtrlH(Height)); mpCtrlEdit->ReInit(mpTrack, mFromClock, mClockTicsPerPixel); - Refresh(); + Refresh(); } void JZPianoWindow::CtrlPolyAftertouchEdit() @@ -2319,14 +2319,14 @@ CtrlH(Height)); mpCtrlEdit->ReInit(mpTrack, mFromClock, mClockTicsPerPixel); - Refresh(); + Refresh(); } void JZPianoWindow::CtrlNone() { delete mpCtrlEdit; mpCtrlEdit = 0; - Refresh(); + Refresh(); } void JZPianoWindow::CtrlTempo() @@ -2388,7 +2388,7 @@ CtrlH(Height)); mpCtrlEdit->ReInit(mpTrack, mFromClock, mClockTicsPerPixel); - Refresh(); + Refresh(); } void JZPianoWindow::EditFilter() @@ -2418,7 +2418,7 @@ mpCtrlEdit->ReInit(mpTrack, mFromClock, mClockTicsPerPixel); Refresh(); - } + } } void JZPianoWindow::CtrlModulation() @@ -2439,7 +2439,7 @@ CtrlH(Height)); mpCtrlEdit->ReInit(mpTrack, mFromClock, mClockTicsPerPixel); - Refresh(); + Refresh(); } void JZPianoWindow::CtrlPitch() @@ -2457,9 +2457,9 @@ CtrlY(Height), mCanvasWidth, CtrlH(Height)); - + mpCtrlEdit->ReInit(mpTrack, mFromClock, mClockTicsPerPixel); - Refresh(); + Refresh(); } void JZPianoWindow::Redo() @@ -2468,18 +2468,18 @@ Refresh(); if (mpCtrlEdit && mpTrack >= 0) { - mpCtrlEdit->ReInit(mpTrack, mFromClock, mClockTicsPerPixel); + mpCtrlEdit->ReInit(mpTrack, mFromClock, mClockTicsPerPixel); } } -// Undo actions +// Undo actions void JZPianoWindow::Undo() { mpSong->Undo(); Refresh(); if (mpCtrlEdit && mpTrack >= 0) { - mpCtrlEdit->ReInit(mpTrack, mFromClock, mClockTicsPerPixel); + mpCtrlEdit->ReInit(mpTrack, mFromClock, mClockTicsPerPixel); } } @@ -2502,7 +2502,7 @@ tCmdExchUpDown cmd(mpFilter); cmd.Execute(1); Refresh(); - } + } } // Flip events left to right. @@ -2513,7 +2513,7 @@ tCmdExchLeftRight cmd(mpFilter); cmd.Execute(1); Refresh(); - } + } } // Shift events snapclock clocks to left. @@ -2561,7 +2561,7 @@ mpGuitarFrame->Update(); // mpGuitarFrame->Redraw(); } - } + } } void JZPianoWindow::Erase() @@ -2571,14 +2571,14 @@ tCmdErase cmd(mpFilter); cmd.Execute(1); // with UNDO Refresh(); - } + } } void JZPianoWindow::ToggleVisibleAllTracks() { mVisibleAllTracks = !mVisibleAllTracks; - Refresh(); + Refresh(); } void JZPianoWindow::MSelect() @@ -2798,7 +2798,7 @@ void JZPianoWindow::ActivateSettingsDialog() { jppResourceDialog Dialog(this, "windowSettings"); - + Dialog.Attach("use_colours", &mUseColors); Dialog.Attach("font_size", &mFontSize, mPianoFontSizes); @@ -2824,7 +2824,7 @@ int repeat = 6; jppResourceDialog dialog(this, "midiDelay"); - + dialog.Attach("scale", &scale); dialog.Attach("clockDelay", &clockDelay); dialog.Attach("repeat", &repeat); @@ -2849,9 +2849,9 @@ int scale = 100; //in percent jppResourceDialog dialog(this, "sequenceLength"); - + dialog.Attach("scale", &scale); - + if (dialog.ShowModal() == wxID_OK) { //execute the command Modified: trunk/jazz/src/Player.cpp =================================================================== --- trunk/jazz/src/Player.cpp 2008-04-06 23:00:36 UTC (rev 430) +++ trunk/jazz/src/Player.cpp 2008-04-06 23:58:31 UTC (rev 431) @@ -95,7 +95,7 @@ // for (int i = 0; i < count; i++) // delete [] names[i]; } - + //tNamedValue *tDeviceList::AsNamedValue() //{ // tNamedValue *nv = new tNamedValue[count + 1]; Modified: trunk/jazz/src/Player.h =================================================================== --- trunk/jazz/src/Player.h 2008-04-06 23:00:36 UTC (rev 430) +++ trunk/jazz/src/Player.h 2008-04-06 23:58:31 UTC (rev 431) @@ -299,7 +299,7 @@ protected: virtual void OutNow(JZEvent* pEvent) = 0; - + private: tDeviceList DummyDeviceList; Modified: trunk/jazz/src/Project.cpp =================================================================== --- trunk/jazz/src/Project.cpp 2008-04-06 23:00:36 UTC (rev 430) +++ trunk/jazz/src/Project.cpp 2008-04-06 23:58:31 UTC (rev 431) @@ -332,7 +332,7 @@ //----------------------------------------------------------------------------- JZProject::~JZProject() { - delete mpMidiPlayer; + delete mpMidiPlayer; delete mpSynth; delete mpRecInfo; delete mpConfig; Modified: trunk/jazz/src/PropertyListDialog.h =================================================================== --- trunk/jazz/src/PropertyListDialog.h 2008-04-06 23:00:36 UTC (rev 430) +++ trunk/jazz/src/PropertyListDialog.h 2008-04-06 23:58:31 UTC (rev 431) @@ -109,7 +109,7 @@ int MapName2Value(const char* pSelection); wxString MapValue2Name(int Value); - + virtual bool OnSelect( bool Select, wxProperty* pProperty, Modified: trunk/jazz/src/ResourceDialog.cpp =================================================================== --- trunk/jazz/src/ResourceDialog.cpp 2008-04-06 23:00:36 UTC (rev 430) +++ trunk/jazz/src/ResourceDialog.cpp 2008-04-06 23:58:31 UTC (rev 431) @@ -58,7 +58,7 @@ wxXmlResource::Get()->InitAllHandlers(); initialized = true; } - + wxXmlResource::Get()->Load(xrcfile); } @@ -196,7 +196,7 @@ ++iResourceElement) { jppResourceElement* pResourceElement = *iResourceElement; - + wxWindow* win = wxWindow::FindWindowByName( pResourceElement->resource, dialog); @@ -290,7 +290,7 @@ { if (value == pResourceElement->longarr[i]) break; } - + if (i == pResourceElement->longarr.GetCount()) { // We couldn't find the value in the list. @@ -313,7 +313,7 @@ ((wxSlider*)win)->SetValue((int)value); } } - + if (!used) { wxMessageBox("Unable to locate a mapping for this widget:\n" Modified: trunk/jazz/src/Sample.cpp =================================================================== --- trunk/jazz/src/Sample.cpp 2008-04-06 23:00:36 UTC (rev 430) +++ trunk/jazz/src/Sample.cpp 2008-04-06 23:58:31 UTC (rev 431) @@ -593,9 +593,9 @@ { /* PAT - The following error prompted the addition of the casts to double. sample.cpp: In member function `void tSample::TransposeSemis(float)': - choosing `double pow(double, double)' over `float + choosing `double pow(double, double)' over `float std::pow(float, float)' - because worst conversion for the former is better than worst + because worst conversion for the former is better than worst conversion for the latter */ float f = (double)pow((double)FSEMI, (double)semis); Modified: trunk/jazz/src/SampleDialog.cpp =================================================================== --- trunk/jazz/src/SampleDialog.cpp 2008-04-06 23:00:36 UTC (rev 430) +++ trunk/jazz/src/SampleDialog.cpp 2008-04-06 23:58:31 UTC (rev 431) @@ -649,13 +649,13 @@ //cancel = new wxButton(panel, (wxFunction)ItemCallback, "Close"); //panel->NewLine(); chk_fft = new wxCheckBox(panel, -1, "Harmonics"); // (wxFunction)ItemCallback, - chk_fft->SetValue(fft_enable); + chk_fft->SetValue(fft_enable); chk_vol = new wxCheckBox(panel, -1, "Envelope"); // (wxFunction)ItemCallback, - chk_vol->SetValue(vol_enable); + chk_vol->SetValue(vol_enable); chk_pan = new wxCheckBox(panel, -1, "Panpot"); // (wxFunction)ItemCallback, - chk_pan->SetValue(pan_enable); + chk_pan->SetValue(pan_enable); chk_frq = new wxCheckBox(panel, -1, "Pitch"); // (wxFunction)ItemCallback, - chk_frq->SetValue(frq_enable); + chk_frq->SetValue(frq_enable); chk_noise = new wxCheckBox(panel, -1, "Noise"); // (wxFunction)ItemCallback, chk_noise->SetValue(noise_enable); #ifdef OBSOLETE Modified: trunk/jazz/src/SliderWindow.cpp =================================================================== --- trunk/jazz/src/SliderWindow.cpp 2008-04-06 23:00:36 UTC (rev 430) +++ trunk/jazz/src/SliderWindow.cpp 2008-04-06 23:58:31 UTC (rev 431) @@ -83,7 +83,7 @@ BEGIN_EVENT_TABLE(tSliderWin, wxFrame) - EVT_SIZE(tSliderWin::OnSize) + EVT_SIZE(tSliderWin::OnSize) END_EVENT_TABLE() /**called from the event table whenever the window is resized Modified: trunk/jazz/src/Song.cpp =================================================================== --- trunk/jazz/src/Song.cpp 2008-04-06 23:00:36 UTC (rev 430) +++ trunk/jazz/src/Song.cpp 2008-04-06 23:58:31 UTC (rev 431) @@ -248,15 +248,15 @@ return; fprintf(stderr, "playtrack %d\n",c->track); JZTrack* pTrack = &mTracks[c->track];//the track we want to play - tEventIterator IteratorPL(pTrack); //get an iterator of all events the playtrack is pointing to + tEventIterator IteratorPL(pTrack); //get an iterator of all events the playtrack is pointing to JZEvent *f; //FIXME this is just to test the idea, it would be good to modify getlastclock instead i think //find an EOT event, otherwise default to the last clock(should be + length of the last event as well) int loopLength = 0; - tEventIterator IteratorEOT(pTrack); //get an iterator of all events the playtrack is pointing to + tEventIterator IteratorEOT(pTrack); //get an iterator of all events the playtrack is pointing to f = IteratorEOT.Range(0, pTrack->GetLastClock()); - loopLength = pTrack->GetLastClock(); + loopLength = pTrack->GetLastClock(); while(f) { if (f->IsEndOfTrack()) @@ -280,8 +280,8 @@ // start of those to the beginning of the loop, and shorten the length. // There would still be a problem with playtracks not even bar length. while(loopOffset < c->eventlength) - { - f = IteratorPL.Range(0, (c->eventlength-loopOffset)); //no more events then the length of the playtrack! and ensure last iteration is no longer than what is left + { + f = IteratorPL.Range(0, (c->eventlength-loopOffset)); //no more events then the length of the playtrack! and ensure last iteration is no longer than what is left while (f) { JZEvent *d = f->Copy(); Modified: trunk/jazz/src/Track.cpp =================================================================== --- trunk/jazz/src/Track.cpp 2008-04-06 23:00:36 UTC (rev 430) +++ trunk/jazz/src/Track.cpp 2008-04-06 23:58:31 UTC (rev 431) @@ -497,7 +497,7 @@ ++j; --newnEvents; } - + JZEvent* item; if (j <= MaxEvents) { @@ -524,7 +524,7 @@ Resize(); } Events[nEvents++] = e; - + #ifdef E_DBUG { for (int i = 0; i < nEvents; i++) Modified: trunk/jazz/src/TrackWindow.cpp =================================================================== --- trunk/jazz/src/TrackWindow.cpp 2008-04-06 23:00:36 UTC (rev 430) +++ trunk/jazz/src/TrackWindow.cpp 2008-04-06 23:58:31 UTC (rev 431) @@ -635,7 +635,7 @@ // Draw the selection box. mpSnapSel->Draw(LocalDc, mEventsX, mEventsY, mEventsWidth, mEventsHeight); - + // LocalDc.SetClippingRegion(0, 0, mCanvasWidth, mCanvasHeight); Dc.Blit( mScrolledX, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pst...@us...> - 2008-04-14 14:39:37
|
Revision: 459 http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=459&view=rev Author: pstieber Date: 2008-04-14 07:39:29 -0700 (Mon, 14 Apr 2008) Log Message: ----------- 1. Started putting window management in the hands of a new project manager class. This include creation and updating. The code uses the observer pattern to some extent, but is a partial implementation at this point. This should prevent windows from holding pointers to other windows. 2. Fixed scrolling for the track and piano windows. 3. Fixed some leaks in the windows device code. Modified Paths: -------------- trunk/jazz/src/AlsaPlayer.cpp trunk/jazz/src/Audio.h trunk/jazz/src/Dialogs.cpp trunk/jazz/src/Dialogs.h trunk/jazz/src/EventWindow.cpp trunk/jazz/src/EventWindow.h trunk/jazz/src/GuitarFrame.cpp trunk/jazz/src/GuitarFrame.h trunk/jazz/src/Harmony.cpp trunk/jazz/src/JazzPlusPlusApplication.cpp trunk/jazz/src/Makefile.am trunk/jazz/src/MouseAction.cpp trunk/jazz/src/MouseAction.h trunk/jazz/src/PianoFrame.cpp trunk/jazz/src/PianoFrame.h trunk/jazz/src/PianoWindow.cpp trunk/jazz/src/PianoWindow.h trunk/jazz/src/Player.cpp trunk/jazz/src/Project.cpp trunk/jazz/src/TrackFrame.cpp trunk/jazz/src/TrackFrame.h trunk/jazz/src/TrackWindow.cpp trunk/jazz/src/TrackWindow.h trunk/jazz/src/mswin/WindowsPlayer.cpp trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj Added Paths: ----------- trunk/jazz/src/ProjectManager.cpp trunk/jazz/src/ProjectManager.h Modified: trunk/jazz/src/AlsaPlayer.cpp =================================================================== --- trunk/jazz/src/AlsaPlayer.cpp 2008-04-13 00:18:54 UTC (rev 458) +++ trunk/jazz/src/AlsaPlayer.cpp 2008-04-14 14:39:29 UTC (rev 459) @@ -32,6 +32,7 @@ #include "WxWidgets.h" #include "AlsaPlayer.h" +#include "ProjectManager.h" #include "TrackFrame.h" #include "TrackWindow.h" #include "Dialogs.h" @@ -715,7 +716,7 @@ flush_output(); stop_queue_timer(); clear_input_queue(); - gpTrackWindow->NewPlayPosition(-1L); + JZProjectManager::Instance()->NewPlayPosition(-1); RecdBuffer.Keyoff2Length(); } @@ -849,7 +850,8 @@ } if (recd_clock != old_recd_clock) { - gpTrackWindow->NewPlayPosition(PlayLoop->Ext2IntClock(recd_clock/48 * 48)); + JZProjectManager::Instance()->NewPlayPosition( + PlayLoop->Ext2IntClock(recd_clock / 48 * 48)); } return recd_clock; } Modified: trunk/jazz/src/Audio.h =================================================================== --- trunk/jazz/src/Audio.h 2008-04-13 00:18:54 UTC (rev 458) +++ trunk/jazz/src/Audio.h 2008-04-14 14:39:29 UTC (rev 459) @@ -96,6 +96,7 @@ ~tAudioBuffer() { + delete hdr; delete [] data; } Modified: trunk/jazz/src/Dialogs.cpp =================================================================== --- trunk/jazz/src/Dialogs.cpp 2008-04-13 00:18:54 UTC (rev 458) +++ trunk/jazz/src/Dialogs.cpp 2008-04-14 14:39:29 UTC (rev 459) @@ -27,6 +27,7 @@ #include "Synth.h" #include "Command.h" #include "EventWindow.h" +#include "ProjectManager.h" #include "Track.h" #include "Events.h" #include "Player.h" @@ -54,7 +55,6 @@ : tPropertyListDlg("Shift events left/right"), mSteps(0), mUnit(unit), - mpEventWindow(pEventWindow), mpFilter(pFilter), mpSong(pFilter->mpSong) { @@ -67,12 +67,9 @@ cout << "tShiftDlg::OnClose " << mSteps << endl; tCmdShift cmd(mpFilter, mSteps * mUnit); cmd.Execute(); - mpEventWindow->Refresh(); - if (mpEventWindow->NextWin) - { - mpEventWindow->NextWin->Refresh(); - } + JZProjectManager::Instance()->UpdateAllViews(); + // wxForm::OnOk(); return false; } @@ -110,7 +107,6 @@ { Filter = f; Song = f->mpSong; - mpEventWindow = w; } @@ -123,12 +119,9 @@ << endl; tCmdCleanup cln(Filter, limit, shortenOverlaps); cln.Execute(); - mpEventWindow->Refresh(); - if (mpEventWindow->NextWin) - { - mpEventWindow->NextWin->Refresh(); - } + JZProjectManager::Instance()->UpdateAllViews(); + //wxForm::OnOk(); return false; } @@ -194,19 +187,15 @@ { Filter = f; Song = f->mpSong; - mpEventWindow = w; } bool tSearchReplaceDlg::OnClose() { tCmdSearchReplace sr(Filter, frCtrl - 1, toCtrl-1); sr.Execute(); - mpEventWindow->Refresh(); - if (mpEventWindow->NextWin) - { - mpEventWindow->NextWin->Refresh(); - } + JZProjectManager::Instance()->UpdateAllViews(); + return false; } @@ -244,7 +233,6 @@ tTransposeDlg::tTransposeDlg(JZEventFrame *w, JZFilter *f) : tPropertyListDlg("Transpose") { - mpEventWindow = w; Filter = f; Song = f->mpSong; } @@ -254,15 +242,9 @@ { tCmdTranspose trn(Filter, Notes, Scale, FitIntoScale); trn.Execute(); - if (mpEventWindow->NextWin) - { - mpEventWindow->NextWin->Refresh(); - } - else - { - mpEventWindow->Refresh(); - } + JZProjectManager::Instance()->UpdateAllViews(); + return false; } @@ -404,7 +386,6 @@ { Filter = f; Song = f->mpSong; - mpEventWindow = w; } @@ -413,11 +394,7 @@ tCmdLength cmd(Filter, FromValue, ToValue, Mode); cmd.Execute(); - mpEventWindow->Refresh(); - if (mpEventWindow->NextWin) - { - mpEventWindow->NextWin->Refresh(); - } + JZProjectManager::Instance()->UpdateAllViews(); //tPropertyListDlg::OnClose(); return false; @@ -469,7 +446,6 @@ { Filter = f; Song = f->mpSong; - mpEventWindow = w; } @@ -477,12 +453,9 @@ { tCmdSeqLength cmd(Filter, scale); cmd.Execute(); - mpEventWindow->Refresh(); - if (mpEventWindow->NextWin) - { - mpEventWindow->NextWin->Refresh(); - } + JZProjectManager::Instance()->UpdateAllViews(); + //tPropertyListDlg::OnClose(); return false; } @@ -516,7 +489,6 @@ { Filter = f; Song = f->mpSong; - mpEventWindow = w; } @@ -525,12 +497,9 @@ tCmdMidiDelay cmd(Filter, scale,clockDelay,repeat); cmd.Execute(); - mpEventWindow->Refresh(); - if (mpEventWindow->NextWin) - { - mpEventWindow->NextWin->Refresh(); - } + JZProjectManager::Instance()->UpdateAllViews(); + //tPropertyListDlg::OnClose(); return false; } @@ -579,7 +548,6 @@ : tPropertyListDlg("Delete" ) { Filter = f; - mpEventWindow = w; } @@ -587,12 +555,9 @@ { tCmdErase cmd(Filter, LeaveSpace); cmd.Execute(); - mpEventWindow->Refresh(); - if (mpEventWindow->NextWin) - { - mpEventWindow->NextWin->Refresh(); - } + JZProjectManager::Instance()->UpdateAllViews(); + // tPropertyListDlg::OnClose(); return false; } @@ -674,7 +639,6 @@ { Filter = f; Song = f->mpSong; - mpEventWindow = w; } @@ -687,26 +651,23 @@ qnt.NoteStart = NoteStart; qnt.NoteLength = NoteLength; qnt.Execute(); - mpEventWindow->Refresh(); - if (mpEventWindow->NextWin) - { - mpEventWindow->NextWin->Refresh(); - } + JZProjectManager::Instance()->UpdateAllViews(); + //tPropertyListDlg::OnClose(); return false; } void tQuantizeDlg::OnHelp() { - if (mpEventWindow->NextWin) - { - gpHelpInstance->ShowTopic("Quantize"); - } - else - { - gpHelpInstance->ShowTopic("Pianowin Quantize"); - } +// if (mpEventWindow->NextWin) +// { +// gpHelpInstance->ShowTopic("Quantize"); +// } +// else +// { +// gpHelpInstance->ShowTopic("Pianowin Quantize"); +// } } void tQuantizeDlg::AddProperties() Modified: trunk/jazz/src/Dialogs.h =================================================================== --- trunk/jazz/src/Dialogs.h 2008-04-13 00:18:54 UTC (rev 458) +++ trunk/jazz/src/Dialogs.h 2008-04-14 14:39:29 UTC (rev 459) @@ -40,7 +40,6 @@ long mSteps; // 0 was static long mUnit; - JZEventFrame* mpEventWindow; JZFilter* mpFilter; JZSong* mpSong; @@ -59,7 +58,6 @@ JZFilter *Filter; JZSong *Song; - JZEventFrame* mpEventWindow; tCleanupDlg(JZEventFrame *w, JZFilter *f); void AddProperties(); @@ -79,7 +77,6 @@ JZFilter *Filter; JZSong *Song; - JZEventFrame* mpEventWindow; tSearchReplaceDlg(JZEventFrame *w, JZFilter *f); void AddProperties(); @@ -96,7 +93,6 @@ static bool FitIntoScale; static int Scale; - JZEventFrame* mpEventWindow; JZFilter *Filter; JZSong *Song; @@ -150,7 +146,6 @@ JZFilter *Filter; JZSong *Song; - JZEventFrame* mpEventWindow; tLengthDlg(JZEventFrame *win, JZFilter *f); void AddProperties(); @@ -168,7 +163,6 @@ JZFilter *Filter; JZSong *Song; - JZEventFrame* mpEventWindow; tSeqLengthDlg(JZEventFrame *win, JZFilter *f); void AddProperties(); @@ -187,7 +181,6 @@ JZFilter *Filter; JZSong *Song; - JZEventFrame* mpEventWindow; tMidiDelayDlg(JZEventFrame *win, JZFilter *f); void AddProperties(); @@ -198,7 +191,6 @@ class tDeleteDlg : public tPropertyListDlg { JZFilter *Filter; - JZEventFrame* mpEventWindow; public: static bool LeaveSpace; // 1 @@ -243,7 +235,6 @@ JZFilter *Filter; JZSong *Song; - JZEventFrame* mpEventWindow; long Quantize(long); Modified: trunk/jazz/src/EventWindow.cpp =================================================================== --- trunk/jazz/src/EventWindow.cpp 2008-04-13 00:18:54 UTC (rev 458) +++ trunk/jazz/src/EventWindow.cpp 2008-04-14 14:39:29 UTC (rev 459) @@ -45,16 +45,12 @@ //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -const int JZEventWindow::mScrollSize = 50; - -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- JZEventWindow::JZEventWindow( wxFrame* pParent, JZSong* pSong, const wxPoint& Position, const wxSize& Size) - : wxScrolledWindow( + : wxWindow( pParent, wxID_ANY, Position, @@ -65,9 +61,23 @@ mpSong(pSong), mpGreyColor(0), mpGreyBrush(0), + mClockTicsPerPixel(36), mTopInfoHeight(40), + mLeftInfoWidth(100), mTrackHeight(10), - mLittleBit(2) + mLittleBit(2), + mEventsX(0), + mEventsY(mTopInfoHeight), + mEventsWidth(), + mEventsHeight(), + mCanvasWidth(0), + mCanvasHeight(0), + mFromClock(0), + mToClock(0), + mFromLine(0), + mToLine(0), + mScrolledX(0), + mScrolledY(0) { mpSnapSel = new tSnapSelection(this); @@ -105,30 +115,98 @@ } //----------------------------------------------------------------------------- +// Description: +// Only consider the event portion of the window when computing the virtual +// size. Do not consider the static information of the left or top portion of +// the screen. //----------------------------------------------------------------------------- -//void JZEventWindow::SetScrollRanges() -//{ -// int Width, Height; -// GetVirtualEventSize(Width, Height); -// SetScrollbars( -// mScrollSize, -// mScrollSize, -// Width / mScrollSize, -// Height / mScrollSize); -// EnableScrolling(false, false); -//} +void JZEventWindow::GetVirtualEventSize( + int& EventWidth, + int& EventHeight) const +{ + int TotalClockTics = mpSong->MaxQuarters * mpSong->TicksPerQuarter; + EventWidth = TotalClockTics / mClockTicsPerPixel; + EventHeight = 127 * mTrackHeight; +} //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -void JZEventWindow::SetScrollPosition(int x, int y) +void JZEventWindow::SetXScrollPosition(int x) { - x /= mScrollSize; - y /= mScrollSize; - Scroll(x, y); + // The following line converts an x position in window coordinates to an + // x position in scrolled coordinates. + int ScrolledX = x - mEventsX + mScrolledX; + + if (mScrolledX != ScrolledX) + { + mScrolledX = ScrolledX; + + // Set the new from clock and to clock positions based on the new scroll + // position. + mFromClock = mScrolledX * mClockTicsPerPixel; + mToClock = x2Clock(mCanvasWidth); + + SetScrollPos(wxHORIZONTAL, mScrolledX); + } } //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- +void JZEventWindow::SetYScrollPosition(int y) +{ + // The following line converts a y position in window coordinates to a + // y position in scrolled coordinates. + int ScrolledY = y - mEventsY + mScrolledY; + + if (mScrolledY != y) + { + mScrolledY = ScrolledY; + + // Set the new from line and to line positions based on the new scroll + // position. + mFromLine = mScrolledY / mTrackHeight; + mToLine = 1 + (mScrolledY + mCanvasHeight - mTopInfoHeight) / mTrackHeight; + + SetScrollPos(wxVERTICAL, mScrolledY); + } +} + +//----------------------------------------------------------------------------- +// Description: +// This function takes an x-pixel value in window coordinates and converts +// it to clock tics. +//----------------------------------------------------------------------------- +int JZEventWindow::x2Clock(int x) +{ + return (x - mEventsX) * mClockTicsPerPixel + mFromClock; +} + +//----------------------------------------------------------------------------- +// Description: +// This function takes clock tics and converts the value into an x-pixel +// location on the screen in window coordinates. +//----------------------------------------------------------------------------- +int JZEventWindow::Clock2x(int Clock) +{ + return mEventsX + (Clock - mFromClock) / mClockTicsPerPixel; +} + +//----------------------------------------------------------------------------- +//----------------------------------------------------------------------------- +int JZEventWindow::x2BarClock(int x, int Next) +{ + int Clock = x2Clock(x); + JZBarInfo BarInfo(mpSong); + BarInfo.SetClock(Clock); + while (Next--) + { + BarInfo.Next(); + } + return BarInfo.Clock; +} + +//----------------------------------------------------------------------------- +//----------------------------------------------------------------------------- int JZEventWindow::y2yLine(int y, int Up) { if (Up) @@ -142,7 +220,23 @@ } //----------------------------------------------------------------------------- +// Was the VLine macro //----------------------------------------------------------------------------- +void JZEventWindow::DrawVerticalLine(wxDC& Dc, int XPosition) const +{ + Dc.DrawLine(XPosition, 0, XPosition, mEventsY + mEventsHeight); +} + +//----------------------------------------------------------------------------- +// Was the HLine macro +//----------------------------------------------------------------------------- +void JZEventWindow::DrawHorizontalLine(wxDC& Dc, int YPosition) const +{ + Dc.DrawLine(0, YPosition, mCanvasWidth, YPosition); +} + +//----------------------------------------------------------------------------- +//----------------------------------------------------------------------------- void JZEventWindow::LineText( wxDC& Dc, int x, @@ -210,21 +304,6 @@ } //----------------------------------------------------------------------------- -// JAVE seems to want to clip the paint area -// calls the subclass paint routine -// -// OnPaint seems never to get called -//----------------------------------------------------------------------------- -//void JZEventWindow::OnDraw(wxDC& Dc) -//{ -// //onpaint never seems to get called, but ondraw does get called -// int x = 0, y = 0; -// GetViewStart(&x, &y); -// EventWin->OnPaintSub(Dc, x * mScrollSize, y * mScrollSize); -// cout << "JZEventWindow::OnDraw << endl; -//} - -//----------------------------------------------------------------------------- // This mouse handler delegates to the subclased event window. //----------------------------------------------------------------------------- //void JZEventWindow::OnMouseEvent(wxMouseEvent& MouseEvent) @@ -284,19 +363,13 @@ : wxFrame(pParent, wxID_ANY, Title, Position, Size), Song(pSong), mpFilter(0), - NextWin(0), -// mpEventWindow(0), - mpFont(0), mpFixedFont(0), hFixedFont(0), - LittleBit(1), mTrackHeight(0), mTopInfoHeight(40), - mLeftInfoWidth(100), FontSize(12), ClocksPerPixel(36), - UseColors(true), - mEventsX(mLeftInfoWidth), + mEventsX(), mEventsY(mTopInfoHeight), mEventsWidth(0), mEventsHeight(0), @@ -337,7 +410,6 @@ delete mpFilter; - delete mpFont; delete mpFixedFont; delete mpToolBar; @@ -373,16 +445,9 @@ */ void JZEventFrame::Create() { - cout <<"JZEventFrame::Create\n"; CreateMenu(); -// CreateCanvas(); -// SnapSel = new tSnapSelection(mpEventWindow); - - Setup(); -// mpEventWindow->SetScrollRanges(); -// mpEventWindow->SetScrollPosition(0, 0); //this wasnt here before wx2, why? } @@ -405,10 +470,10 @@ Dc.SetFont(*mpFont); Dc.GetTextExtent("M", &x, &y); - LittleBit = (int)(x/2); + mLittleBit = (int)(x/2); Dc.GetTextExtent("HXWjgi", &x, &y); - mTrackHeight = (int)y + LittleBit; + mTrackHeight = (int)y + mLittleBit; */ } @@ -474,30 +539,6 @@ // ******************************************************************* -int JZEventFrame::x2Clock(int x) -{ - return (x - mEventsX) * ClocksPerPixel + FromClock; -} - - -int JZEventFrame::Clock2x(int clk) -{ - return mEventsX + (clk - FromClock) / ClocksPerPixel; -} - -int JZEventFrame::x2BarClock(int x, int next) -{ - int clk = x2Clock(x); - JZBarInfo b(Song); - b.SetClock(clk); - while (next--) - { - b.Next(); - } - return b.Clock; -} - - int JZEventFrame::y2yLine(int y, int up) { if (up) @@ -571,7 +612,7 @@ y -= 2; } dc->SetTextBackground(*mpGreyColor); - dc->DrawText((char *)str, x + LittleBit, y + LittleBit); + dc->DrawText((char *)str, x + mLittleBit, y + mLittleBit); dc->SetTextBackground(*wxWHITE); } */ @@ -595,42 +636,6 @@ } -/** - JAVE this was originally called OnPaint(x,y), but i renamed it because i confused it with the OnPaint() framework routine - the call graph feels odd: the canvas is a member of the eventwin, with a pointer to the parent. the child calss the parent to redraw itself - - it doesnt do any real drawing, instead it sets up some member vars, to be used by other parts of the class - - it is now normally called from OnDraw in the mpEventWindow class,and also overridden in the subclass. - so this one here just sets up constants - - - dc is the device context to draw in, normally generated from the framework from ondraw - x and y is the coordinates of the start of the view - -*/ -void JZEventFrame::OnPaintSub(wxDC *dc, int x, int y) -{ - //printf("EventWin::OnPaintSub: x %ld, y %ld, w %ld, h %ld\n", x, y, w, h); - CanvasX = x; - CanvasY = y; -// wxCanvas::GetClientSize returns huge values, at least in wx_xt - int xc, yc; - GetClientSize(&xc, &yc); - CanvasW = xc; - CanvasH = yc; - - mEventsX = CanvasX + mLeftInfoWidth; - mEventsY = CanvasY + mTopInfoHeight; - mEventsWidth = CanvasW - mLeftInfoWidth; - mEventsHeight = CanvasH - mTopInfoHeight; - - FromLine = CanvasY / mTrackHeight; - ToLine = (CanvasY + CanvasH - mTopInfoHeight) / mTrackHeight; - FromClock = CanvasX * ClocksPerPixel; - ToClock = x2Clock(CanvasX + CanvasW); -} - // ****************************************************************** // Mouse // ****************************************************************** @@ -712,83 +717,9 @@ } //----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -void JZEventFrame::GetVirtualEventSize(int& Width, int& Height) -{ - int TotalClockTics = Song->MaxQuarters * Song->TicksPerQuarter; - Width = TotalClockTics / ClocksPerPixel + mLeftInfoWidth; - Height = 127 * mTrackHeight + mTopInfoHeight; -} - -//----------------------------------------------------------------------------- // PlayPosition //----------------------------------------------------------------------------- -// Update the play position to the clock argument, and trigger a redraw so -// the play bar will be drawn. -void JZEventFrame::NewPlayPosition(int Clock) -{ - int scroll_clock = (FromClock + 5 * ToClock) / 6; - - if (!SnapSel->Active && ((Clock > scroll_clock) || (Clock < FromClock)) && (Clock >= 0)) - { - // avoid permenent redraws when end of scroll range is reached - if (Clock > FromClock && ToClock >= Song->MaxQuarters * Song->TicksPerQuarter) - return; -// int x = Clock2x(Clock); -// mpEventWindow->SetScrollPosition(x - mLeftInfoWidth, CanvasY); - } - - if (!SnapSel->Active) // sets clipping - { - if (PlayClock != Clock) - { -// int oldplayclock=PlayClock; -// PlayClock = Clock; -// wxRect invalidateRect; -// invalidateRect.x=Clock2x(oldplayclock)-1; -// invalidateRect.y=CanvasY; -// invalidateRect.width=3; -// invalidateRect.height= 100000000; -// //DrawPlayPosition(); -// mpEventWindow->Refresh(TRUE,&invalidateRect); - -// invalidateRect.x=Clock2x(PlayClock)-1; -// mpEventWindow->Refresh(TRUE,&invalidateRect); - //DrawPlayPosition(); - -// mpEventWindow->Refresh(); - } - } - if (NextWin) - { - NextWin->NewPlayPosition(Clock); - } -} - -/** draw the "play position", by placing a vertical line where the "play clock" is */ -void JZEventFrame::DrawPlayPosition(wxDC* dc) -{ - if (!SnapSel->Active && PlayClock >= FromClock && PlayClock < ToClock) - { -// wxDC* dc = new wxClientDC(this); -// dc->SetLogicalFunction(wxXOR); - dc->SetBrush(*wxBLACK_BRUSH); - dc->SetPen(*wxBLACK_PEN); - int x = Clock2x(PlayClock); - - //cout<<"JZEventFrame::DrawPlayPosition play pos x "<<x<<" "<<FromClock<<" "<<ToClock<<endl; - //dc->DrawRectangle(x, CanvasY, 2*LittleBit, mTopInfoHeight); - dc->DrawLine(x, CanvasY, x, mEventsY + mEventsHeight); //draw a line, 2 pixwels wide - dc->DrawLine(x + 1, CanvasY, x + 1, mEventsY + mEventsHeight); - dc->SetLogicalFunction(wxCOPY); - } -//OLD if (NextWin) -//OLD { -//OLD NextWin->DrawPlayPosition(dc); -//OLD } -} - // ************************************************************************** // EventsSelected // ************************************************************************** @@ -964,10 +895,6 @@ tCmdConvertToModulation cmd(mpFilter); cmd.Execute(); Redraw(); - if (NextWin) - NextWin->Redraw(); - - } @@ -1065,44 +992,4 @@ // mpSettingsDialog = new wxDialogBox(this, "MeterChange", FALSE ); dlg = new tMeterChangeDlg(this); dlg->Create(); - } - - -void JZEventFrame::ZoomIn() -{ - -// if (ClocksPerPixel >= 2) -// { -// ClocksPerPixel /= 2; -// int x = CanvasX * 2; -// int y = CanvasY; - -// wxDC* dc=new wxClientDC(mpEventWindow); -// JZEventFrame::OnPaintSub(dc, x, y); -// mpEventWindow->SetScrollRanges(); -// mpEventWindow->SetScrollPosition(x, y); -// if (x == 0) -// Redraw(); - -// } -} - -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -void JZEventFrame::ZoomOut() -{ -// if (ClocksPerPixel <= 120) -// { -// ClocksPerPixel *= 2; -// int x = CanvasX / 2; -// int y = CanvasY; - - //wxClientDC Dc(mpEventWindow); - //JZEventFrame::OnPaintSub(Dc, x, y); -// mpEventWindow->SetScrollRanges(); -// mpEventWindow->SetScrollPosition(x, y); - //if (x == 0) - // Redraw(); -// } -} Modified: trunk/jazz/src/EventWindow.h =================================================================== --- trunk/jazz/src/EventWindow.h 2008-04-13 00:18:54 UTC (rev 458) +++ trunk/jazz/src/EventWindow.h 2008-04-14 14:39:29 UTC (rev 459) @@ -36,7 +36,7 @@ // This class is derived from a wxWidgets scrolled window, and acts as the // common base class for JZTrackWindow and JSPianoWindow. //***************************************************************************** -class JZEventWindow : public wxScrolledWindow +class JZEventWindow : public wxWindow { public: @@ -66,36 +66,50 @@ int Height = -1, bool Down = false); -// void SetScrollRanges(); + //======================================== + // Coordinate conversion member functions. + //======================================== - void SetScrollPosition(int x, int y); + int x2Clock(int x); + int Clock2x(int Clock); + + int x2BarClock(int x, int Next = 0); + protected: -// void OnPaint(wxPaintEvent& Event); -// void OnMouseEvent(wxMouseEvent& Event); -// void OnChar(wxKeyEvent& Event); -// bool OnCharHook(wxKeyEvent& Event); -// void OnDraw(wxDC& Dc); + void DrawVerticalLine(wxDC& Dc, int XPosition) const; + void DrawHorizontalLine(wxDC& Dc, int YPosition) const; + + virtual void GetVirtualEventSize(int& EventWidth, int& EventHeight) const; + + virtual void SetXScrollPosition(int x); + + virtual void SetYScrollPosition(int y); + int y2yLine(int y, int Up = 0); protected: - static const int mScrollSize; - JZSong* mpSong; -// JZEventFrame* mpEventFrame; - wxColor* mpGreyColor; wxBrush* mpGreyBrush; + int mClockTicsPerPixel; int mTopInfoHeight; + int mLeftInfoWidth; int mTrackHeight; int mLittleBit; + int mEventsX, mEventsY, mEventsWidth, mEventsHeight; + int mCanvasWidth, mCanvasHeight; + int mFromClock, mToClock; + int mFromLine, mToLine; + int mScrolledX, mScrolledY; + // DECLARE_EVENT_TABLE() }; @@ -143,9 +157,6 @@ JZFilter* mpFilter; - JZPianoFrame* NextWin; - - // 2) Create(): virtual void Create(); virtual void CreateMenu(); @@ -153,24 +164,18 @@ // JZEventWindow* mpEventWindow; // Setup() - wxFont* mpFont; wxFont* mpFixedFont; // remains with 12pt int hFixedFont; // Height of letters - int LittleBit; int mTrackHeight; int mTopInfoHeight; - int mLeftInfoWidth; int FontSize; int ClocksPerPixel; - bool UseColors; // Parameters changed, e.g. Song loaded virtual void Setup(); - // filled by OnPaint() - //wxDC *dc; int mEventsX, mEventsY, mEventsWidth, mEventsHeight; int CanvasX, CanvasY, CanvasW, CanvasH; // canvas coords int FromClock, ToClock; @@ -187,21 +192,10 @@ int y2yLine(int y, int up = 0); int Line2y(int line); // void LineText(wxDC *dc, int x, int y, int w, const char *str, int h = -1, bool down = false); - int x2Clock(int x); - int Clock2x(int clk); - int x2BarClock(int x, int Next = 0); int PlayClock; - virtual void NewPlayPosition(int Clock); - virtual void DrawPlayPosition(wxDC* dc); - // sent by trackwin: scroll to Position - virtual void NewPosition(int TrackNr, int Clock) - { - } - // Events - virtual void OnPaintSub(wxDC *dc, int x, int y); virtual int OnMouseEvent(wxMouseEvent& Event); virtual bool OnKeyEvent(wxKeyEvent& Event); // true = processed by eventwin virtual void OnSize(wxSizeEvent& Event); @@ -218,8 +212,6 @@ // Mixer-Dialog wxDialog* MixerForm; - virtual void GetVirtualEventSize(int& Width, int& Height); - // Edit-Menu // if selection active: TRUE, else: Errormessage + FALSE @@ -239,9 +231,6 @@ void MenSearchReplace(); void MenMeterChange(); - void ZoomIn(); - void ZoomOut(); - protected: JZToolBar* mpToolBar; Modified: trunk/jazz/src/GuitarFrame.cpp =================================================================== --- trunk/jazz/src/GuitarFrame.cpp 2008-04-13 00:18:54 UTC (rev 458) +++ trunk/jazz/src/GuitarFrame.cpp 2008-04-14 14:39:29 UTC (rev 459) @@ -27,6 +27,7 @@ #include "GuitarFrame.h" #include "GuitarWindow.h" #include "GuitarSettingsDialog.h" +#include "ProjectManager.h" //***************************************************************************** // Description: @@ -84,6 +85,13 @@ //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- +JZGuitarFrame::~JZGuitarFrame() +{ + JZProjectManager::Instance()->Detach(this); +} + +//----------------------------------------------------------------------------- +//----------------------------------------------------------------------------- void JZGuitarFrame::PrepareDC(wxDC& Dc) { } Modified: trunk/jazz/src/GuitarFrame.h =================================================================== --- trunk/jazz/src/GuitarFrame.h 2008-04-13 00:18:54 UTC (rev 458) +++ trunk/jazz/src/GuitarFrame.h 2008-04-14 14:39:29 UTC (rev 459) @@ -25,13 +25,18 @@ class JZGuitarWindow; -// Define a new frame type: this is going to be our main frame +//***************************************************************************** +// Description: +// This is the guitar frame class declaration. +//***************************************************************************** class JZGuitarFrame : public wxFrame { public: JZGuitarFrame(wxWindow* pParent = 0); + ~JZGuitarFrame(); + void PrepareDC(wxDC& Dc); void ShowPitch(int Pitch); Modified: trunk/jazz/src/Harmony.cpp =================================================================== --- trunk/jazz/src/Harmony.cpp 2008-04-13 00:18:54 UTC (rev 458) +++ trunk/jazz/src/Harmony.cpp 2008-04-14 14:39:29 UTC (rev 459) @@ -24,6 +24,7 @@ #include "Harmony.h" #include "HarmonyP.h" +#include "ProjectManager.h" #include "Player.h" #include "TrackFrame.h" #include "TrackWindow.h" @@ -1356,16 +1357,8 @@ if (gpTrackFrame->GetPianoWindow()) { - // Show in GuitarWin - JZGuitarFrame* pGuitarFrame = - gpTrackFrame->GetPianoWindow()->GetGuitarFrame(); - if (pGuitarFrame) - { - // Remove actual pianowin/mouse position - pGuitarFrame->ShowPitch(0); -// pGuitarFrame->Redraw(); - pGuitarFrame->Update(); - } + // Show in the guitar view. + JZProjectManager::Instance()->ShowPitch(0); } } } Modified: trunk/jazz/src/JazzPlusPlusApplication.cpp =================================================================== --- trunk/jazz/src/JazzPlusPlusApplication.cpp 2008-04-13 00:18:54 UTC (rev 458) +++ trunk/jazz/src/JazzPlusPlusApplication.cpp 2008-04-14 14:39:29 UTC (rev 459) @@ -25,6 +25,7 @@ #include "JazzPlusPlusApplication.h" #include "TrackFrame.h" #include "Project.h" +#include "ProjectManager.h" #include "Globals.h" #ifdef _MSC_VER @@ -135,17 +136,18 @@ wxApp::OnInit(); // Create the main application window. - mpTrackFrame = new JZTrackFrame( - 0, - "Jazz++", - gpSong, - wxPoint(10, 10), - wxSize(600, 400)); + mpTrackFrame = JZProjectManager::Instance()->CreateTrackView(); +// new JZTrackFrame( +// 0, +// "Jazz++", +// gpSong, +// wxPoint(10, 10), +// wxSize(600, 400)); gpTrackFrame = mpTrackFrame; // Show it and tell the application that it's our main window - mpTrackFrame->Show(true); +// mpTrackFrame->Show(true); SetTopWindow(mpTrackFrame); return true; @@ -167,6 +169,8 @@ // Prevent reported leaks from the configuration class. delete wxConfigBase::Set(0); + JZProjectManager::Destroy(); + return 0; } Modified: trunk/jazz/src/Makefile.am =================================================================== --- trunk/jazz/src/Makefile.am 2008-04-13 00:18:54 UTC (rev 458) +++ trunk/jazz/src/Makefile.am 2008-04-14 14:39:29 UTC (rev 459) @@ -55,6 +55,7 @@ PianoWindow.cpp \ Player.cpp \ Project.cpp \ +ProjectManager.cpp \ PropertyListDialog.cpp \ Random.cpp \ RecordingInfo.cpp \ @@ -130,6 +131,7 @@ PianoWindow.h \ Player.h \ Project.h \ +ProjectManager.h \ PropertyListDialog.h \ Random.h \ RecordingInfo.h \ Modified: trunk/jazz/src/MouseAction.cpp =================================================================== --- trunk/jazz/src/MouseAction.cpp 2008-04-13 00:18:54 UTC (rev 458) +++ trunk/jazz/src/MouseAction.cpp 2008-04-14 14:39:29 UTC (rev 459) @@ -92,7 +92,7 @@ ////////////////////////////////////////////////////////// //tSelection implementation -tSelection::tSelection(wxScrolledWindow* pWindow) +tSelection::tSelection(wxWindow* pWindow) : win(pWindow), mpBackgroundBrush(0) { @@ -343,7 +343,7 @@ } -tSnapSelection::tSnapSelection(wxScrolledWindow *c) +tSnapSelection::tSnapSelection(wxWindow *c) : tSelection(c) { xCoords = 0; @@ -471,7 +471,7 @@ // ------------------------------------------------------------------------- -tMarkDestin::tMarkDestin(wxScrolledWindow* canvas, wxFrame *frame, int left) +tMarkDestin::tMarkDestin(wxWindow* canvas, wxFrame *frame, int left) { wxCursor c; Canvas = canvas; Modified: trunk/jazz/src/MouseAction.h =================================================================== --- trunk/jazz/src/MouseAction.h 2008-04-13 00:18:54 UTC (rev 458) +++ trunk/jazz/src/MouseAction.h 2008-04-14 14:39:29 UTC (rev 459) @@ -149,7 +149,7 @@ { public: - tSelection(wxScrolledWindow* w);//wxCanvas *canvas); + tSelection(wxWindow* w);//wxCanvas *canvas); virtual ~tSelection(); int Active; @@ -168,7 +168,7 @@ private: - wxScrolledWindow* win; + wxWindow* win; // wxCanvas *Canvas; wxBrush* mpBackgroundBrush; @@ -179,7 +179,7 @@ class tSnapSelection : public tSelection { public: - tSnapSelection(wxScrolledWindow *c); + tSnapSelection(wxWindow *c); virtual void Snap(float &x, float &y, int up); void SetXSnap(int ny, int *cx); void SetYSnap(int ny, int *cy); @@ -194,15 +194,13 @@ //***************************************************************************** -/** - tButtonLabelInterface - - Specifies an interface for displaying a text string within another widget. - The other widget would inherit from this interface and implement the Display - method to print the string somewhere appropriate. The down argument - indicates if the text should be displayed in a depressed button or a normal - button. -*/ +// tButtonLabelInterface +// +// Specifies an interface for displaying a text string within another widget. +// The other widget would inherit from this interface and implement the Display +// method to print the string somewhere appropriate. The down argument +// indicates if the text should be displayed in a depressed button or a normal +// button. //***************************************************************************** class tButtonLabelInterface { @@ -219,13 +217,26 @@ //***************************************************************************** -/** - MouseCounter - let you enter numbers with left/right mouse button - -*/ +// MouseCounter - let you enter numbers with left/right mouse button //***************************************************************************** class tMouseCounter : public wxTimer, public tMouseAction { + public: + + JZRectangle r; + + int Value; + + tMouseCounter( + tButtonLabelInterface *win, + JZRectangle *rec, + int val, + int min, + int max, + int wait = 0); + + private: + int Min, Max, Delta; int Timeout; int Wait; // don't inc/dec at Init @@ -237,10 +248,6 @@ virtual int RightUp(wxMouseEvent &); virtual void Notify(); virtual void ShowValue(bool down); - public: - JZRectangle r; - int Value; - tMouseCounter(tButtonLabelInterface *win, JZRectangle *rec, int val, int min, int max, int wait = 0); }; @@ -249,7 +256,7 @@ //***************************************************************************** class tMarkDestin : public tMouseAction { - wxScrolledWindow *Canvas; + wxWindow *Canvas; wxFrame *Frame; int ButtonDown(wxMouseEvent &); @@ -259,7 +266,7 @@ virtual int LeftDown(wxMouseEvent &); virtual int RightDown(wxMouseEvent &); - tMarkDestin(wxScrolledWindow *canvas, wxFrame *frame, int left); + tMarkDestin(wxWindow *canvas, wxFrame *frame, int left); }; //***************************************************************************** Modified: trunk/jazz/src/PianoFrame.cpp =================================================================== --- trunk/jazz/src/PianoFrame.cpp 2008-04-13 00:18:54 UTC (rev 458) +++ trunk/jazz/src/PianoFrame.cpp 2008-04-14 14:39:29 UTC (rev 459) @@ -26,6 +26,7 @@ #include "PianoFrame.h" #include "PianoWindow.h" +#include "ProjectManager.h" #include "Song.h" #include "Track.h" #include "Synth.h" @@ -87,8 +88,6 @@ #define MEN_CTRL_TEMPO 42 #define MEN_REDO 47 -#define MEN_ZOOMIN 48 -#define MEN_ZOOMOUT 49 #define MEN_CTRL_POLY_AFTER 50 #define MEN_CTRL_CHANNEL_AFTER 51 @@ -117,8 +116,8 @@ { MEN_SHIFTR, FALSE, shiftr_xpm, "shift selection right"}, { MEN_VIS_ALL_TRK, TRUE, evnts_xpm, "show events from all tracks"}, { JZToolBar::eToolBarSeparator }, - { MEN_ZOOMIN, FALSE, zoomin_xpm, "zoom in"}, - { MEN_ZOOMOUT, FALSE, zoomout_xpm, "zoom out"}, + { wxID_ZOOM_IN, FALSE, zoomin_xpm, "zoom in"}, + { wxID_ZOOM_OUT, FALSE, zoomout_xpm, "zoom out"}, { wxID_UNDO, FALSE, undo_xpm, "undo"}, { MEN_REDO, FALSE, redo_xpm, "redo"}, { MEN_RESET, FALSE, panic_xpm, "all notes off"}, @@ -156,8 +155,8 @@ //***************************************************************************** BEGIN_EVENT_TABLE(JZPianoFrame, wxFrame) - EVT_MENU(MEN_ZOOMIN, JZPianoFrame::OnZoomIn) - EVT_MENU(MEN_ZOOMOUT, JZPianoFrame::OnZoomOut) + EVT_MENU(wxID_ZOOM_IN, JZPianoFrame::OnZoomIn) + EVT_MENU(wxID_ZOOM_OUT, JZPianoFrame::OnZoomOut) EVT_MENU(ID_SNAP_8, JZPianoFrame::OnSnap8) EVT_MENU(ID_SNAP_8D, JZPianoFrame::OnSnap8D) EVT_MENU(ID_SNAP_16, JZPianoFrame::OnSnap16) @@ -268,6 +267,8 @@ delete MixerForm; delete mpToolBar; + + JZProjectManager::Instance()->Detach(this); } //----------------------------------------------------------------------------- @@ -308,7 +309,7 @@ // show the guitar edit window. void JZPianoFrame::OnGuitar(wxCommandEvent& Event) { - mpPianoWindow->CreateGuitarWindow(); + JZProjectManager::Instance()->CreateGuitarView(); } @@ -376,13 +377,6 @@ SetMenuBar(menu_bar); } - - -JZGuitarFrame* JZPianoFrame::GetGuitarFrame() -{ - return mpPianoWindow->GetGuitarFrame(); -} - void JZPianoFrame::OnFilter(wxCommandEvent& Event) { mpPianoWindow->EditFilter(); @@ -747,6 +741,11 @@ mpPianoWindow->NewPlayPosition(Clock); } +void JZPianoFrame::ShowPitch(int Pitch) +{ + mpPianoWindow->ShowPitch(Pitch); +} + void JZPianoFrame::Redraw() { mpPianoWindow->Refresh(); Modified: trunk/jazz/src/PianoFrame.h =================================================================== --- trunk/jazz/src/PianoFrame.h 2008-04-13 00:18:54 UTC (rev 458) +++ trunk/jazz/src/PianoFrame.h 2008-04-14 14:39:29 UTC (rev 459) @@ -59,8 +59,6 @@ void OnMDialog(wxCommandEvent& Event); void OnMCutPaste(wxCommandEvent& Event); - void OnZoomIn(wxCommandEvent& Event); - void OnZoomOut(wxCommandEvent& Event); void OnSnap8(wxCommandEvent& Event); void OnSnap8D(wxCommandEvent& Event); void OnSnap16(wxCommandEvent& Event); @@ -68,11 +66,8 @@ void VisibleDialog(); - void CreateMenu(); - void OnPaintSub(wxDC* dc, int x, int y); - void OnSnapDlg(wxCommandEvent& Event); // Current track. @@ -81,8 +76,6 @@ void MouseCutPaste(wxMouseEvent &e, bool cut); - JZGuitarFrame* GetGuitarFrame(); - bool OnClose(); void PressRadio(int id = 0); @@ -121,14 +114,20 @@ void OnCut(wxCommandEvent& Event); void OnCopy(wxCommandEvent& Event); void OnErase(wxCommandEvent& Event); - void OnVisibleAllTracks(wxCommandEvent& Event); void OnReset(wxCommandEvent& Event); - public: + //============================================== + // These are facades for piano window functions. + //============================================== void NewPlayPosition(int Clock); + + void ShowPitch(int Pitch); + void Redraw(); + public: + JZPianoWindow* mpPianoWindow; int mClockTicsPerPixel; @@ -138,6 +137,11 @@ private: + void OnZoomIn(wxCommandEvent& Event); + void OnZoomOut(wxCommandEvent& Event); + + void OnVisibleAllTracks(wxCommandEvent& Event); + void OnGuitar(wxCommandEvent& Event); private: Modified: trunk/jazz/src/PianoWindow.cpp =================================================================== --- trunk/jazz/src/PianoWindow.cpp 2008-04-13 00:18:54 UTC (rev 458) +++ trunk/jazz/src/PianoWindow.cpp 2008-04-14 14:39:29 UTC (rev 459) @@ -26,6 +26,7 @@ #include "PianoWindow.h" #include "PianoFrame.h" +#include "ProjectManager.h" #include "ControlEdit.h" #include "Song.h" #include "Filter.h" @@ -124,9 +125,9 @@ int tMousePlay::ProcessEvent(wxMouseEvent& Event) { int x, y; + Event.GetPosition(&x, &y); int OldPitch = mPitch; - mpPianoWindow->LogicalMousePosition(Event, x, y); if (Event.LeftDown()) { @@ -227,7 +228,7 @@ wxClientDC Dc(Win); // to translate scrolled coordinates - Win->DoPrepareDC(Dc); + Win->PrepareDC(Dc); Win->DrawEvent(Dc, Copy, wxWHITE_BRUSH, 0); Win->DrawEvent(Dc, Copy, Copy->GetBrush(), 1, 1); @@ -253,10 +254,10 @@ int tKeyLengthDragger::Dragging(wxMouseEvent& Event) { wxClientDC Dc(Win); - Win->DoPrepareDC(Dc); //to translate scrolled coordinates + Win->PrepareDC(Dc); //to translate scrolled coordinates Win->DrawEvent(Dc, Copy, Copy->GetBrush(), 1, 1); int fx, fy; - Win->LogicalMousePosition(Event, fx, fy); + Event.GetPosition(&fx, &fy); int Clock = Win->x2Clock(fx); int Length = Clock - Copy->GetClock(); if (Length <= 0) @@ -346,7 +347,7 @@ Win->GetSong()->NewUndoBuffer(); // wxClientDC Dc(Win); - Win->DoPrepareDC(Dc); + Win->PrepareDC(Dc); Win->DrawEvent(Dc, Copy, wxWHITE_BRUSH, 0); Win->DrawEvent(Dc, Copy, Copy->GetBrush(), 1, 1); } @@ -371,10 +372,10 @@ int tPlayTrackLengthDragger::Dragging(wxMouseEvent& Event) { wxClientDC Dc(Win); - Win->DoPrepareDC(Dc); + Win->PrepareDC(Dc); Win->DrawEvent(Dc, Copy, Copy->GetBrush(), 1, 1); int fx, fy; - Win->LogicalMousePosition(Event, fx, fy); + Event.GetPosition(&fx, &fy); int Clock = Win->x2Clock(fx); int Length = Clock - Copy->GetClock(); if (Length <= 0) @@ -390,7 +391,7 @@ int tPlayTrackLengthDragger::ButtonUp(wxMouseEvent& Event) { wxClientDC Dc(Win); - Win->DoPrepareDC(Dc); + Win->PrepareDC(Dc); Win->DrawEvent(Dc, Copy, Copy->GetBrush(), 1, 1); Win->DrawEvent(Dc, Copy, Copy->GetBrush(), 0, 1); @@ -449,7 +450,7 @@ Win->ApplyToTrack(mpKeyOn, Copy); wxClientDC Dc(Win); - Win->DoPrepareDC(Dc); + Win->PrepareDC(Dc); Win->DrawEvent(Dc, Copy, Copy->GetBrush(), 0, 1); Win->UpdateControl(); @@ -504,7 +505,7 @@ //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -#define IsBlack(Key) isBlack[(Key) % 12] +#define IsBlack(Key) isBlack[(Key) % 12] //----------------------------------------------------------------------------- // Mouse Actions Mapping @@ -556,8 +557,14 @@ EVT_SIZE(JZPianoWindow::OnSize) + EVT_ERASE_BACKGROUND(JZPianoWindow::OnEraseBackground) + + EVT_PAINT(JZPianoWindow::OnPaint) + EVT_MOUSE_EVENTS(JZPianoWindow::OnMouseEvent) + EVT_SCROLLWIN(JZPianoWindow::OnScroll) + END_EVENT_TABLE() //----------------------------------------------------------------------------- @@ -581,19 +588,6 @@ mpCtrlEdit(0), mMousePlay(play_actions), mMouseEvent(evnt_actions), - mLittleBit(1), - mClockTicsPerPixel(4), - mTopInfoHeight(40), - mLeftInfoWidth(100), - mFromClock(0), - mToClock(0), - mFromLine(0), - mToLine(0), - mCanvasX(0), - mCanvasY(0), - mCanvasWidth(0), - mCanvasHeight(0), - mTrackHeight(0), mUseColors(true), mMouseLine(-1), mFontSize(12), @@ -603,18 +597,22 @@ mpDrumFont(0), mSnapDenomiator(16), mVisibleKeyOn(true), - mVisiblePitch(false), - mVisibleController(false), - mVisibleProgram(false), - mVisibleTempo(false), - mVisibleSysex(false), - mVisiblePlayTrack(false), + mVisiblePitch(true), + mVisibleController(true), + mVisibleProgram(true), + mVisibleTempo(true), + mVisibleSysex(true), + mVisiblePlayTrack(true), mVisibleDrumNames(true), - mVisibleAllTracks(false), + mVisibleAllTracks(true), mVisibleHBChord(true), - mVisibleMono(false), - mpGuitarFrame(0) + mVisibleMono(true), + mDrawing(false), + mpFrameBuffer(0) { + // This is more appropriate than the value in the event window constructor. + mClockTicsPerPixel = 4; + InitColors(); mpTrack = mpSong->GetTrack(mTrackIndex); @@ -628,6 +626,8 @@ mMouseEvent.SetLeftAction(MA_SELECT); + mpFrameBuffer = new wxBitmap; + Setup(); } @@ -639,7 +639,7 @@ delete mpFont; delete mpFixedFont; delete mpDrumFont; - delete mpGuitarFrame; + delete mpFrameBuffer; } //----------------------------------------------------------------------------- @@ -694,30 +694,61 @@ mPianoWidth = Width + mLittleBit; mLeftInfoWidth = mPianoWidth; + + SetScrollRanges(); } //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- void JZPianoWindow::OnDraw(wxDC& Dc) { - // OnPaint never seems to get called, but OnDraw does get called. - int x = 0, y = 0; - GetViewStart(&x, &y); - OnPaintSub(Dc, x * mScrollSize, y * mScrollSize); + Draw(Dc); } //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -void JZPianoWindow::OnPaintSub(wxDC& Dc, int x, int y) +void JZPianoWindow::Draw(wxDC& Dc) { + if (!mpFrameBuffer->Ok() || mDrawing) + { + return; + } + + mDrawing = true; + + // Create a memory device context and select the frame bitmap into it. + wxMemoryDC LocalDc; + LocalDc.SelectObject(*mpFrameBuffer); + + LocalDc.SetFont(*mpFont); + + // 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. + LocalDc.Clear(); + // int OldFromClock = mFromClock; - OnEventWinPaintSub(x, y); + GetClientSize(&mCanvasWidth, &mCanvasHeight); -// SN++ Da Jazz nun eine ReDo Funktion hat. Behebt gleichzeitig ein kleines -// Update Problem beim mehrfachen ZoomOut. -// Aktives Ctrl-Fenster neu zeichnen bzw. reinitialisieren. + mEventsX = mLeftInfoWidth; + mEventsY = mTopInfoHeight; + mEventsWidth = mCanvasWidth - mLeftInfoWidth; + mEventsHeight = mCanvasHeight - mTopInfoHeight; + + mFromLine = mScrolledY / mTrackHeight; + mToLine = 1 + (mScrolledY + mCanvasHeight - mTopInfoHeight) / mTrackHeight; + + mFromClock = mScrolledX * mClockTicsPerPixel; + mToClock = x2Clock(mCanvasWidth); + + // SN++ Because jazz has a ReDo function. Fixes simultaneously update a + // small problem when multiple ZoomOut. Active Ctrl draw new windows or + // reinitialize. + // if (mpCtrlEdit && OldFromClock != mFromClock) // mpCtrlEdit->ReInit(mpTrack, mFromClock, mClockTicsPerPixel); @@ -726,46 +757,50 @@ mpCtrlEdit->ReInit(mpTrack, mFromClock, mClockTicsPerPixel); } - mPianoX = mCanvasX; + mPianoX = 0; - int StopClk; JZBarInfo BarInfo(mpSong); - char buf[20]; - Dc.DestroyClippingRegion(); - Dc.SetBackground(*wxWHITE_BRUSH); - DrawPlayPosition(Dc); - mpSnapSel->Draw(Dc, mEventsX, mEventsY, mEventsWidth, mEventsHeight); - Dc.Clear(); +//DEBUG cout +//DEBUG << "mLeftInfoWidth: " << mLeftInfoWidth << '\n' +//DEBUG << "mCanvasWidth - mLeftInfoWidth: " << mCanvasWidth - mLeftInfoWidth << '\n' +//DEBUG << "BarInfo.TicksPerBar " << BarInfo.TicksPerBar << '\n' +//DEBUG << "From Clock: " << mFromClock << '\n' +//DEBUG << "To Clock: " << mToClock << '\n' +//DEBUG << "Clocks/Pixel: " << mClockTicsPerPixel << '\n' +//DEBUG << "From Measure: " << mFromClock / BarInfo.TicksPerBar << '\n' +//DEBUG << "To Measure: " << mToClock / BarInfo.TicksPerBar << '\n' +//DEBUG << "From X: " << Clock2x(mFromClock) << '\n' +//DEBUG << "To X: " << Clock2x(mToClock) << '\n' +//DEBUG << endl; - /////////////////////////////////////////////////////////////// // horizontal lines(ripped from drawpianoroll code) -// for (y = Line2y(mFromLine); y < mEventsY + mEventsHeight; y += mTrackHeight) +// for (y = TrackIndex2y(mFromLine); y < mEventsY + mEventsHeight; y += mTrackHeight) // if (y > mEventsY) // cheaper than clipping -// Dc.DrawLine(mEventsX+1, y, mEventsX + mEventsWidth, y); +// LocalDc.DrawLine(mEventsX+1, y, mEventsX + mEventsWidth, y); - Dc.SetPen(*wxGREY_PEN); - wxBrush blackKeysBrush=wxBrush(wxColor(250,240,240),wxSOLID); + LocalDc.SetPen(*wxGREY_PEN); + wxBrush blackKeysBrush = wxBrush(wxColor(250, 240, 240), wxSOLID); int Pitch = 127 - mFromLine; - y = Line2y(mFromLine); + int y = TrackIndex2y(mFromLine); while (Pitch >= 0 && y < mEventsY + mEventsHeight) { if (IsBlack(Pitch)) { - Dc.SetBrush(blackKeysBrush);//*wxLIGHT_GREY_PEN - Dc.DrawRectangle(mCanvasX, y, 2000, mTrackHeight); + LocalDc.SetBrush(blackKeysBrush); + LocalDc.DrawRectangle(0, y, 2000, mTrackHeight); } else if ((Pitch % 12) == 0) { - Dc.SetPen(*wxCYAN_PEN); - Dc.DrawLine(mCanvasX, y + mTrackHeight, 2000, y + mTrackHeight); + LocalDc.SetPen(*wxCYAN_PEN); + LocalDc.DrawLine(0, y + mTrackHeight, 2000, y + mTrackHeight); } else if (!IsBlack(Pitch - 1)) { - Dc.SetPen(*wxGREEN_PEN); - Dc.DrawLine(mCanvasX, y + mTrackHeight, 2000, y + mTrackHeight); + LocalDc.SetPen(*wxGREEN_PEN); + LocalDc.DrawLine(0, y + mTrackHeight, 2000, y + mTrackHeight); } y += mTrackHeight; @@ -775,62 +810,58 @@ /////////////////////////////////////////////////////////////// - mMouseLine = -1; - #define VLine(x) DrawLine(x, mCanvasY, x, mEventsY + mEventsHeight) - #define HLine(y) DrawLine(mCanvasX, y, mCanvasX + mCanvasWidth, y) + LocalDc.SetPen(*wxBLACK_PEN); - Dc.SetPen(*wxBLACK_PEN); + DrawVerticalLine(LocalDc, 0); + DrawVerticalLine(LocalDc, mEventsX); + DrawVerticalLine(LocalDc, mEventsX - 1); - // vertical lines + DrawHorizontalLine(LocalDc, mEventsY); + DrawHorizontalLine(LocalDc, mEventsY - 1); + DrawHorizontalLine(LocalDc, mEventsY + mEventsHeight); - Dc.VLine(mPianoX); - Dc.VLine(mEventsX); - Dc.VLine(mEventsX - 1); - Dc.HLine(mEventsY); - Dc.HLine(mEventsY - 1); - Dc.HLine(mEventsY + mEventsHeight); - // draw vlines and bar numbers - Dc.SetFont(*mpFixedFont); + LocalDc.SetFont(*mpFixedFont); BarInfo.SetClock(mFromClock); - StopClk = x2Clock(mCanvasX + mCanvasWidth); + int StopClk = x2Clock(mCanvasWidth); int clk = BarInfo.Clock; int intro = mpSong->GetIntroLength(); while (clk < StopClk) { clk = BarInfo.Clock; - x = Clock2x(clk); + int x = Clock2x(clk); // vertical lines and bar numbers int i; - Dc.SetPen(*wxBLACK_PEN); - sprintf(buf, "%d", BarInfo.BarNr + 1 - intro); + LocalDc.SetPen(*wxBLACK_PEN); + ostringstream Oss; + Oss << BarInfo.BarNr + 1 - intro; if (x > mEventsX) { - Dc.DrawText(buf, x + mLittleBit, mEventsY - mFixedFontHeight - 2); - Dc.SetPen(*wxGREY_PEN); - Dc.DrawLine(x, mEventsY - mFixedFontHeight, x, mEventsY + mEventsHeight); + LocalDc.DrawText(Oss.str().c_str(), x + mLittleBit, mEventsY - mFixedFontHeight - 2); + LocalDc.SetPen(*wxGREY_PEN); + LocalDc.DrawLine(x, mEventsY - mFixedFontHeight, x, mEventsY + mEventsHeight); } - Dc.SetPen(*wxLIGHT_GREY_PEN); + LocalDc.SetPen(*wxLIGHT_GREY_PEN); for (i = 0; i < BarInfo.CountsPerBar; i++) { clk += BarInfo.TicksPerBar / BarInfo.CountsPerBar; x = Clock2x(clk); if (x > mEventsX) { - Dc.DrawLine(x, mEventsY + 1, x, mEventsY + mEventsHeight); + LocalDc.DrawLine(x, mEventsY + 1, x, mEventsY + mEventsHeight); } } BarInfo.Next(); } - LineText(Dc, mCanvasX, mCanvasY, mPianoWidth, mTopInfoHeight); + LineText(LocalDc, 0, 0, mPianoWidth, mTopInfoHeight); - Dc.SetPen(*wxBLACK_PEN); - DrawPianoRoll(Dc); + LocalDc.SetPen(*wxBLACK_PEN); + DrawPianoRoll(LocalDc); // Draw chords from harmony-browser. if (mVisibleHBChord && gpHarmonyBrowser && !mpTrack->IsDrumTrack()) @@ -848,9 +879,9 @@ sbrush.SetColour(230,255,230); #endif - //Dc.SetClippingRegion(mEventsX, mEventsY, mEventsWidth, mEventsHeight); - Dc.SetLogicalFunction(wxXOR); - Dc.SetPen(*wxTRANSPARENT_PEN); +// LocalDc.SetClippingRegion(mEventsX, mEventsY, mEventsWidth, mEventsHeight); + LocalDc.SetLogicalFunction(wxXOR); + LocalDc.SetPen(*wxTRANSPARENT_PEN); int steps = pAnalyzer->Steps(); for (int step = 0; step < steps; step ++) @@ -890,13 +921,13 @@ } if (brush) { - Dc.SetBrush(*brush); + LocalDc.SetBrush(*brush); while (pitch < 127) { int y = Pitch2y(pitch); if (y >= mEventsY && y <= mEventsY + mEventsHeight - h) // y-clipping { - Dc.DrawRectangle(x, y, w, h); + LocalDc.DrawRectangle(x, y, w, h); } pitch += 12; } @@ -905,52 +936,81 @@ } } - //Dc.DestroyClippingRegion(); - Dc.SetLogicalFunction(wxCOPY); - Dc.SetPen(*wxBLACK_PEN); - Dc.SetBrush(*wxBLACK_BRUSH); +// LocalDc.DestroyClippingRegion(); + LocalDc.SetLogicalFunction(wxCOPY); + LocalDc.SetPen(*wxBLACK_PEN); + LocalDc.SetBrush(*wxBLACK_BRUSH); } } /////////end draw choords if (mVisibleAllTracks) { - int i; - for (i = 0; i < mpSong->nTracks; i++) + for (int i = 0; i < mpSong->nTracks; ++i) { - JZTrack *t = mpSong->GetTrack(i); - if (t != mpTrack && IsVisible(t)) + JZTrack* pTrack = mpSong->GetTrack(i); + if (pTrack != mpTrack && IsVisible(pTrack)) { - DrawEvents(Dc, t, StatKeyOn, wxLIGHT_GREY_BRUSH, TRUE); + DrawEvents(LocalDc, pTrack, StatKeyOn, wxLIGHT_GREY_BRUSH, TRUE); } } } if (mVisibleKeyOn) - DrawEvents(Dc, mpTrack, StatKeyOn, wxRED_BRUSH, FALSE); + { + DrawEvents(LocalDc, mpTrack, StatKeyOn, wxRED_BRUSH, FALSE); + } if (mVisiblePitch) - DrawEvents(Dc, mpTrack, StatPitch, wxBLUE_BRUSH, FALSE); + { + DrawEvents(LocalDc, mpTrack, StatPitch, wxBLUE_BRUSH, FALSE); + } if (mVisibleController) - DrawEvents(Dc, mpTrack, StatControl, wxCYAN_BRUSH, FALSE); + { + DrawEvents(LocalDc, mpTrack, StatControl, wxCYAN_BRUSH, FALSE); + } if (mVisibleProgram) - DrawEvents(Dc, mpTrack, StatProgram, wxGREEN_BRUSH, FALSE); + { + DrawEvents(LocalDc, mpTrack, StatProgram, wxGREEN_BRUSH, FALSE); + } if (mVisibleTempo) - DrawEvents(Dc, mpTrack, StatSetTempo, wxGREEN_BRUSH, FALSE); + { + DrawEvents(LocalDc, mpTrack, StatSetTempo, wxGREEN_BRUSH, FALSE); + } if (mVisibleSysex) - DrawEvents(Dc, mpTrack, StatSysEx, wxGREEN_BRUSH, FALSE); + { + DrawEvents(LocalDc, mpTrack, StatSysEx, wxGREEN_BRUSH, FALSE); + } if (mVisiblePlayTrack) - DrawEvents(Dc, mpTrack, StatPlayTrack, wxLIGHT_GREY_BRUSH, FALSE); + { + DrawEvents(LocalDc, mpTrack, StatPlayTrack, wxLIGHT_GREY_BRUSH, FALSE); + } - DrawEvents(Dc, mpTrack, StatEndOfTrack, wxRED_BRUSH, FALSE); - DrawEvents(Dc, mpTrack, StatText, wxBLACK_BRUSH, FALSE); + DrawEvents(LocalDc, mpTrack, StatEndOfTrack, wxRED_BRUSH, FALSE); + DrawEvents(LocalDc, mpTrack, StatText, wxBLACK_BRUSH, FALSE); - Dc.SetPen(*wxBLACK_PEN); - Dc.SetBrush(*wxBLACK_BRUSH); - Dc.SetBackground(*wxWHITE_BRUSH); // xor-bug +// LocalDc.SetPen(*wxBLACK_PEN); +// LocalDc.SetBrush(*wxBLACK_BRUSH); +// LocalDc.SetBackground(*wxWHITE_BRUSH); // xor-bug - mpSnapSel->Draw(Dc, mEventsX, mEventsY, mEventsWidth, mEventsHeight); + DrawPlayPosition(LocalDc); - DrawPlayPosition(Dc); + // Draw the selection box. + mpSnapSel->Draw(LocalDc, mEventsX, mEventsY, mEventsWidth, mEventsHeight); + + Dc.Blit( + 0, + 0, + mCanvasWidth, + mCanvasHeight, + &LocalDc, + 0, + 0, + wxCOPY); + + LocalDc.SetFont(wxNullFont); + LocalDc.SelectObject(wxNullBitmap); + + mDrawing = false; } //----------------------------------------------------------------------------- @@ -964,49 +1024,24 @@ { Dc.SetBrush(*wxBLACK_BRUSH); Dc.SetPen(*wxBLACK_PEN); + int x = Clock2x(mPlayClock); -// Dc.SetLogicalFunction(wxXOR); - // Draw a line, 2 pixels wide. - Dc.DrawLine(x, mCanvasY,x, mEventsY + mEventsHeight); - Dc.DrawLine(x+1,mCanvasY,x+1,mEventsY + mEventsHeight); - -// Dc.SetLogicalFunction(wxCOPY); + Dc.DrawLine(x, 0, x, mEventsY + mEventsHeight); + Dc.DrawLine(x + 1, 0, x + 1, mEventsY + mEventsHeight); } } //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -void JZPianoWindow::OnEventWinPaintSub(int x, int y) -{ - mCanvasX = x; - mCanvasY = y; - int xc, yc; - GetClientSize(&xc, &yc); - mCanvasWidth = xc; - mCanvasHeight = yc; - - mEventsX = mCanvasX + mLeftInfoWidth; - mEventsY = mCanvasY + mTopInfoHeight; - mEventsWidth = mCanvasWidth - mLeftInfoWidth; - mEventsHeight = mCanvasHeight - mTopInfoHeight; - - mFromLine = mCanvasY / mTrackHeight; - mToLine = (mCanvasY + mCanvasHeight - mTopInfoHeight) / mTrackHeight; - mFromClock = mCanvasX * mClockTicsPerPixel; - mToClock = x2Clock(mCanvasX + mCanvasWidth); -} - -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- void JZPianoWindow::OnSize(wxSizeEvent& Event) { GetClientSize(&mCanvasWidth, &mCanvasHeight); if (mCanvasWidth > 0 && mCanvasHeight > 0) { - SetScrollRanges(mCanvasX, mCanvasY); - Refresh(false); + mpFrameBuffer->Create(mCanvasWidth, mCanvasHeight); + SetScrollRanges(); } } @@ -1097,16 +1132,19 @@ mTrackIndex = TrackIndex; mpTrack = mpSong->GetTrack(mTrackIndex); mpPianoFrame->SetTitle(mpTrack->GetName()); + + SetYScrollPosition(TrackIndex2y(mFromLines[mTrackIndex])); } // change position if (Clock >= 0) { int x = Clock2x(Clock); - SetScrollPosition(x - mLeftInfoWidth, Line2y(mFromLines[mTrackIndex])); +//OLD SetScrollPosition(x, TrackIndex2y(mFromLines[mTrackIndex])); + SetXScrollPosition(x); } -// SN++ Ist geaendert. OnPaint zeichnet immer neu -> Bug Fix bei ZoomOut! +// SN++ Is changed. OnPaint always draws new -> Bug Fix for ZoomOut! /* // OnPaint() redraws only if clock has changed if (mpCtrlEdit && TrackIndex >= 0) @@ -1117,27 +1155,36 @@ //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -void JZPianoWindow::SetScrollRanges(const int& x, const int& y) +void JZPianoWindow::SetScrollRanges() { - int Width, Height; - GetVirtualEventSize(Width, Height); - SetScrollbars( - mScrollSize, - mScrollSize, - Width / mScrollSize, - Height / mScrollSize, - x, - y); - EnableScrolling(false, false); + int EventWidth, EventHeight; + GetVirtualEventSize(EventWidth, EventHeight); + + // Must add the thumb size to the passed range to reach the maximum + // desired value. + int ThumbSize; + + ... [truncated message content] |
From: <pst...@us...> - 2008-04-20 00:33:07
|
Revision: 468 http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=468&view=rev Author: pstieber Date: 2008-04-19 17:33:04 -0700 (Sat, 19 Apr 2008) Log Message: ----------- Added the new source modules to the projects. Modified Paths: -------------- trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj Modified: trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj =================================================================== --- trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj 2008-04-20 00:00:32 UTC (rev 467) +++ trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj 2008-04-20 00:33:04 UTC (rev 468) @@ -733,6 +733,14 @@ > </File> <File + RelativePath="..\src\StringUtilities.cpp" + > + </File> + <File + RelativePath="..\src\StringUtilities.h" + > + </File> + <File RelativePath="..\src\Synth.cpp" > </File> @@ -822,6 +830,14 @@ Name="Dialog Source Files" > <File + RelativePath="..\src\Dialogs\KeyOnDialog.cpp" + > + </File> + <File + RelativePath="..\src\Dialogs\KeyOnDialog.h" + > + </File> + <File RelativePath="..\src\Dialogs\MetronomeSettingsDialog.cpp" > </File> Modified: trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj =================================================================== --- trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2008-04-20 00:00:32 UTC (rev 467) +++ trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2008-04-20 00:33:04 UTC (rev 468) @@ -732,6 +732,14 @@ > </File> <File + RelativePath="..\src\StringUtilities.cpp" + > + </File> + <File + RelativePath="..\src\StringUtilities.h" + > + </File> + <File RelativePath="..\src\Synth.cpp" > </File> @@ -821,6 +829,14 @@ Name="Dialog Source Files" > <File + RelativePath="..\src\Dialogs\KeyOnDialog.cpp" + > + </File> + <File + RelativePath="..\src\Dialogs\KeyOnDialog.h" + > + </File> + <File RelativePath="..\src\Dialogs\MetronomeSettingsDialog.cpp" > </File> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pst...@us...> - 2008-04-21 13:49:28
|
Revision: 473 http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=473&view=rev Author: pstieber Date: 2008-04-21 06:49:25 -0700 (Mon, 21 Apr 2008) Log Message: ----------- Added the track dialog to the build. This is a WIP. Modified Paths: -------------- trunk/jazz/src/Makefile.am trunk/jazz/src/Track.cpp trunk/jazz/src/TrackWindow.cpp trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj Modified: trunk/jazz/src/Makefile.am =================================================================== --- trunk/jazz/src/Makefile.am 2008-04-21 05:29:47 UTC (rev 472) +++ trunk/jazz/src/Makefile.am 2008-04-21 13:49:25 UTC (rev 473) @@ -21,6 +21,7 @@ Dialogs/KeyOnDialog.cpp \ Dialogs/MetronomeSettingsDialog.cpp \ Dialogs/SynthesizerSettingsDialog.cpp \ +Dialogs/TrackDialog.cpp \ Dialogs.cpp \ DynamicArray.cpp \ ErrorMessage.cpp \ @@ -99,6 +100,7 @@ Dialogs/KeyOnDialog.h \ Dialogs/MetronomeSettingsDialog.h \ Dialogs/SynthesizerSettingsDialog.h \ +Dialogs/TrackDialog.h \ Dialogs.h \ DynamicArray.h \ ErrorMessage.h \ Modified: trunk/jazz/src/Track.cpp =================================================================== --- trunk/jazz/src/Track.cpp 2008-04-21 05:29:47 UTC (rev 472) +++ trunk/jazz/src/Track.cpp 2008-04-21 13:49:25 UTC (rev 473) @@ -27,10 +27,10 @@ #include "Configuration.h" #include "Player.h" #include "JazzPlusPlusApplication.h" -//#include "eventwin.h" #include "TrackWindow.h" #include "Globals.h" #include "Song.h" +#include "Dialogs/TrackDialog.h" #include <cstdlib> #include <assert.h> @@ -1902,26 +1902,17 @@ #endif // OBSOLETE -void JZTrack::Dialog(JZTrackWindow *parent) +void JZTrack::Dialog(JZTrackWindow* pParent) { + JZTrackDialog TrackDialog(*this, pParent); + TrackDialog.ShowModal(); #ifdef OBSOLETE - - tTrackDlg *dlg; - if (DialogBox) - { - DialogBox->Show(true); - return; - } -#ifdef __WXMSW__ - bool modal = true; // keep button down -#else - bool modal = false; -#endif - DialogBox = new wxDialogBox(parent, "Track Settings", modal, Config(C_TrackDlgXpos), Config(C_TrackDlgYpos)); - dlg = new tTrackDlg((JZTrackWindow*) parent, this); - dlg->EditForm(DialogBox); - DialogBox->Fit(); - DialogBox->Show(TRUE); + DialogBox = new wxDialogBox( + pParent, + "Track Settings", + modal, + Config(C_TrackDlgXpos), + Config(C_TrackDlgYpos)); #endif // OBSOLETE } Modified: trunk/jazz/src/TrackWindow.cpp =================================================================== --- trunk/jazz/src/TrackWindow.cpp 2008-04-21 05:29:47 UTC (rev 472) +++ trunk/jazz/src/TrackWindow.cpp 2008-04-21 13:49:25 UTC (rev 473) @@ -342,7 +342,19 @@ { ToggleTrackState(Point); } + // Check to see if the mouse was clicked inside of a track name. else if ( + Point.x >= mTrackNameX && + Point.x < mTrackNameX + mTrackNameWidth) + { + // Edit the track settings. + JZTrack* pTrack = y2Track(Point.y); + if (pTrack) + { + pTrack->Dialog(this); + } + } + else if ( Point.x >= mEventsX && Point.x < mEventsX + mEventsWidth && Point.y >= mEventsY && Point.y < mEventsY + mEventsHeight) { Modified: trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj =================================================================== --- trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj 2008-04-21 05:29:47 UTC (rev 472) +++ trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj 2008-04-21 13:49:25 UTC (rev 473) @@ -853,6 +853,14 @@ RelativePath="..\src\Dialogs\SynthesizerSettingsDialog.h" > </File> + <File + RelativePath="..\src\Dialogs\TrackDialog.cpp" + > + </File> + <File + RelativePath="..\src\Dialogs\TrackDialog.h" + > + </File> </Filter> </Files> <Globals> Modified: trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj =================================================================== --- trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2008-04-21 05:29:47 UTC (rev 472) +++ trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2008-04-21 13:49:25 UTC (rev 473) @@ -852,6 +852,14 @@ RelativePath="..\src\Dialogs\SynthesizerSettingsDialog.h" > </File> + <File + RelativePath="..\src\Dialogs\TrackDialog.cpp" + > + </File> + <File + RelativePath="..\src\Dialogs\TrackDialog.h" + > + </File> </Filter> </Files> <Globals> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pst...@us...> - 2008-05-14 13:51:02
|
Revision: 525 http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=525&view=rev Author: pstieber Date: 2008-05-14 06:50:59 -0700 (Wed, 14 May 2008) Log Message: ----------- Moved and renamed the doc directory form jazz/doc to jazz/src/HelpFiles. Modified Paths: -------------- trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj Added Paths: ----------- trunk/jazz/src/HelpFiles/ Removed Paths: ------------- trunk/jazz/doc/ Copied: trunk/jazz/src/HelpFiles (from rev 523, trunk/jazz/doc) Modified: trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj =================================================================== --- trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2008-05-14 13:44:29 UTC (rev 524) +++ trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2008-05-14 13:50:59 UTC (rev 525) @@ -822,7 +822,7 @@ Filter="*.tex" > <File - RelativePath="..\doc\jazz.tex" + RelativePath="..\src\HelpFiles\jazz.tex" > <FileConfiguration Name="Debug GUI VC9|Win32" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pst...@us...> - 2008-05-27 04:05:09
|
Revision: 578 http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=578&view=rev Author: pstieber Date: 2008-05-26 21:05:06 -0700 (Mon, 26 May 2008) Log Message: ----------- Added the portmidi driver code. Modified Paths: -------------- trunk/jazz/vc8/JazzPlusPlus-VC8.sln trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj trunk/jazz/vc9/JazzPlusPlus-VC9.sln trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj Modified: trunk/jazz/vc8/JazzPlusPlus-VC8.sln =================================================================== --- trunk/jazz/vc8/JazzPlusPlus-VC8.sln 2008-05-27 04:03:59 UTC (rev 577) +++ trunk/jazz/vc8/JazzPlusPlus-VC8.sln 2008-05-27 04:05:06 UTC (rev 578) @@ -2,18 +2,46 @@ # Visual Studio 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "A JazzPlusPlus Application", "JazzPlusPlus-VC8.vcproj", "{8C82269C-4753-428B-B9B1-D21B46C6AD83}" ProjectSection(ProjectDependencies) = postProject + {33E3B196-B9F4-4D0A-85E1-31C7BBD4967A} = {33E3B196-B9F4-4D0A-85E1-31C7BBD4967A} + {338224B8-D575-408D-BACF-95C557B429BE} = {338224B8-D575-408D-BACF-95C557B429BE} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "porttime", "..\portmidi\porttime\porttime-VC8.vcproj", "{338224B8-D575-408D-BACF-95C557B429BE}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "portmidi", "..\portmidi\pm_win\portmidi-VC8.vcproj", "{33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug GUI VC8|Win32 = Debug GUI VC8|Win32 + Debug VC8|Win32 = Debug VC8|Win32 Release GUI VC8|Win32 = Release GUI VC8|Win32 + Release VC8|Win32 = Release VC8|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {8C82269C-4753-428B-B9B1-D21B46C6AD83}.Debug GUI VC8|Win32.ActiveCfg = Debug GUI VC8|Win32 {8C82269C-4753-428B-B9B1-D21B46C6AD83}.Debug GUI VC8|Win32.Build.0 = Debug GUI VC8|Win32 + {8C82269C-4753-428B-B9B1-D21B46C6AD83}.Debug VC8|Win32.ActiveCfg = Debug GUI VC8|Win32 + {8C82269C-4753-428B-B9B1-D21B46C6AD83}.Debug VC8|Win32.Build.0 = Debug GUI VC8|Win32 {8C82269C-4753-428B-B9B1-D21B46C6AD83}.Release GUI VC8|Win32.ActiveCfg = Release GUI VC8|Win32 {8C82269C-4753-428B-B9B1-D21B46C6AD83}.Release GUI VC8|Win32.Build.0 = Release GUI VC8|Win32 + {8C82269C-4753-428B-B9B1-D21B46C6AD83}.Release VC8|Win32.ActiveCfg = Release GUI VC8|Win32 + {8C82269C-4753-428B-B9B1-D21B46C6AD83}.Release VC8|Win32.Build.0 = Release GUI VC8|Win32 + {338224B8-D575-408D-BACF-95C557B429BE}.Debug GUI VC8|Win32.ActiveCfg = Debug VC8|Win32 + {338224B8-D575-408D-BACF-95C557B429BE}.Debug GUI VC8|Win32.Build.0 = Debug VC8|Win32 + {338224B8-D575-408D-BACF-95C557B429BE}.Debug VC8|Win32.ActiveCfg = Debug VC8|Win32 + {338224B8-D575-408D-BACF-95C557B429BE}.Debug VC8|Win32.Build.0 = Debug VC8|Win32 + {338224B8-D575-408D-BACF-95C557B429BE}.Release GUI VC8|Win32.ActiveCfg = Release VC8|Win32 + {338224B8-D575-408D-BACF-95C557B429BE}.Release GUI VC8|Win32.Build.0 = Release VC8|Win32 + {338224B8-D575-408D-BACF-95C557B429BE}.Release VC8|Win32.ActiveCfg = Release VC8|Win32 + {338224B8-D575-408D-BACF-95C557B429BE}.Release VC8|Win32.Build.0 = Release VC8|Win32 + {33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Debug GUI VC8|Win32.ActiveCfg = Debug VC8|Win32 + {33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Debug GUI VC8|Win32.Build.0 = Debug VC8|Win32 + {33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Debug VC8|Win32.ActiveCfg = Debug VC8|Win32 + {33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Debug VC8|Win32.Build.0 = Debug VC8|Win32 + {33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Release GUI VC8|Win32.ActiveCfg = Release VC8|Win32 + {33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Release GUI VC8|Win32.Build.0 = Release VC8|Win32 + {33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Release VC8|Win32.ActiveCfg = Release VC8|Win32 + {33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Release VC8|Win32.Build.0 = Release VC8|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE Modified: trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj =================================================================== --- trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj 2008-05-27 04:03:59 UTC (rev 577) +++ trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj 2008-05-27 04:05:06 UTC (rev 578) @@ -557,6 +557,14 @@ > </File> <File + RelativePath="..\src\PortMidiPlayer.cpp" + > + </File> + <File + RelativePath="..\src\PortMidiPlayer.h" + > + </File> + <File RelativePath="..\src\Project.cpp" > </File> Modified: trunk/jazz/vc9/JazzPlusPlus-VC9.sln =================================================================== --- trunk/jazz/vc9/JazzPlusPlus-VC9.sln 2008-05-27 04:03:59 UTC (rev 577) +++ trunk/jazz/vc9/JazzPlusPlus-VC9.sln 2008-05-27 04:05:06 UTC (rev 578) @@ -1,17 +1,47 @@ Microsoft Visual Studio Solution File, Format Version 10.00 # Visual Studio 2008 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "A JazzPlusPlus Application", "JazzPlusPlus-VC9.vcproj", "{8C82269C-4753-428B-B9B1-D21B46C6AD83}" + ProjectSection(ProjectDependencies) = postProject + {33E3B196-B9F4-4D0A-85E1-31C7BBD4967A} = {33E3B196-B9F4-4D0A-85E1-31C7BBD4967A} + {338224B8-D575-408D-BACF-95C557B429BE} = {338224B8-D575-408D-BACF-95C557B429BE} + EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "portmidi", "..\portmidi\pm_win\portmidi-VC9.vcproj", "{33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "porttime", "..\portmidi\porttime\porttime-VC9.vcproj", "{338224B8-D575-408D-BACF-95C557B429BE}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug GUI VC9|Win32 = Debug GUI VC9|Win32 + Debug VC8|Win32 = Debug VC8|Win32 Release GUI VC9|Win32 = Release GUI VC9|Win32 + Release VC8|Win32 = Release VC8|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {8C82269C-4753-428B-B9B1-D21B46C6AD83}.Debug GUI VC9|Win32.ActiveCfg = Debug GUI VC9|Win32 {8C82269C-4753-428B-B9B1-D21B46C6AD83}.Debug GUI VC9|Win32.Build.0 = Debug GUI VC9|Win32 + {8C82269C-4753-428B-B9B1-D21B46C6AD83}.Debug VC8|Win32.ActiveCfg = Debug GUI VC9|Win32 + {8C82269C-4753-428B-B9B1-D21B46C6AD83}.Debug VC8|Win32.Build.0 = Debug GUI VC9|Win32 {8C82269C-4753-428B-B9B1-D21B46C6AD83}.Release GUI VC9|Win32.ActiveCfg = Release GUI VC9|Win32 {8C82269C-4753-428B-B9B1-D21B46C6AD83}.Release GUI VC9|Win32.Build.0 = Release GUI VC9|Win32 + {8C82269C-4753-428B-B9B1-D21B46C6AD83}.Release VC8|Win32.ActiveCfg = Release GUI VC9|Win32 + {8C82269C-4753-428B-B9B1-D21B46C6AD83}.Release VC8|Win32.Build.0 = Release GUI VC9|Win32 + {33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Debug GUI VC9|Win32.ActiveCfg = Debug VC8|Win32 + {33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Debug GUI VC9|Win32.Build.0 = Debug VC8|Win32 + {33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Debug VC8|Win32.ActiveCfg = Debug VC8|Win32 + {33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Debug VC8|Win32.Build.0 = Debug VC8|Win32 + {33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Release GUI VC9|Win32.ActiveCfg = Release VC8|Win32 + {33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Release GUI VC9|Win32.Build.0 = Release VC8|Win32 + {33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Release VC8|Win32.ActiveCfg = Release VC8|Win32 + {33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Release VC8|Win32.Build.0 = Release VC8|Win32 + {338224B8-D575-408D-BACF-95C557B429BE}.Debug GUI VC9|Win32.ActiveCfg = Debug VC8|Win32 + {338224B8-D575-408D-BACF-95C557B429BE}.Debug GUI VC9|Win32.Build.0 = Debug VC8|Win32 + {338224B8-D575-408D-BACF-95C557B429BE}.Debug VC8|Win32.ActiveCfg = Debug VC8|Win32 + {338224B8-D575-408D-BACF-95C557B429BE}.Debug VC8|Win32.Build.0 = Debug VC8|Win32 + {338224B8-D575-408D-BACF-95C557B429BE}.Release GUI VC9|Win32.ActiveCfg = Release VC8|Win32 + {338224B8-D575-408D-BACF-95C557B429BE}.Release GUI VC9|Win32.Build.0 = Release VC8|Win32 + {338224B8-D575-408D-BACF-95C557B429BE}.Release VC8|Win32.ActiveCfg = Release VC8|Win32 + {338224B8-D575-408D-BACF-95C557B429BE}.Release VC8|Win32.Build.0 = Release VC8|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE Modified: trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj =================================================================== --- trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2008-05-27 04:03:59 UTC (rev 577) +++ trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2008-05-27 04:05:06 UTC (rev 578) @@ -557,6 +557,14 @@ > </File> <File + RelativePath="..\src\PortMidiPlayer.cpp" + > + </File> + <File + RelativePath="..\src\PortMidiPlayer.h" + > + </File> + <File RelativePath="..\src\Project.cpp" > </File> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pst...@us...> - 2008-06-12 20:16:59
|
Revision: 599 http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=599&view=rev Author: pstieber Date: 2008-06-12 13:16:54 -0700 (Thu, 12 Jun 2008) Log Message: ----------- Added files and autotools commands to build and install the help files on a Linux box. Modified Paths: -------------- trunk/jazz/configure.ac trunk/jazz/src/Makefile.am Added Paths: ----------- trunk/jazz/src/HelpFiles/Makefile.am trunk/jazz/src/HelpFiles/images/Makefile.am Modified: trunk/jazz/configure.ac =================================================================== --- trunk/jazz/configure.ac 2008-06-12 20:15:36 UTC (rev 598) +++ trunk/jazz/configure.ac 2008-06-12 20:16:54 UTC (rev 599) @@ -231,5 +231,11 @@ LDFLAGS="$LDFLAGS $WX_LIBS" -AC_CONFIG_FILES([Makefile src/Makefile conf/Makefile]) +AC_CONFIG_FILES([\ +Makefile src/Makefile \ +src/HelpFiles/Makefile \ +src/HelpFiles/images/Makefile \ +conf/Makefile \ +]) + AC_OUTPUT Added: trunk/jazz/src/HelpFiles/Makefile.am =================================================================== --- trunk/jazz/src/HelpFiles/Makefile.am (rev 0) +++ trunk/jazz/src/HelpFiles/Makefile.am 2008-06-12 20:16:54 UTC (rev 599) @@ -0,0 +1,28 @@ +SUBDIRS = images + +SUFFIXES= .o .tex + +.tex.o: + export TEXINPUTS=.; tex2rtf $< $*.html -html -twice + touch $@ + +noinst_LIBRARIES = libphony.a + +libphony_a_SOURCES = jazz.tex + +helpdir = ${prefix}/bin/HelpFiles + +make-install-dirs: + -if test '!' -d $(helpdir); then mkdir -p $(helpdir); fi + +install-data-hook: make-install-dirs + -@ echo Installing $(helpdir) ; \ + $(INSTALL_DATA) $(srcdir)/*.gif $(helpdir) ; \ + $(INSTALL_DATA) $(srcdir)/*.png $(helpdir) ; \ + $(INSTALL_DATA) *.html $(helpdir) ; \ + $(INSTALL_DATA) *.hhc $(helpdir) ; \ + $(INSTALL_DATA) *.hhk $(helpdir) ; \ + $(INSTALL_DATA) *.hhp $(helpdir) ; \ + $(INSTALL_DATA) *.htx $(helpdir) ; \ + $(INSTALL_DATA) *.con $(helpdir) ; \ + $(INSTALL_DATA) *.ref $(helpdir) Property changes on: trunk/jazz/src/HelpFiles/Makefile.am ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/jazz/src/HelpFiles/images/Makefile.am =================================================================== --- trunk/jazz/src/HelpFiles/images/Makefile.am (rev 0) +++ trunk/jazz/src/HelpFiles/images/Makefile.am 2008-06-12 20:16:54 UTC (rev 599) @@ -0,0 +1,8 @@ +helpimagesdir = ${prefix}/bin/HelpFiles/images + +make-install-dirs : + -if test '!' -d $(helpimagesdir); then mkdir -p $(helpimagesdir); fi + +install-data-hook : make-install-dirs + -@ echo Installing $(helpimagesdir) ; \ + $(INSTALL_DATA) $(srcdir)/*.png $(helpimagesdir) Property changes on: trunk/jazz/src/HelpFiles/images/Makefile.am ___________________________________________________________________ Name: svn:eol-style + native Modified: trunk/jazz/src/Makefile.am =================================================================== --- trunk/jazz/src/Makefile.am 2008-06-12 20:15:36 UTC (rev 598) +++ trunk/jazz/src/Makefile.am 2008-06-12 20:16:54 UTC (rev 599) @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in +SUBDIRS = HelpFiles + bin_PROGRAMS = jazz if USE_ALSA This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |