@@ -22,7 +22,7 @@ from sys import platform | |||||
# Load JACK shared library | # Load JACK shared library | ||||
try: | try: | ||||
if (platform == "win32" or platform == "win64"): | |||||
if (platform in ("win32", "win64")): | |||||
jacklib = cdll.LoadLibrary("libjack.dll") | jacklib = cdll.LoadLibrary("libjack.dll") | ||||
else: | else: | ||||
jacklib = cdll.LoadLibrary("libjack.so.0") | jacklib = cdll.LoadLibrary("libjack.so.0") | ||||
@@ -66,9 +66,9 @@ def c_char_p_p_to_list(c_char_p_p): | |||||
new_char_p = c_char_p_p[i] | new_char_p = c_char_p_p[i] | ||||
if (new_char_p): | if (new_char_p): | ||||
final_list.append(str(new_char_p, encoding="ascii")) | final_list.append(str(new_char_p, encoding="ascii")) | ||||
i += 1 | |||||
else: | else: | ||||
break | break | ||||
i += 1 | |||||
jacklib.free(c_char_p_p) | jacklib.free(c_char_p_p) | ||||
return final_list | return final_list | ||||
@@ -2,7 +2,7 @@ | |||||
# -*- coding: utf-8 -*- | # -*- coding: utf-8 -*- | ||||
# Patchbay Canvas engine using QGraphicsView/Scene | # Patchbay Canvas engine using QGraphicsView/Scene | ||||
# Copyright (C) 2012 Filipe Coelho <falktx@gmail.com> | |||||
# Copyright (C) 2010-2012 Filipe Coelho <falktx@gmail.com> | |||||
# | # | ||||
# This program is free software; you can redistribute it and/or modify | # 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 | # it under the terms of the GNU General Public License as published by | ||||
@@ -2,7 +2,7 @@ | |||||
# -*- coding: utf-8 -*- | # -*- coding: utf-8 -*- | ||||
# Patchbay Canvas Themes | # Patchbay Canvas Themes | ||||
# Copyright (C) 2012 Filipe Coelho <falktx@gmail.com> | |||||
# Copyright (C) 2010-2012 Filipe Coelho <falktx@gmail.com> | |||||
# | # | ||||
# This program is free software; you can redistribute it and/or modify | # 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 | # it under the terms of the GNU General Public License as published by | ||||
@@ -31,7 +31,7 @@ class Theme(object): | |||||
THEME_MAX = 2 | THEME_MAX = 2 | ||||
def __init__(self, idx): | def __init__(self, idx): | ||||
super(Theme, self).__init__() | |||||
object.__init__(self) | |||||
if (idx == self.THEME_MODERN_DARK): | if (idx == self.THEME_MODERN_DARK): | ||||
# Name this theme | # Name this theme | ||||