Sophie

Sophie

distrib > Mandriva > current > i586 > media > contrib-release-src > by-pkgid > d739636463d379bf93ad7822c14f2908 > files > 3

dino-0.2.2-1mdv2010.1.src.rpm

diff -Naur --exclude '*.orig' --exclude '*.rej' dino-0.2.2/NEWS dino-0.2.2-fix-jack-api-change/NEWS
--- dino-0.2.2/NEWS	2005-05-04 14:31:36.000000000 +0200
+++ dino-0.2.2-fix-jack-api-change/NEWS	2009-04-13 14:43:44.000000000 +0200
@@ -1 +1,2 @@
 No news is good news.
+No news is good news.
diff -Naur --exclude '*.orig' --exclude '*.rej' dino-0.2.2/src/gui/main.cpp dino-0.2.2-fix-jack-api-change/src/gui/main.cpp
--- dino-0.2.2/src/gui/main.cpp	2006-04-20 14:17:45.000000000 +0200
+++ dino-0.2.2-fix-jack-api-change/src/gui/main.cpp	2009-04-13 14:44:03.000000000 +0200
@@ -19,6 +19,7 @@
 ****************************************************************************/
 
 #include <csignal>
+#include <cstring>
 #include <iostream>
 #include <string>
 
diff -Naur --exclude '*.orig' --exclude '*.rej' dino-0.2.2/src/libdinoseq/midibuffer.cpp dino-0.2.2-fix-jack-api-change/src/libdinoseq/midibuffer.cpp
--- dino-0.2.2/src/libdinoseq/midibuffer.cpp	2006-05-17 01:08:10.000000000 +0200
+++ dino-0.2.2-fix-jack-api-change/src/libdinoseq/midibuffer.cpp	2009-04-13 14:44:12.000000000 +0200
@@ -55,7 +55,7 @@
     // XXX optimise this
     jack_nframes_t timestamp = jack_nframes_t((beat - m_start_beat) * 
 					      60 / (m_bpm * m_samplerate));
-    return jack_midi_event_reserve(m_buffer, timestamp, data_size, m_nframes);
+    return jack_midi_event_reserve(m_buffer, timestamp, data_size);
   }
     
   
@@ -65,7 +65,7 @@
     jack_nframes_t timestamp = jack_nframes_t((beat - m_start_beat) * 
 					      60 / (m_bpm * m_samplerate));
     return jack_midi_event_write(m_buffer, timestamp, (jack_midi_data_t*)data, 
-				 data_size, m_nframes);
+				 data_size);
   }
 
 
diff -Naur --exclude '*.orig' --exclude '*.rej' dino-0.2.2/src/libdinoseq/pattern.cpp dino-0.2.2-fix-jack-api-change/src/libdinoseq/pattern.cpp
--- dino-0.2.2/src/libdinoseq/pattern.cpp	2006-05-04 11:41:08.000000000 +0200
+++ dino-0.2.2-fix-jack-api-change/src/libdinoseq/pattern.cpp	2009-04-13 14:44:12.000000000 +0200
@@ -23,6 +23,7 @@
 #include <algorithm>
 #include <cassert>
 #include <cmath>
+#include <cstring>
 #include <iostream>
 #include <set>
 
diff -Naur --exclude '*.orig' --exclude '*.rej' dino-0.2.2/src/libdinoseq/sequencer.cpp dino-0.2.2-fix-jack-api-change/src/libdinoseq/sequencer.cpp
--- dino-0.2.2/src/libdinoseq/sequencer.cpp	2006-05-17 01:08:10.000000000 +0200
+++ dino-0.2.2-fix-jack-api-change/src/libdinoseq/sequencer.cpp	2009-04-13 14:44:12.000000000 +0200
@@ -21,10 +21,9 @@
 #include <iomanip>
 #include <iostream>
 #include <cassert>
+#include <cstring>
 
-extern "C" {
 #include <jack/midiport.h>
-}
 #include <glibmm.h>
 
 #include "debug.hpp"
@@ -334,10 +333,10 @@
 	jack_port_t* port = m_output_ports[iter->get_id()];
 	if (port) {
 	  void* port_buf = jack_port_get_buffer(port, nframes);
-	  jack_midi_clear_buffer(port_buf, nframes);
+	  jack_midi_clear_buffer(port_buf);
 	  unsigned char all_notes_off[] = { 0xB0, 123, 0 };
 	  if (!m_sent_all_off)
-	    jack_midi_event_write(port_buf, 0, all_notes_off, 3, nframes);
+	    jack_midi_event_write(port_buf, 0, all_notes_off, 3);
 	}
 	m_sent_all_off = true;
       }
@@ -361,7 +360,7 @@
       jack_port_t* port = m_output_ports[iter->get_id()];
       if (port) {
 	void* port_buf = jack_port_get_buffer(port, nframes);
-	jack_midi_clear_buffer(port_buf, nframes);
+	jack_midi_clear_buffer(port_buf);
 	MIDIBuffer buffer(port_buf, start, pos.beats_per_minute,pos.frame_rate);
 	buffer.set_period_size(nframes);
 	buffer.set_cc_resolution(m_cc_resolution * pos.beats_per_minute / 60);
diff -Naur --exclude '*.orig' --exclude '*.rej' dino-0.2.2/src/libdinoseq/track.cpp dino-0.2.2-fix-jack-api-change/src/libdinoseq/track.cpp
--- dino-0.2.2/src/libdinoseq/track.cpp	2006-05-04 18:17:54.000000000 +0200
+++ dino-0.2.2-fix-jack-api-change/src/libdinoseq/track.cpp	2009-04-13 14:44:12.000000000 +0200
@@ -20,6 +20,7 @@
 
 #include <cassert>
 #include <cstdio>
+#include <cstring>
 #include <iostream>
 
 #include "debug.hpp"