[gsharp-cvs] CVS update: gsharp/buffer.lisp gsharp/gui.lisp gsharp/packages.lisp

[Robert Strandh]

Update of /project/gsharp/cvsroot/gsharp
In directory common-lisp.net:/tmp/cvs-serv15881

Modified Files:
	buffer.lisp gui.lisp packages.lisp 
Log Message:
Removed make-lyrics-element and make-empty-segment

Date: Mon Oct 31 22:16:04 2005
Author: rstrandh

Index: gsharp/buffer.lisp
diff -u gsharp/buffer.lisp:1.17 gsharp/buffer.lisp:1.18
--- gsharp/buffer.lisp:1.17	Mon Oct 31 21:48:17 2005
+++ gsharp/buffer.lisp	Mon Oct 31 22:16:03 2005
@@ -363,11 +363,6 @@
 	 (setf text (make-array length :adjustable t :element-type 'fixnum
 				:fill-pointer length :initial-contents text))))))
 
-(defun make-lyrics-element (rbeams lbeams dots notehead staff)
-  (make-instance 'lyrics-element
-     :rbeams rbeams :lbeams lbeams :dots dots
-     :notehead notehead :staff staff))
-
 (defmethod print-object :after ((elem lyrics-element) stream)
   (with-slots (staff text) elem
      (format stream ":staff ~W :text ~W " staff text)))
@@ -462,9 +457,6 @@
 (defclass melody-bar (bar)
   ((print-character :allocation :class :initform #\|)))
 
-(defun make-melody-bar ()
-  (make-instance 'melody-bar))
-
 (defun read-melody-bar-v3 (stream char n)
   (declare (ignore char n))
   (apply #'make-instance 'melody-bar (read-delimited-list #\] stream t)))
@@ -476,9 +468,6 @@
 (defclass lyrics-bar (bar)
   ((print-character :allocation :class :initform #\C)))
 
-(defun make-lyrics-bar ()
-  (make-instance 'lyrics-bar))
-
 (defun read-lyrics-bar-v3 (stream char n)
   (declare (ignore char n))
   (apply #'make-instance 'lyrics-bar (read-delimited-list #\] stream t)))
@@ -522,9 +511,6 @@
 (defmethod print-object :after ((s slice) stream)
   (format stream ":bars ~W " (bars s)))
 
-(defun make-empty-slice ()
-  (make-instance 'slice))
-
 (defun read-slice-v3 (stream char n)
   (declare (ignore char n))
   (apply #'make-instance 'slice (read-delimited-list #\] stream t)))
@@ -633,7 +619,7 @@
 
 (defmethod make-layer (name (initial-staff fiveline-staff))
   (flet ((make-initialized-slice ()
-	   (let ((slice (make-empty-slice)))
+	   (let ((slice (make-instance 'slice)))
 	     (add-bar (make-instance 'melody-bar) slice 0)
 	     slice)))
     (let* ((head (make-initialized-slice))
@@ -662,7 +648,7 @@
 
 (defmethod make-layer (name (initial-staff lyrics-staff))
   (flet ((make-initialized-slice ()
-	   (let ((slice (make-empty-slice)))
+	   (let ((slice (make-instance 'slice)))
 	     (add-bar (make-instance 'lyrics-bar) slice 0)
 	     slice)))
     (let* ((head (make-initialized-slice))
@@ -767,11 +753,8 @@
 (defmethod print-object :after ((s segment) stream)
   (format stream ":layers ~W " (layers s)))
 
-(defun make-empty-segment ()
-  (make-instance 'segment))
-
 (defun make-initialized-segment (staff)
-  (let ((segment (make-empty-segment)))
+  (let ((segment (make-instance 'segment)))
     (add-layer (make-layer "Default layer" staff) segment)
     segment))
 


Index: gsharp/gui.lisp
diff -u gsharp/gui.lisp:1.33 gsharp/gui.lisp:1.34
--- gsharp/gui.lisp:1.33	Mon Oct 31 21:48:17 2005
+++ gsharp/gui.lisp	Mon Oct 31 22:16:04 2005
@@ -1130,12 +1130,12 @@
 (defun insert-lyrics-element ()
   (let* ((state (input-state *application-frame*))
 	 (cursor (cursor *application-frame*))
-	 (element (make-lyrics-element
-		   (if (eq (notehead state) :filled) (rbeams state) 0)
-		   (if (eq (notehead state) :filled) (lbeams state) 0)
-		   (dots state)
-		   (notehead state)
-		   (car (staves (layer (cursor *application-frame*)))))))
+	 (element (make-instance 'lyrics-element
+		    :rbeams (if (eq (notehead state) :filled) (rbeams state) 0)
+		    :lbeams (if (eq (notehead state) :filled) (lbeams state) 0)
+		    :dots (dots state)
+		    :notehead (notehead state)
+		    :staff (car (staves (layer (cursor *application-frame*)))))))
     (insert-element element cursor)
     (forward-element cursor)
     element))


Index: gsharp/packages.lisp
diff -u gsharp/packages.lisp:1.19 gsharp/packages.lisp:1.20
--- gsharp/packages.lisp:1.19	Mon Oct 31 21:48:17 2005
+++ gsharp/packages.lisp	Mon Oct 31 22:16:04 2005
@@ -45,7 +45,7 @@
 	   #:notehead #:rbeams #:lbeams #:dots #:element
 	   #:melody-element #:notes
 	   #:add-note #:find-note #:remove-note #:cluster
-	   #:rest #:lyrics-element #:make-lyrics-element
+	   #:rest #:lyrics-element
 	   #:slice #:elements
 	   #:nb-elements #:elementno #:add-element
 	   #:remove-element #:bar #:make-bar
@@ -58,7 +58,7 @@
 	   #:make-empty-buffer #:make-initialized-buffer 
 	   #:layers #:nb-layers #:layerno
 	   #:add-layer #:remove-layer #:segment
-	   #:make-empty-segment #:make-initialized-segment
+	   #:make-initialized-segment
 	   #:segments #:nb-segments #:segmentno #:staves
 	   #:find-staff #:add-segment #:remove-segment
 	   #:add-staff-before-staff #:add-staff-after-staff