xtreme programming step1 : gestion des fichiers xml dans la boîte de dialogue d'ouver...

[minwii.git] / src / songs / musicxmltosong.py

diff --git a/src/songs/musicxmltosong.py b/src/songs/musicxmltosong.py
index 0d4bb99..39df188 100755 (executable)
--- a/src/songs/musicxmltosong.py
+++ b/src/songs/musicxmltosong.py
@@ -9,7 +9,7 @@ import sys
 from types import StringTypes
 from xml.dom.minidom import parse
 from optparse import OptionParser
 from types import StringTypes
 from xml.dom.minidom import parse
 from optparse import OptionParser

-from Song import Song
+#from Song import Song

 
 # Do4 <=> midi 60
 OCTAVE_REF = 4
 
 # Do4 <=> midi 60
 OCTAVE_REF = 4


@@ -192,7 +192,7 @@ def _getNodeValue(node, path, default=_marker) :
         else :
             return default
 
         else :
             return default
 

-def musicXml2Song(input, output, partIndex=0, printNotes=False) :
+def musicXml2Song(input, partIndex=0, printNotes=False) :

     if isinstance(input, StringTypes) :
         input = open(input, 'r')
     
     if isinstance(input, StringTypes) :
         input = open(input, 'r')
     


@@ -209,6 +209,9 @@ def musicXml2Song(input, output, partIndex=0, printNotes=False) :
     
     if printNotes :
         part.pprint()
     
     if printNotes :
         part.pprint()

+
+    return part
+

     
     # divisions de la noire
 #    divisions = 0
     
     # divisions de la noire
 #    divisions = 0


@@ -245,10 +248,10 @@ def main() :
     
     options, args = op.parse_args()
     
     
     options, args = op.parse_args()
     

-    if len(args) != 2 :
+    if len(args) != 1 :

         raise SystemExit(op.format_help())
     
         raise SystemExit(op.format_help())
     

-    musicXml2Song(args[0], args[1], partIndex=options.partIndex, printNotes=options.printNotes)
+    musicXml2Song(args[0], partIndex=options.partIndex, printNotes=options.printNotes)