From 32ec0bfabe965a006317b714ec78b0c6956fbc90 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sat, 11 Jul 2015 18:46:05 +0200 Subject: [PATCH] Cleanup --- data/templates/Composite.h2song | 591 ------ data/templates/Renoise.xml | 3419 ------------------------------- src/claudia_database.py | 5 +- src/claudia_launcher.py | 174 +- 4 files changed, 53 insertions(+), 4136 deletions(-) delete mode 100755 data/templates/Composite.h2song delete mode 100644 data/templates/Renoise.xml diff --git a/data/templates/Composite.h2song b/data/templates/Composite.h2song deleted file mode 100755 index 60b6b85..0000000 --- a/data/templates/Composite.h2song +++ /dev/null @@ -1,591 +0,0 @@ - - - 0.006.2 - X_BPM_X-CLAUDIA-X_BPM_X - 0.73 - 0.5 - Untitled Song - Unknown - Empty song. - Unknown license - true - pattern - 0 - 0 - 0 - - - 0 - GMkit - Kick - 1 - false - 1 - 1 - 1 - false - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 1 - 1000 - 0 - -1 - - kick_Dry_b.flac - 0 - 1 - 1 - 0 - - - - 1 - GMkit - Stick - 0.69 - false - 1 - 1 - 1 - false - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 1 - 1000 - 0 - -1 - - stick_Woody.flac - 0 - 1 - 1 - 0 - - - - 2 - GMkit - Snare Jazz - 1 - false - 1 - 1 - 1 - false - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 1 - 1000 - 0 - -1 - - sn_Jazz_c.flac - 0 - 1 - 1 - 0 - - - - 3 - GMkit - Hand Clap - 0.88 - false - 1 - 1 - 1 - false - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 1 - 1000 - 0 - -1 - - clap_Dry_c.flac - 0 - 1 - 1 - 0 - - - - 4 - GMkit - Snare Rock - 1 - false - 1 - 1 - 1 - false - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 1 - 1000 - 0 - -1 - - sn_Wet_b.flac - 0 - 1 - 1 - 0 - - - - 5 - GMkit - Tom Low - 0.96 - false - 0.44 - 1 - 1 - false - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 1 - 1000 - 0 - -1 - - tom_Rock_lo.flac - 0 - 1 - 1 - 0 - - - - 6 - GMkit - Closed HH - 0.89 - false - 1 - 0.78 - 1 - false - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 1 - 1000 - 0 - -1 - - hhc_Dry_a.flac - 0 - 1 - 1 - 0 - - - - 7 - GMkit - Tom Mid - 1 - false - 0.8 - 1 - 1 - false - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 1 - 1000 - 0 - -1 - - tom_Rock_mid.flac - 0 - 1 - 1 - 0 - - - - 8 - GMkit - Pedal HH - 0.89 - false - 1 - 0.78 - 1 - false - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 1 - 1000 - 0 - -1 - - hhp_Dry_a.flac - 0 - 1 - 1 - 0 - - - - 9 - GMkit - Tom Hi - 1 - false - 1 - 0.42 - 1 - false - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 1 - 1000 - 0 - -1 - - tom_Rock_hi.flac - 0 - 1 - 1 - 0 - - - - 10 - GMkit - Open HH - 0.8 - false - 1 - 0.84 - 1 - false - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 1 - 1000 - 0 - -1 - - hhc_Rock_b.flac - 0 - 1 - 1 - 0 - - - - 11 - GMkit - Cowbell - 0.8 - false - 1 - 1 - 1 - false - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 1 - 1000 - 0 - -1 - - misc_Cowbell.flac - 0 - 1 - 1 - 0 - - - - 12 - GMkit - Ride Jazz - 0.8 - false - 1 - 1 - 1 - false - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 1 - 1000 - 0 - -1 - - cym_Jazz.flac - 0 - 1 - 1 - 0 - - - - 13 - GMkit - Crash - 0.69 - false - 1 - 0.88 - 1 - false - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 1 - 1000 - 0 - -1 - - cra_Rock_a.flac - 0 - 1 - 1 - 0 - - - - 14 - GMkit - Ride Rock - 0.8 - false - 0.58 - 1 - 1 - false - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 1 - 1000 - 0 - -1 - - cym_Rock_b.flac - 0 - 1 - 1 - 0 - - - - 15 - GMkit - Crash Jazz - 0.77 - false - 1 - 0.78 - 1 - false - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 1 - 1000 - 0 - -1 - - cra_Jazz.flac - 0 - 1 - 1 - 0 - - - - - - Pattern 1 - not_categorized - 192 - - - - Pattern 2 - not_categorized - 192 - - - - Pattern 3 - not_categorized - 192 - - - - Pattern 4 - not_categorized - 192 - - - - Pattern 5 - not_categorized - 192 - - - - Pattern 6 - not_categorized - 192 - - - - Pattern 7 - not_categorized - 192 - - - - Pattern 8 - not_categorized - 192 - - - - Pattern 9 - not_categorized - 192 - - - - Pattern 10 - not_categorized - 192 - - - - - - Pattern 1 - - - - - no plugin - - - false - 0.0 - - - no plugin - - - false - 0.0 - - - no plugin - - - false - 0.0 - - - no plugin - - - false - 0.0 - - - diff --git a/data/templates/Renoise.xml b/data/templates/Renoise.xml deleted file mode 100644 index 2be7d6d..0000000 --- a/data/templates/Renoise.xml +++ /dev/null @@ -1,3419 +0,0 @@ - - - - 4 - 1 - false - 1 - 4 - X_BPM_X-CLAUDIA-X_BPM_X - 4 - 12 - 4 - 4 - false - - 0 - 0 - 0 - 0 - - Untitled - By Somebody - false - false - false - false - 4 - 0 - 0 - 0 - - - -1 - - - - - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - 0 - 0 - - - 1.0 - 0.5 - 0 - 48 - false - 16 - Cut - Cubic - Off - 0 - 0 - - - - - false - Curve - false - 0 - 0 - 71 - Off - 128 - - Curve - 72 - 0.0 - Unipolar - - 0,0.9900000095367431640625 - 10,0.4000000059604644775390625 - 71,0.0 - - - - Off - 3 - 27 - 0 - - - Off - 3 - 27 - 0 - - - - false - Curve - false - 0 - 0 - 71 - Off - 128 - - Curve - 72 - 0.0 - Bipolar - - 0,0.5 - 10,0.60000002384185791015625 - 20,0.4000000059604644775390625 - 30,0.699999988079071044921875 - 40,0.300000011920928955078125 - 60,0.4000000059604644775390625 - 71,0.5 - - - - Off - 3 - 27 - 0 - - - Off - 3 - 27 - 0 - - - - false - Curve - false - 0 - 0 - 71 - Off - 128 - - Curve - 72 - 0.0 - Bipolar - - 0,0.699999988079071044921875 - 50,0.20000000298023223876953125 - 71,0.0500000007450580596923828125 - - - - Off - 3 - 27 - 0 - - - Off - 3 - 27 - 0 - - - 3 - - false - Curve - false - 0 - 0 - 71 - Off - 128 - - Curve - 72 - 0.0 - Unipolar - - 0,0.5 - 40,0.800000011920928955078125 - 60,0.20000000298023223876953125 - 71,0.5 - - - - Off - 3 - 27 - 0 - - - false - 100 - 70 - 60 - - - - false - Curve - false - 0 - 0 - 71 - Off - 128 - - Curve - 72 - 0.0 - Unipolar - - 0,0.5 - 40,0.20000000298023223876953125 - 60,0.60000002384185791015625 - 71,0.5 - - - - Off - 3 - 27 - 0 - - - false - 100 - 70 - 60 - - - - - false - 1 - LineIn Ret - 0 - -1 - -1 - 48 - 8000 - - - 1 - 48 - 1.0 - - - true - Bus #01 - L+R - true - -1 - - - true - -1 - -1,-1 - - - - - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - 0 - 0 - - - 1.0 - 0.5 - 0 - 48 - false - 16 - Cut - Cubic - Off - 0 - 0 - - - - - false - Curve - false - 0 - 0 - 71 - Off - 128 - - Curve - 72 - 0.0 - Unipolar - - 0,0.9900000095367431640625 - 10,0.4000000059604644775390625 - 71,0.0 - - - - Off - 3 - 27 - 0 - - - Off - 3 - 27 - 0 - - - - false - Curve - false - 0 - 0 - 71 - Off - 128 - - Curve - 72 - 0.0 - Bipolar - - 0,0.5 - 10,0.60000002384185791015625 - 20,0.4000000059604644775390625 - 30,0.699999988079071044921875 - 40,0.300000011920928955078125 - 60,0.4000000059604644775390625 - 71,0.5 - - - - Off - 3 - 27 - 0 - - - Off - 3 - 27 - 0 - - - - false - Curve - false - 0 - 0 - 71 - Off - 128 - - Curve - 72 - 0.0 - Bipolar - - 0,0.699999988079071044921875 - 50,0.20000000298023223876953125 - 71,0.0500000007450580596923828125 - - - - Off - 3 - 27 - 0 - - - Off - 3 - 27 - 0 - - - 3 - - false - Curve - false - 0 - 0 - 71 - Off - 128 - - Curve - 72 - 0.0 - Unipolar - - 0,0.5 - 40,0.800000011920928955078125 - 60,0.20000000298023223876953125 - 71,0.5 - - - - Off - 3 - 27 - 0 - - - false - 100 - 70 - 60 - - - - false - Curve - false - 0 - 0 - 71 - Off - 128 - - Curve - 72 - 0.0 - Unipolar - - 0,0.5 - 40,0.20000000298023223876953125 - 60,0.60000002384185791015625 - 71,0.5 - - - - Off - 3 - 27 - 0 - - - false - 100 - 70 - 60 - - - - - false - 1 - LineIn Ret - 0 - -1 - -1 - 48 - 8000 - - - 1 - 48 - 1.0 - - - true - Bus #01 - L+R - true - -1 - - - true - -1 - -1,-1 - - - - - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - 0 - 0 - - - 1.0 - 0.5 - 0 - 48 - false - 16 - Cut - Cubic - Off - 0 - 0 - - - - - false - Curve - false - 0 - 0 - 71 - Off - 128 - - Curve - 72 - 0.0 - Unipolar - - 0,0.9900000095367431640625 - 10,0.4000000059604644775390625 - 71,0.0 - - - - Off - 3 - 27 - 0 - - - Off - 3 - 27 - 0 - - - - false - Curve - false - 0 - 0 - 71 - Off - 128 - - Curve - 72 - 0.0 - Bipolar - - 0,0.5 - 10,0.60000002384185791015625 - 20,0.4000000059604644775390625 - 30,0.699999988079071044921875 - 40,0.300000011920928955078125 - 60,0.4000000059604644775390625 - 71,0.5 - - - - Off - 3 - 27 - 0 - - - Off - 3 - 27 - 0 - - - - false - Curve - false - 0 - 0 - 71 - Off - 128 - - Curve - 72 - 0.0 - Bipolar - - 0,0.699999988079071044921875 - 50,0.20000000298023223876953125 - 71,0.0500000007450580596923828125 - - - - Off - 3 - 27 - 0 - - - Off - 3 - 27 - 0 - - - 3 - - false - Curve - false - 0 - 0 - 71 - Off - 128 - - Curve - 72 - 0.0 - Unipolar - - 0,0.5 - 40,0.800000011920928955078125 - 60,0.20000000298023223876953125 - 71,0.5 - - - - Off - 3 - 27 - 0 - - - false - 100 - 70 - 60 - - - - false - Curve - false - 0 - 0 - 71 - Off - 128 - - Curve - 72 - 0.0 - Unipolar - - 0,0.5 - 40,0.20000000298023223876953125 - 60,0.60000002384185791015625 - 71,0.5 - - - - Off - 3 - 27 - 0 - - - false - 100 - 70 - 60 - - - - - false - 1 - LineIn Ret - 0 - -1 - -1 - 48 - 8000 - - - 1 - 48 - 1.0 - - - true - Bus #01 - L+R - true - -1 - - - true - -1 - -1,-1 - - - - - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - 0 - 0 - - - 1.0 - 0.5 - 0 - 48 - false - 16 - Cut - Cubic - Off - 0 - 0 - - - - - false - Curve - false - 0 - 0 - 71 - Off - 128 - - Curve - 72 - 0.0 - Unipolar - - 0,0.9900000095367431640625 - 10,0.4000000059604644775390625 - 71,0.0 - - - - Off - 3 - 27 - 0 - - - Off - 3 - 27 - 0 - - - - false - Curve - false - 0 - 0 - 71 - Off - 128 - - Curve - 72 - 0.0 - Bipolar - - 0,0.5 - 10,0.60000002384185791015625 - 20,0.4000000059604644775390625 - 30,0.699999988079071044921875 - 40,0.300000011920928955078125 - 60,0.4000000059604644775390625 - 71,0.5 - - - - Off - 3 - 27 - 0 - - - Off - 3 - 27 - 0 - - - - false - Curve - false - 0 - 0 - 71 - Off - 128 - - Curve - 72 - 0.0 - Bipolar - - 0,0.699999988079071044921875 - 50,0.20000000298023223876953125 - 71,0.0500000007450580596923828125 - - - - Off - 3 - 27 - 0 - - - Off - 3 - 27 - 0 - - - 3 - - false - Curve - false - 0 - 0 - 71 - Off - 128 - - Curve - 72 - 0.0 - Unipolar - - 0,0.5 - 40,0.800000011920928955078125 - 60,0.20000000298023223876953125 - 71,0.5 - - - - Off - 3 - 27 - 0 - - - false - 100 - 70 - 60 - - - - false - Curve - false - 0 - 0 - 71 - Off - 128 - - Curve - 72 - 0.0 - Unipolar - - 0,0.5 - 40,0.20000000298023223876953125 - 60,0.60000002384185791015625 - 71,0.5 - - - - Off - 3 - 27 - 0 - - - false - 100 - 70 - 60 - - - - - false - 1 - LineIn Ret - 0 - -1 - -1 - 48 - 8000 - - - 1 - 48 - 1.0 - - - true - Bus #01 - L+R - true - -1 - - - true - -1 - -1,-1 - - - - - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - 0 - 0 - - - 1.0 - 0.5 - 0 - 48 - false - 16 - Cut - Cubic - Off - 0 - 0 - - - - - false - Curve - false - 0 - 0 - 71 - Off - 128 - - Curve - 72 - 0.0 - Unipolar - - 0,0.9900000095367431640625 - 10,0.4000000059604644775390625 - 71,0.0 - - - - Off - 3 - 27 - 0 - - - Off - 3 - 27 - 0 - - - - false - Curve - false - 0 - 0 - 71 - Off - 128 - - Curve - 72 - 0.0 - Bipolar - - 0,0.5 - 10,0.60000002384185791015625 - 20,0.4000000059604644775390625 - 30,0.699999988079071044921875 - 40,0.300000011920928955078125 - 60,0.4000000059604644775390625 - 71,0.5 - - - - Off - 3 - 27 - 0 - - - Off - 3 - 27 - 0 - - - - false - Curve - false - 0 - 0 - 71 - Off - 128 - - Curve - 72 - 0.0 - Bipolar - - 0,0.699999988079071044921875 - 50,0.20000000298023223876953125 - 71,0.0500000007450580596923828125 - - - - Off - 3 - 27 - 0 - - - Off - 3 - 27 - 0 - - - 3 - - false - Curve - false - 0 - 0 - 71 - Off - 128 - - Curve - 72 - 0.0 - Unipolar - - 0,0.5 - 40,0.800000011920928955078125 - 60,0.20000000298023223876953125 - 71,0.5 - - - - Off - 3 - 27 - 0 - - - false - 100 - 70 - 60 - - - - false - Curve - false - 0 - 0 - 71 - Off - 128 - - Curve - 72 - 0.0 - Unipolar - - 0,0.5 - 40,0.20000000298023223876953125 - 60,0.60000002384185791015625 - 71,0.5 - - - - Off - 3 - 27 - 0 - - - false - 100 - 70 - 60 - - - - - false - 1 - LineIn Ret - 0 - -1 - -1 - 48 - 8000 - - - 1 - 48 - 1.0 - - - true - Bus #01 - L+R - true - -1 - - - true - -1 - -1,-1 - - - - - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - 0 - 0 - - - 1.0 - 0.5 - 0 - 48 - false - 16 - Cut - Cubic - Off - 0 - 0 - - - - - false - Curve - false - 0 - 0 - 71 - Off - 128 - - Curve - 72 - 0.0 - Unipolar - - 0,0.9900000095367431640625 - 10,0.4000000059604644775390625 - 71,0.0 - - - - Off - 3 - 27 - 0 - - - Off - 3 - 27 - 0 - - - - false - Curve - false - 0 - 0 - 71 - Off - 128 - - Curve - 72 - 0.0 - Bipolar - - 0,0.5 - 10,0.60000002384185791015625 - 20,0.4000000059604644775390625 - 30,0.699999988079071044921875 - 40,0.300000011920928955078125 - 60,0.4000000059604644775390625 - 71,0.5 - - - - Off - 3 - 27 - 0 - - - Off - 3 - 27 - 0 - - - - false - Curve - false - 0 - 0 - 71 - Off - 128 - - Curve - 72 - 0.0 - Bipolar - - 0,0.699999988079071044921875 - 50,0.20000000298023223876953125 - 71,0.0500000007450580596923828125 - - - - Off - 3 - 27 - 0 - - - Off - 3 - 27 - 0 - - - 3 - - false - Curve - false - 0 - 0 - 71 - Off - 128 - - Curve - 72 - 0.0 - Unipolar - - 0,0.5 - 40,0.800000011920928955078125 - 60,0.20000000298023223876953125 - 71,0.5 - - - - Off - 3 - 27 - 0 - - - false - 100 - 70 - 60 - - - - false - Curve - false - 0 - 0 - 71 - Off - 128 - - Curve - 72 - 0.0 - Unipolar - - 0,0.5 - 40,0.20000000298023223876953125 - 60,0.60000002384185791015625 - 71,0.5 - - - - Off - 3 - 27 - 0 - - - false - 100 - 70 - 60 - - - - - false - 1 - LineIn Ret - 0 - -1 - -1 - 48 - 8000 - - - 1 - 48 - 1.0 - - - true - Bus #01 - L+R - true - -1 - - - true - -1 - -1,-1 - - - - - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - 0 - 0 - - - 1.0 - 0.5 - 0 - 48 - false - 16 - Cut - Cubic - Off - 0 - 0 - - - - - false - Curve - false - 0 - 0 - 71 - Off - 128 - - Curve - 72 - 0.0 - Unipolar - - 0,0.9900000095367431640625 - 10,0.4000000059604644775390625 - 71,0.0 - - - - Off - 3 - 27 - 0 - - - Off - 3 - 27 - 0 - - - - false - Curve - false - 0 - 0 - 71 - Off - 128 - - Curve - 72 - 0.0 - Bipolar - - 0,0.5 - 10,0.60000002384185791015625 - 20,0.4000000059604644775390625 - 30,0.699999988079071044921875 - 40,0.300000011920928955078125 - 60,0.4000000059604644775390625 - 71,0.5 - - - - Off - 3 - 27 - 0 - - - Off - 3 - 27 - 0 - - - - false - Curve - false - 0 - 0 - 71 - Off - 128 - - Curve - 72 - 0.0 - Bipolar - - 0,0.699999988079071044921875 - 50,0.20000000298023223876953125 - 71,0.0500000007450580596923828125 - - - - Off - 3 - 27 - 0 - - - Off - 3 - 27 - 0 - - - 3 - - false - Curve - false - 0 - 0 - 71 - Off - 128 - - Curve - 72 - 0.0 - Unipolar - - 0,0.5 - 40,0.800000011920928955078125 - 60,0.20000000298023223876953125 - 71,0.5 - - - - Off - 3 - 27 - 0 - - - false - 100 - 70 - 60 - - - - false - Curve - false - 0 - 0 - 71 - Off - 128 - - Curve - 72 - 0.0 - Unipolar - - 0,0.5 - 40,0.20000000298023223876953125 - 60,0.60000002384185791015625 - 71,0.5 - - - - Off - 3 - 27 - 0 - - - false - 100 - 70 - 60 - - - - - false - 1 - LineIn Ret - 0 - -1 - -1 - 48 - 8000 - - - 1 - 48 - 1.0 - - - true - Bus #01 - L+R - true - -1 - - - true - -1 - -1,-1 - - - - - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - 0 - 0 - - - 1.0 - 0.5 - 0 - 48 - false - 16 - Cut - Cubic - Off - 0 - 0 - - - - - false - Curve - false - 0 - 0 - 71 - Off - 128 - - Curve - 72 - 0.0 - Unipolar - - 0,0.9900000095367431640625 - 10,0.4000000059604644775390625 - 71,0.0 - - - - Off - 3 - 27 - 0 - - - Off - 3 - 27 - 0 - - - - false - Curve - false - 0 - 0 - 71 - Off - 128 - - Curve - 72 - 0.0 - Bipolar - - 0,0.5 - 10,0.60000002384185791015625 - 20,0.4000000059604644775390625 - 30,0.699999988079071044921875 - 40,0.300000011920928955078125 - 60,0.4000000059604644775390625 - 71,0.5 - - - - Off - 3 - 27 - 0 - - - Off - 3 - 27 - 0 - - - - false - Curve - false - 0 - 0 - 71 - Off - 128 - - Curve - 72 - 0.0 - Bipolar - - 0,0.699999988079071044921875 - 50,0.20000000298023223876953125 - 71,0.0500000007450580596923828125 - - - - Off - 3 - 27 - 0 - - - Off - 3 - 27 - 0 - - - 3 - - false - Curve - false - 0 - 0 - 71 - Off - 128 - - Curve - 72 - 0.0 - Unipolar - - 0,0.5 - 40,0.800000011920928955078125 - 60,0.20000000298023223876953125 - 71,0.5 - - - - Off - 3 - 27 - 0 - - - false - 100 - 70 - 60 - - - - false - Curve - false - 0 - 0 - 71 - Off - 128 - - Curve - 72 - 0.0 - Unipolar - - 0,0.5 - 40,0.20000000298023223876953125 - 60,0.60000002384185791015625 - 71,0.5 - - - - Off - 3 - 27 - 0 - - - false - 100 - 70 - 60 - - - - - false - 1 - LineIn Ret - 0 - -1 - -1 - 48 - 8000 - - - 1 - 48 - 1.0 - - - true - Bus #01 - L+R - true - -1 - - - true - -1 - -1,-1 - - - - 0 - 0 - - - Track 01 - 99,140,120 - Active - - Active - Active - Active - Active - Active - Active - Active - Active - Active - Active - Active - Active - - 1 - 1 - true - false - false - 0 - 0.0 - - - - true - false - Init - false - true - - 0.5 - Device only - - - 1.0 - Device only - - - 0.0 - Device only - - - 0.5 - Device only - - - 1.0 - Device only - - - - - - - Track 02 - 99,140,140 - Active - - Active - Active - Active - Active - Active - Active - Active - Active - Active - Active - Active - Active - - 1 - 1 - true - false - false - 0 - 0.0 - - - - true - false - Init - false - true - - 0.5 - Device only - - - 1.0 - Device only - - - 0.0 - Device only - - - 0.5 - Device only - - - 1.0 - Device only - - - - - - - Track 03 - 99,120,140 - Active - - Active - Active - Active - Active - Active - Active - Active - Active - Active - Active - Active - Active - - 1 - 1 - true - false - false - 0 - 0.0 - - - - true - false - Init - false - true - - 0.5 - Device only - - - 1.0 - Device only - - - 0.0 - Device only - - - 0.5 - Device only - - - 1.0 - Device only - - - - - - - Track 04 - 133,133,168 - Active - - Active - Active - Active - Active - Active - Active - Active - Active - Active - Active - Active - Active - - 1 - 1 - true - false - false - 0 - 0.0 - - - - true - false - Init - false - true - - 0.5 - Device only - - - 1.0 - Device only - - - 0.0 - Device only - - - 0.5 - Device only - - - 1.0 - Device only - - - - - - - Track 05 - 168,168,194 - Active - - Active - Active - Active - Active - Active - Active - Active - Active - Active - Active - Active - Active - - 1 - 1 - true - false - false - 0 - 0.0 - - - - true - false - Init - false - true - - 0.5 - Device only - - - 1.0 - Device only - - - 0.0 - Device only - - - 0.5 - Device only - - - 1.0 - Device only - - - - - - - Track 06 - 168,168,133 - Active - - Active - Active - Active - Active - Active - Active - Active - Active - Active - Active - Active - Active - - 1 - 1 - true - false - false - 0 - 0.0 - - - - true - false - Init - false - true - - 0.5 - Device only - - - 1.0 - Device only - - - 0.0 - Device only - - - 0.5 - Device only - - - 1.0 - Device only - - - - - - - Track 07 - 194,194,168 - Active - - Active - Active - Active - Active - Active - Active - Active - Active - Active - Active - Active - Active - - 1 - 1 - true - false - false - 0 - 0.0 - - - - true - false - Init - false - true - - 0.5 - Device only - - - 1.0 - Device only - - - 0.0 - Device only - - - 0.5 - Device only - - - 1.0 - Device only - - - - - - - Track 08 - 99,99,140 - Active - - Active - Active - Active - Active - Active - Active - Active - Active - Active - Active - Active - Active - - 1 - 1 - true - false - false - 0 - 0.0 - - - - true - false - Init - false - true - - 0.5 - Device only - - - 1.0 - Device only - - - 0.0 - Device only - - - 0.5 - Device only - - - 1.0 - Device only - - - - - - - Mst - 220,220,220 - Active - - Active - Active - Active - Active - Active - Active - Active - Active - Active - Active - Active - Active - - 0 - 1 - false - false - false - 0 - 0.0 - - - - true - false - Init - false - true - - 0.5 - Device only - - - 1.0 - Device only - - - 0.0 - Device only - - - 0.5 - Device only - - - 1.0 - Device only - - false - false - false - - - - - - S01 - 120,99,140 - Active - - Active - Active - Active - Active - Active - Active - Active - Active - Active - Active - Active - Active - - 0 - 1 - false - false - false - 0 - 0.0 - - - - true - false - Init - false - true - - 0.5 - Device only - - - 1.0 - Device only - - - 0.0 - Device only - - - 0.5 - Device only - - - 1.0 - Device only - - - - - - - 0 - - 0 - 64 - - - 64 - - - false - 0,0,0 - - - false - 0,0,0 - - - false - 0,0,0 - - - false - 0,0,0 - - - false - 0,0,0 - - - false - 0,0,0 - - - false - 0,0,0 - - - false - 0,0,0 - - - false - 0,0,0 - - - false - 0,0,0 - - - - - - - - - 0 - - - - -1 - -1 - - 0 - 248 - 30 - 24 - 2 - 0 - - diff --git a/src/claudia_database.py b/src/claudia_database.py index c9d9b3f..5151014 100644 --- a/src/claudia_database.py +++ b/src/claudia_database.py @@ -107,7 +107,7 @@ list_Instrument = [ [ "phasex", "Phasex", "Synth", "phasex", "phasex", TEMPLATE_NO, LEVEL_0, (1, 1, "ALSA"), ("file:///usr/share/phasex/help/parameters.help", "") ], - [ "qsampler", "Qsampler", "Sampler", "qsampler", "qsampler", TEMPLATE_NO, LEVEL_1, (0, 0, "ALSA + JACK"), ("", "http://qsampler.sf.net/") ], + [ "qsampler", "Qsampler", "Sampler", "qsampler", "qsampler", TEMPLATE_YES, LEVEL_0, (0, 0, "ALSA + JACK"), ("", "http://qsampler.sf.net/") ], [ "qsynth", "Qsynth", "SoundFont Player", "qsynth -a jack -m jack", "qsynth", TEMPLATE_NO, LEVEL_0, (1, 0, "ALSA | JACK"), ("", "http://qsynth.sf.net/") ], @@ -207,7 +207,6 @@ list_Tool = [ [ "cadence", "Cadence", "JACK Toolbox", "cadence", "cadence", TEMPLATE_NO, LEVEL_0, ("---", 0), ("", "") ], [ "cadence-tools", "Cadence XY-Controller", "XY Controller", "cadence-xycontroller", "cadence", TEMPLATE_NO, LEVEL_0, ("JACK", 0), ("", "") ], [ "catia", "Catia", "Patch Bay", "catia", "catia", TEMPLATE_NO, LEVEL_0, ("JACK", 1), ("", "") ], - [ "claudia", "Claudia", "Session Handler", "claudia", "claudia", TEMPLATE_NO, LEVEL_0, ("JACK", 1), ("", "") ], [ "carla-control", "Carla OSC Control", "OSC Control", "carla-control", "carla-control", TEMPLATE_NO, LEVEL_0, ("JACK", 1), ("", "") ], [ "drumstick-tools", "Drumstick Virtual Piano", "Virtual Keyboard", "drumstick-vpiano", "drumstick", TEMPLATE_NO, LEVEL_0, ("ALSA", 0), ("", "http://drumstick.sf.net/") ], @@ -219,8 +218,6 @@ list_Tool = [ [ "gjacktransport", "GJackClock", "Transport Tool", "gjackclock", "gjackclock", TEMPLATE_NO, LEVEL_0, ("---", 1), ("", "") ], [ "gjacktransport", "GJackTransport", "Transport Tool", "gjacktransport", "gjacktransport", TEMPLATE_NO, LEVEL_0, ("---", 1), ("", "") ], - [ "gladish", "LADI Session Handler", "Session Handler", "gladish", "gladish", TEMPLATE_NO, LEVEL_0, ("JACK", 0), ("", "http://www.ladish.org") ], - [ "gninjam", "Gtk NINJAM client", "Music Collaboration", "gninjam", generic_audio_icon, TEMPLATE_NO, LEVEL_0, ("---", 1), ("", "") ], [ "jack-keyboard", "Jack Keyboard", "Virtual Keyboard", "jack-keyboard", "jack-keyboard", TEMPLATE_NO, LEVEL_0, ("JACK", 0), ("file:///usr/share/kxstudio/docs/jack-keyboard/manual.html", "http://jack-keyboard.sf.net/") ], diff --git a/src/claudia_launcher.py b/src/claudia_launcher.py index 660730b..d47fc9f 100755 --- a/src/claudia_launcher.py +++ b/src/claudia_launcher.py @@ -223,83 +223,43 @@ class ClaudiaLauncher(QWidget, ui_claudia_launcher.Ui_ClaudiaLauncherW): def startApp(self): app, binary = self.getSelectedAppAndBinary() - if app and binary: - os.system("cd '%s' && %s &" % (self.callback_getProjectFolder(), binary)) + if not (app and binary): + return + + os.system("cd '%s' && %s &" % (self.callback_getProjectFolder(), binary)) def addAppToLADISH(self): app, binary = self.getSelectedAppAndBinary() - if binary.startswith("startBristol"): - self.createAppTemplate("bristol", app, binary) - - elif binary.startswith("carla-single"): - self.createAppTemplate("carla-single", app, binary) - - elif app == "Ardour 2.8": - self.createAppTemplate("ardour2", app, binary) - - elif app == "Ardour 3.0": - self.createAppTemplate("ardour3", app, binary) - - elif app == "Composite": - self.createAppTemplate("composite", app, binary) - - #elif app == "EnergyXT2": - #self.createAppTemplate("energyxt2", app, binary) - - elif app in ("Hydrogen", "Hydrogen (GIT)", "Hydrogen (SVN)"): - self.createAppTemplate("hydrogen", app, binary) - - elif app == "Jacker": - self.createAppTemplate("jacker", app, binary) - - elif app == "LMMS": - self.createAppTemplate("lmms", app, binary) - - elif app == "MusE": - self.createAppTemplate("muse", app, binary) - - elif app == "Non-DAW": - self.createAppTemplate("non-daw", app, binary) - - elif app == "Non-Sequencer": - self.createAppTemplate("non-sequencer", app, binary) - - elif app in ("Qtractor", "Qtractor (SVN)"): - self.createAppTemplate("qtractor", app, binary) - - #elif app == "REAPER": - #self.createAppTemplate("reaper", app, binary) - - elif app == "Renoise": - self.createAppTemplate("renoise", app, binary) - - elif app == "Rosegarden": - self.createAppTemplate("rosegarden", app, binary) - - elif app == "Seq24": - self.createAppTemplate("seq24", app, binary) - - elif app == "Calf Jack Host": - self.createAppTemplate("calfjackhost", app, binary) - - elif app in ("Carla", "Carla (GIT)"): - self.createAppTemplate("carla", app, binary) - - elif app == "Jack Rack": - self.createAppTemplate("jack-rack", app, binary) - - elif app == "Qsampler": - self.createAppTemplate("qsampler", app, binary) - - elif (app == "Jack Mixer"): - self.createAppTemplate("jack-mixer", app, binary) + if not (app and binary): + return + + if binary.startswith("startBristol") or binary.startswith("carla-single"): + self.createAppTemplate(app, binary) + + elif binary in ("ardour", + "ardour3", + "hydrogen", + "jacker", + "lmms", + "muse", + "non-daw", + "non-sequencer", + "qtractor", + "rosegarden", + "seq24", + "calfjackhost", + "carla", + "jack-rack", + "qsampler", + "jack-mixer"): + self.createAppTemplate(app, binary) else: appBus = self.callback_getAppBus() appBus.RunCustom2(False, binary, app, "0") - def createAppTemplate(self, app, app_name, binary): + def createAppTemplate(self, app, binary): rand_check = randint(1, 99999) proj_bpm = str(self.callback_getBPM()) proj_srate = str(self.callback_getSampleRate()) @@ -322,7 +282,7 @@ class ClaudiaLauncher(QWidget, ui_claudia_launcher.Ui_ClaudiaLauncherW): if not os.path.exists(proj_folder): os.mkdir(proj_folder) - if app == "bristol": + if binary.startswith("startBristol"): module = binary.replace("startBristol -audio jack -midi jack -", "") tmplte_folder = os.path.join(proj_folder, "bristol_%s_%i" % (module, rand_check)) os.mkdir(tmplte_folder) @@ -330,7 +290,7 @@ class ClaudiaLauncher(QWidget, ui_claudia_launcher.Ui_ClaudiaLauncherW): if self.callback_isLadishRoom(): tmplte_folder = os.path.basename(tmplte_folder) - tmplte_cmd = binary + tmplte_cmd = binary tmplte_cmd += " -emulate %s" % module tmplte_cmd += " -cache '%s'" % tmplte_folder tmplte_cmd += " -memdump '%s'" % tmplte_folder @@ -338,11 +298,11 @@ class ClaudiaLauncher(QWidget, ui_claudia_launcher.Ui_ClaudiaLauncherW): tmplte_cmd += " -exec" tmplte_lvl = "1" - elif app == "carla-single": + elif binary.startswith("carla-single"): tmplte_cmd = binary tmplte_lvl = "1" - elif app == "ardour2": + elif binary == "ardour": tmplte_folder = os.path.join(proj_folder, "Ardour2_%i" % rand_check) tmplte_file = os.path.join(tmplte_folder, "Ardour2_%i.ardour" % rand_check) os.mkdir(tmplte_folder) @@ -360,10 +320,7 @@ class ClaudiaLauncher(QWidget, ui_claudia_launcher.Ui_ClaudiaLauncherW): tmplte_cmd = binary tmplte_cmd += " '%s'" % (os.path.basename(tmplte_folder) if self.callback_isLadishRoom() else tmplte_folder) - if database.USING_KXSTUDIO: - tmplte_lvl = "1" - - elif app == "ardour3": + elif binary == "ardour3": projName = "Ardour3_%i" % rand_check tmplte_folder = os.path.join(proj_folder, projName) tmplte_file = os.path.join(tmplte_folder, "%s.ardour" % projName) @@ -388,15 +345,7 @@ class ClaudiaLauncher(QWidget, ui_claudia_launcher.Ui_ClaudiaLauncherW): if self.callback_isLadishRoom(): tmplte_lvl = "jacksession" - elif app == "composite": - tmplte_file = os.path.join(proj_folder, "Composite_%i.h2song" % rand_check) - - os.system("cp '%s' '%s'" % (os.path.join(tmplte_dir, "Composite.h2song"), tmplte_file)) - - tmplte_cmd = binary - tmplte_cmd += " -s '%s'" % (os.path.basename(tmplte_file) if self.callback_isLadishRoom() else tmplte_file) - - elif app == "hydrogen": + elif binary == "hydrogen": tmplte_file = os.path.join(proj_folder, "Hydrogen_%i.h2song" % rand_check) os.system("cp '%s' '%s'" % (os.path.join(tmplte_dir, "Hydrogen.h2song"), tmplte_file)) @@ -409,7 +358,7 @@ class ClaudiaLauncher(QWidget, ui_claudia_launcher.Ui_ClaudiaLauncherW): else: tmplte_lvl = "1" - elif app == "jacker": + elif binary == "jacker": tmplte_file = os.path.join(proj_folder, "Jacker_%i.jsong" % rand_check) os.system("cp '%s' '%s'" % (os.path.join(tmplte_dir, "Jacker.jsong"), tmplte_file)) @@ -423,7 +372,7 @@ class ClaudiaLauncher(QWidget, ui_claudia_launcher.Ui_ClaudiaLauncherW): # No decimal bpm support proj_bpm = proj_bpm.split(".")[0] - elif app == "lmms": + elif binary == "lmms": tmplte_file = os.path.join(proj_folder, "LMMS_%i.mmp" % rand_check) os.system("cp '%s' '%s'" % (os.path.join(tmplte_dir, "LMMS.mmp"), tmplte_file)) @@ -432,9 +381,9 @@ class ClaudiaLauncher(QWidget, ui_claudia_launcher.Ui_ClaudiaLauncherW): tmplte_cmd += " '%s'" % (os.path.basename(tmplte_file) if self.callback_isLadishRoom() else tmplte_file) # No decimal bpm support - proj_bpm = proj_bpm.split(".")[0] + proj_bpm = proj_bpm.split(".",1)[0] - elif app == "muse": + elif binary == "muse": tmplte_file = os.path.join(proj_folder, "MusE_%i.med" % rand_check) os.system("cp '%s' '%s'" % (os.path.join(tmplte_dir, "MusE.med"), tmplte_file)) @@ -442,7 +391,7 @@ class ClaudiaLauncher(QWidget, ui_claudia_launcher.Ui_ClaudiaLauncherW): tmplte_cmd = binary tmplte_cmd += " '%s'" % (os.path.basename(tmplte_file) if self.callback_isLadishRoom() else tmplte_file) - elif app == "non-daw": + elif binary == "non-daw": tmplte_folder = os.path.join(proj_folder, "Non-DAW_%i" % rand_check) os.mkdir(tmplte_folder) @@ -456,7 +405,7 @@ class ClaudiaLauncher(QWidget, ui_claudia_launcher.Ui_ClaudiaLauncherW): tmplte_cmd = binary tmplte_cmd += " '%s'" % (os.path.basename(tmplte_folder) if self.callback_isLadishRoom() else tmplte_folder) - elif app == "non-sequencer": + elif binary == "non-sequencer": tmplte_file_r = os.path.join(proj_folder, "Non-Sequencer_%i.non" % rand_check) os.system("cp '%s' '%s'" % (os.path.join(tmplte_dir, "Non-Sequencer.non"), tmplte_file_r)) @@ -464,7 +413,7 @@ class ClaudiaLauncher(QWidget, ui_claudia_launcher.Ui_ClaudiaLauncherW): tmplte_cmd = binary tmplte_cmd += " '%s'" % (os.path.basename(tmplte_file_r) if self.callback_isLadishRoom() else tmplte_file_r) - elif app == "qtractor": + elif binary == "qtractor": tmplte_file = os.path.join(proj_folder, "Qtractor_%i.qtr" % rand_check) os.system("cp '%s' '%s'" % (os.path.join(tmplte_dir, "Qtractor.qtr"), tmplte_file)) @@ -473,20 +422,7 @@ class ClaudiaLauncher(QWidget, ui_claudia_launcher.Ui_ClaudiaLauncherW): tmplte_cmd += " '%s'" % (os.path.basename(tmplte_file) if self.callback_isLadishRoom() else tmplte_file) tmplte_lvl = "1" - elif app == "renoise": - tmplte_file_r = os.path.join(proj_folder, "Renoise_%i.xrns" % rand_check) - tmplte_folder = os.path.join(proj_folder, "tmp_renoise_%i" % rand_check) - - os.mkdir(tmplte_folder) - os.system("cp '%s' '%s'" % (os.path.join(tmplte_dir, "Renoise.xml"), tmplte_folder)) - os.system('sed -i "s/X_BPM_X-CLAUDIA-X_BPM_X/%s/" "%s"' % (proj_bpm, os.path.join(tmplte_folder, "Renoise.xml"))) - os.system("cd '%s' && mv Renoise.xml Song.xml && zip '%s' Song.xml" % (tmplte_folder, tmplte_file_r)) - os.system("rm -rf '%s'" % tmplte_folder) - - tmplte_cmd = binary - tmplte_cmd += " '%s'" % (os.path.basename(tmplte_file_r) if self.callback_isLadishRoom() else tmplte_file_r) - - elif app == "rosegarden": + elif binary == "rosegarden": tmplte_file = os.path.join(proj_folder, "Rosegarden_%i.rg" % rand_check) os.system("cp '%s' '%s'" % (os.path.join(tmplte_dir, "Rosegarden.rg"), tmplte_file)) @@ -495,7 +431,7 @@ class ClaudiaLauncher(QWidget, ui_claudia_launcher.Ui_ClaudiaLauncherW): tmplte_cmd += " '%s'" % (os.path.basename(tmplte_file) if self.callback_isLadishRoom() else tmplte_file) tmplte_lvl = "1" - elif app == "seq24": + elif binary == "seq24": tmplte_file_r = os.path.join(proj_folder, "Seq24_%i.midi" % rand_check) os.system("cp '%s' '%s'" % (os.path.join(tmplte_dir, "Seq24.midi"), tmplte_file_r)) @@ -504,7 +440,7 @@ class ClaudiaLauncher(QWidget, ui_claudia_launcher.Ui_ClaudiaLauncherW): tmplte_cmd += " '%s'" % (os.path.basename(tmplte_file_r) if self.callback_isLadishRoom() else tmplte_file_r) tmplte_lvl = "1" - elif app == "calfjackhost": + elif binary == "calfjackhost": tmplte_file = os.path.join(proj_folder, "CalfJackHost_%i" % rand_check) os.system("cp '%s' '%s'" % (os.path.join(tmplte_dir, "CalfJackHost"), tmplte_file)) @@ -513,7 +449,7 @@ class ClaudiaLauncher(QWidget, ui_claudia_launcher.Ui_ClaudiaLauncherW): tmplte_cmd += " --load '%s'" % (os.path.basename(tmplte_file) if self.callback_isLadishRoom() else tmplte_file) tmplte_lvl = "1" - elif app == "carla": + elif binary == "carla": tmplte_file = os.path.join(proj_folder, "Carla_%i.carxp" % rand_check) os.system("cp '%s' '%s'" % (os.path.join(tmplte_dir, "Carla.carxp"), tmplte_file)) @@ -522,7 +458,7 @@ class ClaudiaLauncher(QWidget, ui_claudia_launcher.Ui_ClaudiaLauncherW): tmplte_cmd += " '%s'" % (os.path.basename(tmplte_file) if self.callback_isLadishRoom() else tmplte_file) tmplte_lvl = "1" - elif app == "jack-rack": + elif binary == "jack-rack": tmplte_file = os.path.join(proj_folder, "Jack-Rack_%i.xml" % rand_check) os.system("cp '%s' '%s'" % (os.path.join(tmplte_dir, "Jack-Rack.xml"), tmplte_file)) @@ -530,7 +466,7 @@ class ClaudiaLauncher(QWidget, ui_claudia_launcher.Ui_ClaudiaLauncherW): tmplte_cmd = binary tmplte_cmd += " '%s'" % (os.path.basename(tmplte_file) if self.callback_isLadishRoom() else tmplte_file) - elif app == "qsampler": + elif binary == "qsampler": tmplte_file = os.path.join(proj_folder, "Qsampler_%i.lscp" % rand_check) os.system("cp '%s' '%s'" % (os.path.join(tmplte_dir, "Qsampler.lscp"), tmplte_file)) @@ -538,10 +474,7 @@ class ClaudiaLauncher(QWidget, ui_claudia_launcher.Ui_ClaudiaLauncherW): tmplte_cmd = binary tmplte_cmd += " '%s'" % (os.path.basename(tmplte_file) if self.callback_isLadishRoom() else tmplte_file) - if database.USING_KXSTUDIO: - tmplte_lvl = "1" - - elif app == "jack-mixer": + elif binary == "jack-mixer": tmplte_file = os.path.join(proj_folder, "Jack-Mixer_%i.xml" % rand_check) os.system("cp '%s' '%s'" % (os.path.join(tmplte_dir, "Jack-Mixer.xml"), tmplte_file)) @@ -549,19 +482,16 @@ class ClaudiaLauncher(QWidget, ui_claudia_launcher.Ui_ClaudiaLauncherW): tmplte_cmd = binary tmplte_cmd += " -c '%s'" % (os.path.basename(tmplte_file) if self.callback_isLadishRoom() else tmplte_file) - if self.callback_isLadishRoom(): - tmplte_lvl = "lash" - else: print("ClaudiaLauncher::createAppTemplate(%s) - Failed to parse app name" % app) if tmplte_file is not None: - os.system('sed -i "s/X_SR_X-CLAUDIA-X_SR_X/%s/" "%s"' % (proj_srate, tmplte_file)) - os.system('sed -i "s/X_BPM_X-CLAUDIA-X_BPM_X/%s/" "%s"' % (proj_bpm, tmplte_file)) - os.system('sed -i "s/X_FOLDER_X-CLAUDIA-X_FOLDER_X/%s/" "%s"' % (proj_folder.replace("/", "\/").replace("$", "\$"), tmplte_file)) + os.system('sed -i "s|X_SR_X-CLAUDIA-X_SR_X|%s|" "%s"' % (proj_srate, tmplte_file)) + os.system('sed -i "s|X_BPM_X-CLAUDIA-X_BPM_X|%s|" "%s"' % (proj_bpm, tmplte_file)) + os.system('sed -i "s|X_FOLDER_X-CLAUDIA-X_FOLDER_X|%s|" "%s"' % (proj_folder.replace("|", "\|").replace("$", "\$"), tmplte_file)) appBus = self.callback_getAppBus() - appBus.RunCustom2(False, tmplte_cmd, app_name, tmplte_lvl) + appBus.RunCustom2(False, tmplte_cmd, app, tmplte_lvl) def parentR(self): return self._parent