5 files changed, 39 insertions, 60 deletions

diff --git a/audio/denemo/files/patch-src__audiointerface.h b/audio/denemo/files/patch-src__audiointerface.h
deleted file mode 100644
index 2c43223e7b04..000000000000
--- a/audio/denemo/files/patch-src__audiointerface.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/audiointerface.h.orig	2012-09-20 22:44:28.775017000 +0900
-+++ src/audiointerface.h	2012-10-05 06:05:30.000000000 +0900
-@@ -228,6 +228,9 @@
- gboolean read_event_from_queue(backend_type_t backend, unsigned char *event_buffer, size_t *event_length,
-                                double *event_time, double until_time);
- 
-+gboolean read_event_from_mixer_queue(backend_type_t backend, unsigned char *event_buffer, size_t *event_length,
-+                               double *event_time, double until_time);
-+
- /**
-  * Called by a backend to notify the audio subsystem that the current playback
-  * time changed. Usually this is called once per period during playback.
diff --git a/audio/denemo/files/patch-src__dummybackend.c b/audio/denemo/files/patch-src__dummybackend.c
index 7802b85cc4db..c122af3c253e 100644
--- a/audio/denemo/files/patch-src__dummybackend.c
+++ b/audio/denemo/files/patch-src__dummybackend.c
@@ -17,51 +17,53 @@
  
  
 +#if 0
- static gpointer process_thread_func(gpointer data) {
-   GMutex *mutex = g_mutex_new();
- 
-@@ -102,12 +105,15 @@
-     process_thread = NULL;
-   }
+ static gpointer
+ process_thread_func (gpointer data)
+ {
+@@ -118,6 +121,7 @@
+       process_thread = NULL;
+     }
  }
 +#endif
  
  
- static int dummy_audio_initialize(DenemoPrefs *config) {
-   g_print("initializing dummy audio backend\n");
+ static int
+@@ -125,7 +129,9 @@
+ {
+   g_print ("initializing dummy audio backend\n");
  
 +#if 0
-   start_process_thread();
+   start_process_thread ();
 +#endif
  
-   g_atomic_int_set(&dummy_audio, TRUE);
+   g_atomic_int_set (&dummy_audio, TRUE);
  
-@@ -117,7 +123,9 @@
- static int dummy_midi_initialize(DenemoPrefs *config) {
-   g_print("initializing dummy MIDI backend\n");
+@@ -137,7 +143,9 @@
+ {
+   g_print ("initializing dummy MIDI backend\n");
  
 +#if 0
-   start_process_thread();
+   start_process_thread ();
 +#endif
  
-   g_atomic_int_set(&dummy_midi, TRUE);
+   g_atomic_int_set (&dummy_midi, TRUE);
  
-@@ -130,7 +138,9 @@
+@@ -152,7 +160,9 @@
  
-   g_atomic_int_set(&dummy_audio, FALSE);
+   g_atomic_int_set (&dummy_audio, FALSE);
  
 +#if 0
-   stop_process_thread();
+   stop_process_thread ();
 +#endif
  
    return 0;
  }
-@@ -140,7 +150,9 @@
+@@ -164,7 +174,9 @@
  
-   g_atomic_int_set(&dummy_midi, FALSE);
+   g_atomic_int_set (&dummy_midi, FALSE);
  
 +#if 0
-   stop_process_thread();
+   stop_process_thread ();
 +#endif
  
    return 0;
diff --git a/audio/denemo/files/patch-src__file.c b/audio/denemo/files/patch-src__file.c
index 66732c931944..852284b6f837 100644
--- a/audio/denemo/files/patch-src__file.c
+++ b/audio/denemo/files/patch-src__file.c
@@ -1,11 +1,11 @@
 --- src/file.c.orig
 +++ src/file.c
-@@ -556,7 +556,7 @@
-     default_template_path = local_template_path;   
-   } else if(local==EXAMPLE){
-     if(system_example_path==NULL) {
--      system_example_path = g_build_filename (get_data_dir (), "examples", NULL);
-+      system_example_path = g_build_filename (get_data_dir (), "..", "examples", "denemo", NULL);
-       GDir *denemo_path = g_dir_open(system_example_path, 0, NULL);
-       if(denemo_path == NULL) {
- 	warningdialog ("No examples directory in installation");
+@@ -571,7 +571,7 @@
+     {
+       if (system_example_path == NULL)
+         {
+-          system_example_path = g_build_filename (get_data_dir (), "examples", NULL);
++          system_example_path = g_build_filename (get_data_dir (), "..", "examples", NULL);
+           GDir *denemo_path = g_dir_open (system_example_path, 0, NULL);
+           if (denemo_path == NULL)
+             {
diff --git a/audio/denemo/files/patch-src__mousing.c b/audio/denemo/files/patch-src__mousing.c
index 04e9c8654550..b194501a2bdb 100644
--- a/audio/denemo/files/patch-src__mousing.c
+++ b/audio/denemo/files/patch-src__mousing.c
@@ -1,16 +1,15 @@
 --- src/mousing.c.orig	2011-09-28 05:03:47.000000000 +0200
 +++ src/mousing.c	2011-10-01 17:17:17.821965718 +0200
-@@ -204,8 +204,11 @@ get_placement_from_coordinates (struct p
- pi->measure_number >= rightmeasurenum);
-     
+@@ -211,7 +211,11 @@
+   pi->nextmeasure = ((si->system_height > 0.5 || x_to_explain > GPOINTER_TO_INT (mwidthiterator->data)) && pi->measure_number >= rightmeasurenum);
+ 
    pi->the_staff = g_list_nth (si->thescore, pi->staff_number - 1);
--  pi->the_measure
--    = nth_measure_node_in_staff (pi->the_staff, pi->measure_number - 1);
+-  pi->the_measure = nth_measure_node_in_staff (pi->the_staff, pi->measure_number - 1);
 +  if (pi->the_staff != NULL)
 +    pi->the_measure
 +      = nth_measure_node_in_staff (pi->the_staff, pi->measure_number - 1);
 +  else
 +    pi->the_measure = NULL;
-   if (pi->the_measure != NULL){ /*check to make sure user did not click on empty space*/
- 	  obj_iterator = (objnode *) pi->the_measure->data;
- 	  pi->cursor_x = 0;
+   if (pi->the_measure != NULL)
+     {                           /*check to make sure user did not click on empty space */
+       obj_iterator = (objnode *) pi->the_measure->data;
diff --git a/audio/denemo/files/patch-src__playback.c b/audio/denemo/files/patch-src__playback.c
deleted file mode 100644
index 9fa42502f9f0..000000000000
--- a/audio/denemo/files/patch-src__playback.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/playback.c.orig
-+++ src/playback.c
-@@ -7,6 +7,7 @@
- 
- 
- #include <denemo/denemo.h>
-+#include "playback.h"
- #include "exportlilypond.h"
- #include "exportmidi.h"
- #include "staffops.h"