gephex--main--0.4--patch-1868

Archive: [email protected]
New revision: gephex--main--0.4--patch-1868

--
Revision: gephex--main--0.4--patch-1868
Archive: [email protected]
Creator: The Gephex Source Archive <[email protected]>
Date: Sun Mar 27 01:00:14 CET 2005
Standard-date: 2005-03-27 00:00:14 GMT
Modified-files: NEWS config_h.win32 doc/documentation.xml
    modules/src/libmidi/Makefile.am
    modules/src/libmidi/libmidi.c
    modules/src/libmidi/libmidi.h
    modules/src/libmidi/midiutil.c
    modules/src/libmidi/midiutil.h
    modules/src/midiinmodule/wavemidiindriver.cpp
New-patches: [email protected]/gephex--macport--0.4--patch-31
    [email protected]/gephex--macport--0.4--patch-32
    [email protected]/gephex--main--0.4--patch-1868
Summary: [MERGE-REQUEST] Win32 compilation issues, set win32 version to 0.4.3
Keywords: 

Patches applied:

 * [email protected]/gephex--macport--0.4--patch-31
   Some win32 compilation fixes

 * [email protected]/gephex--macport--0.4--patch-32
   Changed NEWS, changed copyright in docs to include 2004,2005

* added files

    {arch}/gephex/gephex--macport/gephex--macport--0.4/[email protected]/patch-log/patch-31
    {arch}/gephex/gephex--macport/gephex--macport--0.4/[email protected]/patch-log/patch-32
    {arch}/gephex/gephex--main/gephex--main--0.4/[email protected]/patch-log/patch-1868

* modified files

--- orig/NEWS
+++ mod/NEWS
@@ -1,13 +1,16 @@
 0.4.3:
 ------
 
-  * support for Mac OS X
+  * support for Mac OS X (experimental)
 
   * ports of almost all effecTV effects
 
+  * initial OSC support (experimental)
+
   * some usability improvements
 
-  * fixed bugs #79, #81, #82, #83, #84, #86, #87, #89, #96, #97, #100
+  * fixed bugs #79, #81, #82, #83, #84, #86, #87, #89, #96, #97, #100, 
+               #114, #115
 
 0.4.2:
 ------


--- orig/config_h.win32
+++ mod/config_h.win32
@@ -11,7 +11,7 @@
 #define OPT_INCLUDE_MMX
 #undef OPT_SERIALIZE_FRAMEBUFFER
 
-#define VERSION "0.4.2"
+#define VERSION "0.4.3"
 
 #define FRBINMODULE_CACHE_SIZE 128
 


--- orig/doc/documentation.xml
+++ mod/doc/documentation.xml
@@ -44,6 +44,8 @@
 
 <copyright><year>2002</year>
     <year>2003</year>
+    <year>2004</year>
+    <year>2005</year>
 <holder>Martin Bayer</holder>
 <holder>Georg Seidel</holder>
 </copyright>


--- orig/modules/src/libmidi/Makefile.am
+++ mod/modules/src/libmidi/Makefile.am
@@ -5,5 +5,5 @@
 		    libmidi.h \
 		    midiutil.h
 
-INCLUDES = -I$(baseincludedir)
+INCLUDES = -I$(top_srcdir)/util/include
 EXTRA_DIST = libmidi.dsp libmidi.mak libmidi.dep


--- orig/modules/src/libmidi/libmidi.c
+++ mod/modules/src/libmidi/libmidi.c
@@ -1,6 +1,6 @@
 /* This source file is a part of the GePhex Project.
 
- Copyright (C) 2001-2004
+ Copyright (C) 2001-2005
 
  Georg Seidel <[email protected]> 
  Martin Bayer <[email protected]> 
@@ -20,11 +20,6 @@
  along with this program; if not, write to the Free Software
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.*/
 
-/*
- * TODO: can system realtime messages be really interleaved inside other
- * midi messages?
- */
-
 #include "libmidi.h"
 
 #include <stdlib.h>


--- orig/modules/src/libmidi/libmidi.h
+++ mod/modules/src/libmidi/libmidi.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_LIBMIDI_H
 #define INCLUDED_LIBMIDI_H
 
-#include <inttypes.h>
+#include "basic_types.h"
 
 #ifdef __cplusplus
 extern "C"


--- orig/modules/src/libmidi/midiutil.c
+++ mod/modules/src/libmidi/midiutil.c
@@ -1,6 +1,6 @@
 /* This source file is a part of the GePhex Project.
 
- Copyright (C) 2001-2004
+ Copyright (C) 2001-2005
 
  Georg Seidel <[email protected]> 
  Martin Bayer <[email protected]> 


--- orig/modules/src/libmidi/midiutil.h
+++ mod/modules/src/libmidi/midiutil.h
@@ -1,6 +1,6 @@
 /* This source file is a part of the GePhex Project.
 
- Copyright (C) 2001-2004
+ Copyright (C) 2001-2005
 
  Georg Seidel <[email protected]> 
  Martin Bayer <[email protected]> 
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_MIDIUTIL_H
 #define INCLUDED_MIDIUTIL_H
 
-#include <inttypes.h>
+#include "basic_types.h"
 
 #ifdef __cplusplus
 extern "C"


--- orig/modules/src/midiinmodule/wavemidiindriver.cpp
+++ mod/modules/src/midiinmodule/wavemidiindriver.cpp
@@ -257,9 +257,6 @@
 
 //--------------------------------------------------------------------
 
-void CALLBACK midiCallBack(HMIDIIN hMidiIn, UINT wMsg, DWORD dwInstance, 
-						   DWORD dwParam1, DWORD dwParam2);
-
 static void CALLBACK midiCallBack(HMIDIIN hMidiIn, UINT wMsg, DWORD dwInstance, 
 								  DWORD dwParam1, DWORD dwParam2)
 {	
@@ -373,7 +370,7 @@
 	return len;
 }
 
-static void put_bytes(const unsigned char* byte, int len)
+static void put_bytes(const unsigned char* bytes, int len)
 {
 	EnterCriticalSection(&s_critical_section);