"vanishing comment" bugfix - README file

GUI/Widgets/Fl_CommentGUI.C

@@ -25,10 +25,12 @@ Fl_CommentGUI::Fl_CommentGUI(const DeviceGUIInfo& Info, SpiralGUIType *PW, Fl_Pi
 Fl_DeviceGUI(Info,PW,Icon),
 m_Comment("double click to edit.")
 {
-	box(FL_NO_BOX);
-	m_DragBar->box(FL_NO_BOX);
+        // If you comment this out - it makes the comment look nice, or does it?
+        box(FL_NO_BOX);
+        //m_DragBar->box(FL_NO_BOX);
 	m_DragBar->label(m_Comment.c_str());
 	m_DragBar->color(SpiralInfo::GUICOL_Device);
+        NewText();
 //	m_DragBar->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE);
 }
 
@@ -42,25 +44,17 @@ int Fl_CommentGUI::handle(int event)
 			string temp(t);
 			if (temp!="")
 			{
-				m_Comment=temp;	
-				m_DragBar->label(m_Comment.c_str());
-				int width,height;
-				fl_font(fl_font(),10);
-				fl_measure(m_Comment.c_str(),width,height);
-				m_DragBar->size(width,height);
-				resize(x(),y(),width,height);
+				m_Comment=temp;
+                                NewText();
 				redraw();
-				parent()->redraw();
-				//int x,y;
-				//fl_measure(m_Comment.c_str(),x,y);
-				//m_DragBar->size(x,y);
+				//parent()->redraw();
 			}
 		}
 	}
-	
+
 	return Fl_DeviceGUI::handle(event);
-}			
-	
+}
+
 void Fl_CommentGUI::Setup(const DeviceGUIInfo& Info, bool FirstTime)
 {
 	Fl_DeviceGUI::Setup(Info,FirstTime);
@@ -71,6 +65,17 @@ void Fl_CommentGUI::Clear()
 	Fl_DeviceGUI::Clear();
 }
 
+void Fl_CommentGUI::NewText(void) {
+	m_DragBar->label(m_Comment.c_str());
+	int width=0, height=0;
+	fl_font(fl_font(),10);
+	fl_measure(m_Comment.c_str(),width,height);
+        width+=10;
+	m_DragBar->size(width,height);
+	resize(x(),y(),width,height);
+}
+
+
 void Fl_CommentGUI::StreamOut(ostream &s)
 {
 	s<<1<<" ";
@@ -82,7 +87,7 @@ void Fl_CommentGUI::StreamIn(istream &s)
 {
 	unsigned int size,version;
 	string temp;
-	
+
 	s>>version;
 	s>>size;
 	size++; // see below
@@ -92,13 +97,7 @@ void Fl_CommentGUI::StreamIn(istream &s)
 	// have to move the pointer on by one, as the string
 	// starts with " ", as the file pointer starts on
 	// a blank space (after streaming the size)
-	m_Comment=str+1; 
+	m_Comment=str+1;
 	delete[] str;
-	
-	m_DragBar->label(m_Comment.c_str());
-	int width,height;
-	fl_font(fl_font(),10);
-	fl_measure(m_Comment.c_str(),width,height);
-	m_DragBar->size(width,height);
-	resize(x(),y(),width,height);
+        NewText();
 }

GUI/Widgets/Fl_CommentGUI.h

@@ -14,7 +14,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/ 
+*/
 
 #ifndef COMMENTGUI
 #define COMMENTGUI
@@ -26,16 +26,15 @@ class Fl_CommentGUI : public Fl_DeviceGUI
 {
 public:
 	Fl_CommentGUI(const DeviceGUIInfo& Info, SpiralGUIType *PW, Fl_Pixmap *Icon);
-
 	virtual int  handle(int event);
-	virtual void Setup(const DeviceGUIInfo& Info, bool FirstTime = false); 
+	virtual void Setup(const DeviceGUIInfo& Info, bool FirstTime = false);
 	virtual void Clear();
-	
 	virtual void	    StreamOut(ostream &s);
 	virtual void	    StreamIn(istream &s);
 protected:
-
 	string m_Comment;
+private:
+        void NewText(void);
 };
 
 #endif

README

@@ -1,10 +1,12 @@
 ** SpiralSynthModular **
 
-Last changed Saturday December 11 2002.
+Last changed Saturday 20-December-2003.
 
 SpiralSynthModular is open source software, distributed under the General
 Public License (GPL). See the file COPYING.
 
+See www.pawfal.org or sourceforge.net/projects/spiralmodular for more details.
+
 
 ** Dependancies **
 
@@ -15,7 +17,6 @@ LADSPA plugins  (www.ladspa.org)
 
 Sound output can be provided by either OSS or JACK (and therefore alsa).
 
-See www.pawfal.org or sourceforge.net/projects/spiralmodular for more details.
 
 ** Installing **
 
@@ -41,6 +42,7 @@ options list:
 --Realtime : spawn audio thread with FIFO scheduling (run as root)
 --PluginPath <PATH> : look for plugins in the specified directory
 
+
 *** LRDF support for LADSPA plugins ***
 
 http://plugin.org.uk/releases/lrdf/
@@ -58,14 +60,32 @@ plugin database to be shared between instances.
 To disable detection of this, use the configure option:
 ./configure --disable-posiz-shm
 
+
 *** Jack support ***
 
 http://jackit.sourceforge.net
 
-To build the JackPlugin, use the configure option:
-./configure --enable-jack
+If you have jack installed on your system, you can use it via the
+JackPlugin.
+
+To load the plugin, add it to .SpiralSynthModular's plugin list after
+installation.
+
+To disable detection of jack, use the configure option:
+./configure --disable-jack
+
+
+*** LibSndFile Support ***
+
+http://www.zip.com.au/~erikd/libsndfile/
+
+If you have libsndfile installed on you system; PoshSampler, Streamer,
+and SpiralLoops load any audio format/file that libsndfile can, though
+the Open Dialog Filter currently doesn't reflect this.
+
+To disable detection of jack, use the configure option:
+./configure --disable-sndfile
 
-To load the plugin, add it to .SpiralSynthModular's plugin list.
 
 *** Setting up your .SpiralSynthModular file ***
 
@@ -90,5 +110,7 @@ for any purpose. This software is provided "as is" without express
 or implied warranty.
 (Damage to ears, speakers or buildings are not my fault :))
 
-Dave Griffiths - dave@pawfal.org
+Dave Griffiths (Headmaster) - dave@pawfal.org
+Andy Preston (Caretaker) - edgeeffect@sourceforge.net
+
 www.pawfal.org

configure.in

@@ -64,7 +64,7 @@ if test "$build_jack" = "y"; then
    AC_CHECK_LIB(jack, jack_client_new, [build_jack="y"], [build_jack="n" ; jack_message="No libjack found"])
 fi
 if test $build_jack = "y" ; then
-   PLUGINLIST="$PLUGINLIST JackPlugin"
+   PLUGINLIST="JackPlugin $PLUGINLIST"
 fi
 
 dnl build plugin list