[SCM] calf/master: + Big Bull: fix some kindergarten type bugs

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 069a9bb969f5a9f12449dfc43bc1d9d00f9fa855
Author: kfoltman <kfoltman at 78b06b96-2940-0410-b7fc-879d825d01d8>
Date:   Sun Aug 31 20:43:15 2008 +0000

    + Big Bull: fix some kindergarten type bugs
    
    
    git-svn-id: https://calf.svn.sourceforge.net/svnroot/calf/trunk@275 78b06b96-2940-0410-b7fc-879d825d01d8

diff --git a/bigbull/Makefile b/bigbull/Makefile
index 8187b50..9099ab9 100644
--- a/bigbull/Makefile
+++ b/bigbull/Makefile
@@ -1,7 +1,7 @@
-all: calfpytools.cpp ttl.cpp Makefile setup.py ttldata.h
+all: calfpytools.cpp ttl.cpp ttl.h Makefile setup.py ttldata.h
 	python setup.py build
 
-ttl.cpp: ttl.l Makefile ttldata.h
+ttl.h ttl.cpp: ttl.l Makefile ttldata.h
 	flex --batch --nodefault --c++ -o ttl.cpp --header-file=ttl.h ttl.l
 
 install:
diff --git a/bigbull/calfpytools.cpp b/bigbull/calfpytools.cpp
index b13ecb3..8a938a9 100644
--- a/bigbull/calfpytools.cpp
+++ b/bigbull/calfpytools.cpp
@@ -1,4 +1,4 @@
-#include "Python.h"
+#include <Python.h>
 #include "ttl.h"
 #include "ttldata.h"
 #include <map>
@@ -342,9 +342,7 @@ static PyObject *calfpytools_scan_ttl_file(PyObject *self, PyObject *args)
     if (!PyArg_ParseTuple(args, "s:scan_ttl_file", &ttl_name))
         return NULL;
     
-    std::filebuf fb;
-    fb.open(ttl_name, std::ios::in);
-    std::istream istr(&fb);
+    std::ifstream istr(ttl_name, std::ifstream::in);
     TTLLexer lexer(&istr);
     lexer.yylex();
     return lexer.grab();
@@ -388,8 +386,9 @@ PyMODINIT_FUNC initcalfpytools()
     if (PyType_Ready(&jackport_type) < 0)
         return;
     
-        PyObject *mod = Py_InitModule3("calfpytools", module_methods, "Python utilities for Calf");
+    PyObject *mod = Py_InitModule3("calfpytools", module_methods, "Python utilities for Calf");
     Py_INCREF(&jackclient_type);
+    Py_INCREF(&jackport_type);
     PyModule_AddObject(mod, "JackClient", (PyObject *)&jackclient_type);
     PyModule_AddObject(mod, "JackPort", (PyObject *)&jackport_type);    
 }

-- 
calf audio plugins packaging