summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremiah Benham <jjbenham@chicagoguitar.com>2011-02-11 18:36:40 -0600
committerJeremiah Benham <jjbenham@chicagoguitar.com>2011-02-11 18:36:40 -0600
commit3ec38292108d0ee4373229c4707082fa88ee1134 (patch)
treeeedaa6c5caf71e26649a7520a64c457dcdf841bb
parent278d9355b2ab265794803d4dbab183db90ad534e (diff)
parent0138fd5e65c3238c73428c3143679c2606c0ded2 (diff)
Merge branch 'ImportExportPrint'
-rw-r--r--src/file.c6
-rw-r--r--src/importmidi.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/file.c b/src/file.c
index 09446b09..97f16704 100644
--- a/src/file.c
+++ b/src/file.c
@@ -619,7 +619,7 @@ file_import_lilypond_with_check (GtkAction * action, DenemoScriptParam * param)
DenemoGUI *gui = Denemo.gui;
if (!gui->notsaved || (gui->notsaved && (confirmbox (gui))))
{
- param->status = !file_import_lilypond (gui, FALSE, REPLACE_SCORE, filename);
+ param->status = !file_import_lilypond (gui, FALSE, ADD_MOVEMENTS, filename);
}
}
@@ -641,7 +641,7 @@ file_import_midi_with_check (GtkAction * action, DenemoScriptParam * param)
DenemoGUI *gui = Denemo.gui;
if (!gui->notsaved || (gui->notsaved && (confirmbox (gui))))
{
- param->status = !file_import_midi (gui, FALSE, REPLACE_SCORE, filename);
+ param->status = !file_import_midi (gui, FALSE, ADD_MOVEMENTS, filename);
}
}
@@ -663,7 +663,7 @@ file_import_musicxml_with_check (GtkAction * action, DenemoScriptParam * param)
DenemoGUI *gui = Denemo.gui;
if (!gui->notsaved || (gui->notsaved && (confirmbox (gui))))
{
- param->status = !file_import_musicxml (gui, FALSE, REPLACE_SCORE, filename);
+ param->status = !file_import_musicxml (gui, FALSE, ADD_MOVEMENTS, filename);
}
}
diff --git a/src/importmidi.c b/src/importmidi.c
index 874236bd..55134ce4 100644
--- a/src/importmidi.c
+++ b/src/importmidi.c
@@ -692,11 +692,11 @@ ConvertNoteType2ticks(gint ppqn, notetype *gnotetype){
gint
importMidi (gchar *filename, DenemoGUI *gui)
{
+ call_out_to_guile("(d-NewWindow)");
+
smf_t *smf;
gint ret = 0; // (-1 on failure)
- /* delete old data in the score */
- deletescore (NULL, gui);
/* load the file */
smf = cmd_load(filename);
if(!smf)