diff --git a/src/carla.py b/src/carla.py
index 96dd6c8..75d4460 100755
--- a/src/carla.py
+++ b/src/carla.py
@@ -1154,15 +1154,15 @@ class PluginDatabaseW(QDialog, ui_carla_database.Ui_PluginDatabaseW):
self.close()
# About Carla Dialog
-class AboutW(QDialog, ui_carla_about.Ui_AboutW):
+class CarlaAboutW(QDialog, ui_carla_about.Ui_CarlaAboutW):
def __init__(self, parent=None):
- super(AboutW, self).__init__(parent)
+ super(CarlaAboutW, self).__init__(parent)
self.setupUi(self)
self.l_about.setText(self.tr(""
"
Version %s"
"
Carla is a Multi-Plugin Host for JACK.
"
- "
Copyright (C) 2011 falkTX
"
+ "
Copyright (C) 2011-2012 falkTX
"
"
VST is a trademark of Steinberg Media Technologies GmbH."
"" % VERSION))
@@ -2793,17 +2793,14 @@ class CarlaMainW(QMainWindow, ui_carla.Ui_CarlaMainW):
self.connect(self.act_help_about_qt, SIGNAL("triggered()"), app, SLOT("aboutQt()"))
self.connect(self, SIGNAL("SIGUSR1()"), SLOT("slot_handleSIGUSR1()"))
- self.connect(self, SIGNAL("DebugCallback(int, int, int, double)"),
- SLOT("slot_handleDebugCallback(int, int, int, double)"))
- self.connect(self, SIGNAL("ParameterCallback(int, int, double)"),
- SLOT("slot_handleParameterCallback(int, int, double)"))
+ self.connect(self, SIGNAL("DebugCallback(int, int, int, double)"), SLOT("slot_handleDebugCallback(int, int, int, double)"))
+ self.connect(self, SIGNAL("ParameterCallback(int, int, double)"), SLOT("slot_handleParameterCallback(int, int, double)"))
self.connect(self, SIGNAL("ProgramCallback(int, int)"), SLOT("slot_handleProgramCallback(int, int)"))
self.connect(self, SIGNAL("MidiProgramCallback(int, int)"), SLOT("slot_handleMidiProgramCallback(int, int)"))
self.connect(self, SIGNAL("NoteOnCallback(int, int, int)"), SLOT("slot_handleNoteOnCallback(int, int)"))
self.connect(self, SIGNAL("NoteOffCallback(int, int)"), SLOT("slot_handleNoteOffCallback(int, int)"))
self.connect(self, SIGNAL("ShowGuiCallback(int, int)"), SLOT("slot_handleShowGuiCallback(int, int)"))
- self.connect(self, SIGNAL("ResizeGuiCallback(int, int, int)"),
- SLOT("slot_handleResizeGuiCallback(int, int, int)"))
+ self.connect(self, SIGNAL("ResizeGuiCallback(int, int, int)"), SLOT("slot_handleResizeGuiCallback(int, int, int)"))
self.connect(self, SIGNAL("UpdateCallback(int)"), SLOT("slot_handleUpdateCallback(int)"))
self.connect(self, SIGNAL("ReloadInfoCallback(int)"), SLOT("slot_handleReloadInfoCallback(int)"))
self.connect(self, SIGNAL("ReloadParametersCallback(int)"), SLOT("slot_handleReloadParametersCallback(int)"))
@@ -2811,7 +2808,7 @@ class CarlaMainW(QMainWindow, ui_carla.Ui_CarlaMainW):
self.connect(self, SIGNAL("ReloadAllCallback(int)"), SLOT("slot_handleReloadAllCallback(int)"))
self.connect(self, SIGNAL("QuitCallback()"), SLOT("slot_handleQuitCallback()"))
- self.TIMER_GUI_STUFF = self.startTimer(self.m_savedSettings["Main/RefreshInterval"]) # Peaks
+ self.TIMER_GUI_STUFF = self.startTimer(self.m_savedSettings["Main/RefreshInterval"]) # Peaks
self.TIMER_GUI_STUFF2 = self.startTimer(self.m_savedSettings["Main/RefreshInterval"] * 2) # LEDs and edit dialog
def callback_function(self, action, plugin_id, value1, value2, value3):
@@ -3346,7 +3343,7 @@ class CarlaMainW(QMainWindow, ui_carla.Ui_CarlaMainW):
@pyqtSlot()
def slot_aboutCarla(self):
- AboutW(self).exec_()
+ CarlaAboutW(self).exec_()
def saveSettings(self):
self.settings.setValue("Geometry", self.saveGeometry())
@@ -3361,8 +3358,7 @@ class CarlaMainW(QMainWindow, ui_carla.Ui_CarlaMainW):
self.toolBar.setVisible(show_toolbar)
self.m_savedSettings = {
- "Main/DefaultProjectFolder": self.settings.value("Main/DefaultProjectFolder", DEFAULT_PROJECT_FOLDER,
- type=str),
+ "Main/DefaultProjectFolder": self.settings.value("Main/DefaultProjectFolder", DEFAULT_PROJECT_FOLDER, type=str),
"Main/RefreshInterval": self.settings.value("Main/RefreshInterval", 120, type=int)
}
@@ -3400,7 +3396,7 @@ if __name__ == '__main__':
app = QApplication(sys.argv)
app.setApplicationName("Carla")
app.setApplicationVersion(VERSION)
- app.setOrganizationName("falkTX")
+ app.setOrganizationName("Cadence")
app.setWindowIcon(QIcon(":/scalable/carla.svg"))
lib_prefix = None
diff --git a/src/carla/Makefile b/src/carla/Makefile
index 5f2aec6..4741e24 100644
--- a/src/carla/Makefile
+++ b/src/carla/Makefile
@@ -22,6 +22,9 @@ all: carla_backend.so
carla_backend.so: $(OBJS)
$(CXX) $(OBJS) ../carla-lilv/carla_lilv.a $(CARLA_LINK_FLAGS) -o carla_backend.so
+carla_backend.a: $(OBJS)
+ $(CXX) $(OBJS) ../carla-lilv/carla_lilv.a -static $(CARLA_LINK_FLAGS) -o carla_backend.a
+
.c.o:
$(CC) -c $< $(CARLA_C_FLAGS) -o $@
diff --git a/src/ui/carla_about.ui b/src/ui/carla_about.ui
index 1f8bd2b..28eaf88 100644
--- a/src/ui/carla_about.ui
+++ b/src/ui/carla_about.ui
@@ -1,13 +1,13 @@
- AboutW
-
+ CarlaAboutW
+
0
0
- 484
- 254
+ 482
+ 252
@@ -324,7 +324,7 @@
buttonBox
accepted()
- AboutW
+ CarlaAboutW
accept()
@@ -340,7 +340,7 @@
buttonBox
rejected()
- AboutW
+ CarlaAboutW
reject()