From 71be3b049072bc3f182c2a94bb71e2c7949de62a Mon Sep 17 00:00:00 2001 From: falkTX Date: Thu, 8 Mar 2012 13:26:41 +0000 Subject: [PATCH] Misc fixes --- src/jacklib.py | 2 +- src/jacklib_helpers.py | 2 +- src/patchcanvas.py | 2 +- src/patchcanvas_theme.py | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/jacklib.py b/src/jacklib.py index aee92c2..2593177 100644 --- a/src/jacklib.py +++ b/src/jacklib.py @@ -22,7 +22,7 @@ from sys import platform # Load JACK shared library try: - if (platform == "win32" or platform == "win64"): + if (platform in ("win32", "win64")): jacklib = cdll.LoadLibrary("libjack.dll") else: jacklib = cdll.LoadLibrary("libjack.so.0") diff --git a/src/jacklib_helpers.py b/src/jacklib_helpers.py index 7933e65..d2f462d 100644 --- a/src/jacklib_helpers.py +++ b/src/jacklib_helpers.py @@ -66,9 +66,9 @@ def c_char_p_p_to_list(c_char_p_p): new_char_p = c_char_p_p[i] if (new_char_p): final_list.append(str(new_char_p, encoding="ascii")) + i += 1 else: break - i += 1 jacklib.free(c_char_p_p) return final_list diff --git a/src/patchcanvas.py b/src/patchcanvas.py index 4fcba40..9b18110 100644 --- a/src/patchcanvas.py +++ b/src/patchcanvas.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # Patchbay Canvas engine using QGraphicsView/Scene -# Copyright (C) 2012 Filipe Coelho +# Copyright (C) 2010-2012 Filipe Coelho # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/src/patchcanvas_theme.py b/src/patchcanvas_theme.py index 1c31480..7430c5a 100644 --- a/src/patchcanvas_theme.py +++ b/src/patchcanvas_theme.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # Patchbay Canvas Themes -# Copyright (C) 2012 Filipe Coelho +# Copyright (C) 2010-2012 Filipe Coelho # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -31,7 +31,7 @@ class Theme(object): THEME_MAX = 2 def __init__(self, idx): - super(Theme, self).__init__() + object.__init__(self) if (idx == self.THEME_MODERN_DARK): # Name this theme