Skip to content
This repository was archived by the owner on Aug 21, 2023. It is now read-only.

patches to support fedora 25 #162

Open
ycollet wants to merge 2 commits into
base: master
Choose a base branch
from
Open

patches to support fedora 25 #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f15448
patches to support fedora 25
ycollet Jun 20, 2017
95a1f65
replace dnf enumeration by pull request #122
ycollet Jun 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/claudia_database.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@

list_DAW = [
# Package AppName Type Binary Icon Template? Level (L, D, L, V, VST-Mode, T, M, MIDI-Mode) (doc-file, website)
[ "ardour5", "Ardour 5", "DAW", "ardour5", "ardour", TEMPLATE_NO, LEVEL_JS, (1, 0, 1, 1, "Native", 1, 1, "JACK"), ("", "http://www.ardour.org/") ],

[ "ardour4", "Ardour 4", "DAW", "ardour4", "ardour", TEMPLATE_NO, LEVEL_JS, (1, 0, 1, 1, "Native", 1, 1, "JACK"), ("", "http://www.ardour.org/") ],

[ "ariamaestosa", "Aria Maestosa", "MIDI Sequencer", "Aria", "aria", TEMPLATE_NO, LEVEL_0, (0, 0, 0, 0, "", 0, 1, "ALSA | JACK"), ("", "http://ariamaestosa.sf.net/") ],
Expand Down
17 changes: 13 additions & 4 deletions src/claudia_launcher.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
from PyQt4.QtCore import pyqtSlot, Qt, QTimer, QSettings
from PyQt4.QtGui import QMainWindow, QTableWidgetItem, QWidget
from random import randint
import os

# ------------------------------------------------------------------------------------------------------------
# Imports (Custom)
Expand Down Expand Up @@ -114,7 +115,10 @@ def __init__(self, parent):
self._parent = None
self._settings = None
self.m_ladish_only = False

if os.path.isdir("/usr/lib64"):
self.lib_path = "lib64"
else:
self.lib_path = "lib"
self.listDAW.setColumnWidth(0, 22)
self.listDAW.setColumnWidth(1, 225)
self.listDAW.setColumnWidth(2, 150)
Expand Down Expand Up @@ -693,6 +697,11 @@ def refreshAll(self):
if installed == "install":
pkglist.append(package.strip())

elif os.path.exists("/bin/rpm"):
pkg_out = getoutput("env LANG=C /bin/rpm -qa --qf \"%{NAME}\n\" 2>/dev/null").split("\n")
for package in pkg_out:
pkglist.append(package)

if not "bristol" in pkglist:
self.tabWidget.setTabEnabled(iTabBristol, False)

Expand Down Expand Up @@ -813,10 +822,10 @@ def refreshAll(self):

last_pos += 1

if haveCarla and os.path.exists("/usr/lib/carla/libcarla_utils.so"):
utils = CarlaUtils("/usr/lib/carla/libcarla_utils.so")
if haveCarla and os.path.exists("/usr/" + self.lib_path + "/carla/libcarla_utils.so"):
utils = CarlaUtils("/usr/" + self.lib_path + "/carla/libcarla_utils.so")
last_pos = 0
for i in range(utils.get_cached_plugin_count(PLUGIN_LV2, os.getenv("LV2_PATH", "~/.lv2:/usr/lib/lv2:/usr/local/lib/lv2"))):
for i in range(utils.get_cached_plugin_count(PLUGIN_LV2, os.getenv("LV2_PATH", "~/.lv2:/usr/" + self.lib_path + "/lv2:/usr/local/" + self.lib_path + "/lv2"))):
plugin = utils.get_cached_plugin_info(PLUGIN_LV2, i)

if (plugin["hints"] & PLUGIN_HAS_CUSTOM_UI) == 0:
Expand Down
21 changes: 13 additions & 8 deletions src/shared_cadence.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

from PyQt4.QtCore import QProcess, QSettings
from time import sleep
import os

# ------------------------------------------------------------------------------------------------------------
# Imports (Custom Stuff)
Expand All @@ -29,29 +30,33 @@

# ------------------------------------------------------------------------------------------------------------
# Default Plugin PATHs
if os.path.isdir("/usr/lib64"):
LIB_PATH = "lib64"
else:
LIB_PATH = "lib"

DEFAULT_LADSPA_PATH = [
os.path.join(HOME, ".ladspa"),
os.path.join("/", "usr", "lib", "ladspa"),
os.path.join("/", "usr", "local", "lib", "ladspa")
os.path.join("/", "usr", LIB_PATH, "ladspa"),
os.path.join("/", "usr", "local", LIB_PATH, "ladspa")
]

DEFAULT_DSSI_PATH = [
os.path.join(HOME, ".dssi"),
os.path.join("/", "usr", "lib", "dssi"),
os.path.join("/", "usr", "local", "lib", "dssi")
os.path.join("/", "usr", LIB_PATH, "dssi"),
os.path.join("/", "usr", "local", LIB_PATH, "dssi")
]

DEFAULT_LV2_PATH = [
os.path.join(HOME, ".lv2"),
os.path.join("/", "usr", "lib", "lv2"),
os.path.join("/", "usr", "local", "lib", "lv2")
os.path.join("/", "usr", LIB_PATH, "lv2"),
os.path.join("/", "usr", "local", LIB_PATH, "lv2")
]

DEFAULT_VST_PATH = [
os.path.join(HOME, ".vst"),
os.path.join("/", "usr", "lib", "vst"),
os.path.join("/", "usr", "local", "lib", "vst")
os.path.join("/", "usr", LIB_PATH, "vst"),
os.path.join("/", "usr", "local", LIB_PATH, "vst")
]

# ------------------------------------------------------------------------------------------------------------
Expand Down