| [proaudio] [2308] radium: bump; various fixes thanks to Kjetil Matheussen |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 2308
Author: dominique
Date: 2012-11-14 19:43:20 +0100 (Wed, 14 Nov 2012)
Log Message:
-----------
radium: bump; various fixes thanks to Kjetil Matheussen
Modified Paths:
--------------
trunk/overlays/proaudio/media-sound/radium/ChangeLog
trunk/overlays/proaudio/media-sound/radium/Manifest
trunk/overlays/proaudio/media-sound/radium/metadata.xml
Added Paths:
-----------
trunk/overlays/proaudio/media-sound/radium/files/radium-1.9.2.patch
trunk/overlays/proaudio/media-sound/radium/radium-1.9.2.ebuild
Removed Paths:
-------------
trunk/overlays/proaudio/media-sound/radium/files/radium-1.9.1.patch
trunk/overlays/proaudio/media-sound/radium/radium-1.9.1-r1.ebuild
Modified: trunk/overlays/proaudio/media-sound/radium/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/radium/ChangeLog 2012-11-14 16:14:13 UTC (rev 2307)
+++ trunk/overlays/proaudio/media-sound/radium/ChangeLog 2012-11-14 18:43:20 UTC (rev 2308)
@@ -2,8 +2,16 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
- 12 May 2012; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxx>;
+ 14 Nov 2012; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxx>;
+ -radium-1.9.1-r1.ebuild;+radium-1.9.2.ebuild: version bump; fixed SRC_URI to
+ the final location (Kjetil Matheussen); removed non needed DEPEND (Kjetil M.);
+ make repoman happy, more will follow);
+ -files/radium-1.9.1.patch; +files/radium-1.9.2.patch: some bug fixes
+ and improvments from the GIT tarball, including a fix for the menu font size;
+ metadata.xml: added description for calf USE flag.
+
+ 12 Nov 2012; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxx>;
+radium-1.9.1.ebuild: Initial ebuild; move media-plugins/calf to RDEPEND
- +files/radium.patch: some bug fixes and improvments from the GIT tarball.
+ +files/radium-1.0.1.patch: some bug fixes and improvments from the GIT tarball.
-radium-1.9.1.ebuild; +radium-1.9.1-r1.ebuild: move media-plugins/calf to RDEPEND
with USE=ladspa.
Modified: trunk/overlays/proaudio/media-sound/radium/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/radium/Manifest 2012-11-14 16:14:13 UTC (rev 2307)
+++ trunk/overlays/proaudio/media-sound/radium/Manifest 2012-11-14 18:43:20 UTC (rev 2308)
@@ -1,6 +1,6 @@
-AUX radium-1.9.1.patch 36039 SHA256 6b061bd567a967eb7de16b5983fdf4db8f0edf6c5c3f46e10381d8e7cc9eda1d SHA512 a48ef470416cacde84107497437723a483591a47d1014bd3ca7512bd9a45e13294f672e468a1976018439eec5acce914fab8678614af2d50cd47d6815b658c06 WHIRLPOOL 789a563c71d782b06b189897ead971552366a5bfad1726c478103eb8ac1fcd74c616c74bab4f488ab1ef99c473478651dec8417afb65c4fff6b9e15393a1ee61
+AUX radium-1.9.2.patch 24491 SHA256 bedb7f9feee423893ae7434bf802b0cceb438b16cde3a9610e7a15f14b863f9e SHA512 562c0f3c6c71e220de64e0707f4ba16b62c2d1b906bbac33f4791249d724043ab4af68689b8a84174ad07b180eefba37f3d9416bd558f3b57f727e343358c5ab WHIRLPOOL 689d7975b13136175847b2a145d9a14f7c62ea87d5382044b02e48000565cd8a09c1e79ba47b32931642acdb004296c4d01d9898f4f84796fcff9871c9c74a67
AUX radium.xpm 161497 SHA256 0a6ad4cb0e6672c9827ac3d1b7a81e32657a569966ba4d9b6ea74adb2c71ba7e SHA512 78f8f0a8a187c5832e28397ce13421a68519b804fd1dd7d3e3ca092568bbb733ed79a0cbcf12268843c214e570bce6fc830956ee335e83ebf8de4b1f50fe0ed8 WHIRLPOOL 1d37b8ba47495dae4d5c9801b2fb190a6f8b9aa7788ff2538da511f6dd5a586734bb42a8a115ae1380b2a8e3387220864499d50e0b937ffd67ddd74ae68562e3
-DIST radium-1.9.1.tar.gz 20897579 SHA256 dc1ba8c43ef3785f53a339b6092a3f28afd2587134ebb6b492147383bacd473c SHA512 7416a294aecdb29faf4f64553e6068b918de1d1078e24ef2cd241c4b4bcfa42183115232dff3e09fb590c24e70bd4e02211f580697f9044c1d215d762b25517e WHIRLPOOL 445657781054b0f128531236d8c7bba3c23b4a9fd625988b3693da0da3fa8cf913df08e7a96f3a7abf90f89a32309ace3f5626ea651fcb70b3250bae670727fc
-EBUILD radium-1.9.1-r1.ebuild 1508 SHA256 0b0e536694fd7572fea81d0fd71a6432d9220e3b7277742dd71b1f654d9b46f7 SHA512 90098ce166de32907583d9f55294107d82f35030fd297c36cdc09a4a55f657018fce73db76bfd74b57ab0938ed26c22ee731d5711d65da38d20fc53e2d311628 WHIRLPOOL 3e468a0de1d94392c5859be9e0c866bb7d4d32f91fd97ef0bb279e30fdd33e19a65783bc6b71be2e53cc4f4bae388800266e80cb91f11b82d0184b526e750f72
-MISC ChangeLog 440 SHA256 94ebb5fc387f00e457a314b045bff8e4a2c687311f56457856e19cb6dd54c427 SHA512 56cb2525dfc64529c2006570b33a8a6486d4fa561750fdd7b04f7318b6349fdb31ad6348939b3a1ba14b66ecc8f9aedca1e8f8cb83d32b30d3e275e887aa6265 WHIRLPOOL c76b18f253aa780b0e4c7cfcc5696bd6a08cf3cd5363c7be7227630390ab5f4334b04ec5c7482506e12d7ce7a07fa2d11b223bfb6d72f9e6a540efa50923b877
-MISC metadata.xml 268 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89 SHA512 3d709a016692f887d642d19b2644c10a09f666133f1f035b8a4c10e5772fbb39fa84a856a496d392594ccf850739fbf46ffa78ecc74214e8342ee97676b375e9 WHIRLPOOL 17c886c5b97925bd9223c0210170a63e55a2c2a238ae81ebf8efa14109d790406f45d0773d63bea825c1e40b058bd9e20a5d9c264da4db7c8fd2e556ecd83b2a
+DIST radium-1.9.2.tar.gz 20899041 SHA256 3c4aeab3370d7d0df33ab810f711018e1481eb5a6834e1adf3f336e73cdd0000 SHA512 676c9f29e47ef2d1ba8ed90c1e33b97955f2872c28bc641cdf75b555f6da4f68ce90f9f36020c783e5a61f8625e51337593f589fdebb2615c93cf2eca734f853 WHIRLPOOL 2193623c41ca74b3a7bbe59fb887e1a66762858c00ee8852f94e560dab7bf83d9809518d86c56af6dffdadb64cb047434fdad9ec21d0c16285eb3eabae0b861a
+EBUILD radium-1.9.2.ebuild 1531 SHA256 16f5407042a13f9b8f2b67bf2a7f3e2a4872ab54008e82fbeba79b07872431d9 SHA512 1263442d10c1b8477a9682885686197d654ff9b00862031d1f5e61a1005710716ff78dfdf43547982f584706426d351c223777dfb0ec1dbf62ee5f1b1877550d WHIRLPOOL 545953a49500b1036ddcec1eac57bc603630f18181878e55f4281f224c26a32c58529e35dc4771222edcdd8f9b52326655d95d44f77366b3d9cb19e191797480
+MISC ChangeLog 921 SHA256 e187b98857bd93dedfecf23f5679c764a8eff796d165cced87b47760e98ea684 SHA512 11576186f2cc90d7d405ca17353013af72eac8c4b1446cc465628d653e3036326b7dfaf171a896a74440ef057eecb9696723b79be853866aa6d5f6cf537e8995 WHIRLPOOL c90470ca848127e8db4cd85ea5f417dbb012d30f94f65ff01af47f4fb50b554054632189561d1e9fb341e8fdf4bc82329d554db1827920c5b8a84e92bbd6d95e
+MISC metadata.xml 338 SHA256 a0c146bcb60d23a0596c3ba44b1ab06f8b4abc3cc786691e8e5ea2a6542c96b4 SHA512 a73bb0072f48189d04d4bb7754011db9a7afe771ca86bbe2ec7d54eb2693f103f31f0bdef14012bc88064e8fcf08c7e2f91d3261376e47a2cd10e8d866f7fc26 WHIRLPOOL b32c8e304ddcfdda0ce24dbea2adba1ec7a8b602770f4063bcebe1a4841a0cca733a447b1429354db1e7ef43e6f356215e1ba4379a73be54425189ca6a99ea05
Deleted: trunk/overlays/proaudio/media-sound/radium/files/radium-1.9.1.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/radium/files/radium-1.9.1.patch 2012-11-14 16:14:13 UTC (rev 2307)
+++ trunk/overlays/proaudio/media-sound/radium/files/radium-1.9.1.patch 2012-11-14 18:43:20 UTC (rev 2308)
@@ -1,1748 +0,0 @@
-diff -ru radium-1.9.1/api/api_noteedit.c radium-master/api/api_noteedit.c
---- radium-1.9.1/api/api_noteedit.c 2012-11-10 19:41:11.000000000 +0100
-+++ radium-master/api/api_noteedit.c 2012-11-12 09:08:12.000000000 +0100
-@@ -69,6 +69,11 @@
- );
- }
-
-+extern int g_downscroll;
-+void setNoteScrollLength(int l){
-+ g_downscroll = l;
-+}
-+
- int getMaxVolume(){
- return MAX_VELOCITY;
- }
-diff -ru radium-1.9.1/api/api_various.c radium-master/api/api_various.c
---- radium-1.9.1/api/api_various.c 2012-11-10 19:41:11.000000000 +0100
-+++ radium-master/api/api_various.c 2012-11-12 09:08:12.000000000 +0100
-@@ -89,14 +89,26 @@
- }
-
- void showHideInstrumentWidget(int windownum){
-- struct Tracker_Windows *window=getWindowFromNum(windownum);if(window==NULL) return;
-- GFX_showHideInstrumentWidget(window);
-+ //struct Tracker_Windows *window=getWindowFromNum(windownum);if(window==NULL) return;
-+ //GFX_showHideInstrumentWidget(window);
-+ if(GFX_InstrumentWindowIsVisible())
-+ GFX_InstrumentWindowToBack();
-+ else
-+ GFX_InstrumentWindowToFront();
-+}
-+
-+#if 0
-+void toggleInstrumentWidgetOnly(void){
-+ //if(GFX_
- }
-+#endif
-+
- void showHidePlaylist(int windownum){
- struct Tracker_Windows *window=getWindowFromNum(windownum);if(window==NULL) return;
- GFX_showHidePlaylist(window);
- }
-
-+
- void addFX(int windownum){
- struct Tracker_Windows *window=getWindowFromNum(windownum);if(window==NULL) return;
- AddFXNodeLineCurrPos(window);
-diff -ru radium-1.9.1/api/protos.conf radium-master/api/protos.conf
---- radium-1.9.1/api/protos.conf 2012-11-10 19:41:11.000000000 +0100
-+++ radium-master/api/protos.conf 2012-11-12 09:08:12.000000000 +0100
-@@ -48,6 +48,8 @@
-
- incNoteVolume | int incvolume | int windownum ? -1
-
-+setNoteScrollLength | int length
-+
-
- #/*******************************************
- # Navigating
-diff -ru radium-1.9.1/audio/Ladspa_plugins.cpp radium-master/audio/Ladspa_plugins.cpp
---- radium-1.9.1/audio/Ladspa_plugins.cpp 2012-11-10 19:41:11.000000000 +0100
-+++ radium-master/audio/Ladspa_plugins.cpp 2012-11-12 09:08:12.000000000 +0100
-@@ -843,34 +843,37 @@
- }
-
- void create_ladspa_plugins(void){
-+ char ladspa_path[1024];
-
- #if __linux__
-- if(getenv("LADSPA_PATH")==NULL)
-+ if(getenv("LADSPA_PATH")==NULL){
- QMessageBox::information(NULL, "LADSPA_PATH is not set.", "LADSPA_PATH is not set.");
-- QDir dir(getenv("LADSPA_PATH")); //"/usr/lib64/ladspa");
-+ return;
-+ }
-+ sprintf(ladspa_path,"%s",getenv("LADSPA_PATH"));
- #endif
-
- #if defined(FOR_WINDOWS) || defined(FOR_MACOSX)
-- QDir dir(QString(OS_get_program_path()) + OS_get_directory_separator() + "ladspa");
-+ sprintf(ladspa_path,"%s",QString(QString(OS_get_program_path()) + OS_get_directory_separator() + "ladspa").ascii());
- #endif
-
-- dir.setFilter(QDir::Files | QDir::NoDotAndDotDot);
-- dir.setSorting(QDir::Name);
--
-- QFileInfoList list = dir.entryInfoList();
--
-- for (int i = 0; i < list.size(); ++i) {
-- QFileInfo fileInfo = list.at(i);
-- if(fileInfo.suffix()==LIB_SUFFIX)
-- add_ladspa_plugin_type(fileInfo);
-- }
-+ char *dirname = strtok (ladspa_path, ":");
-+ do{
-
--#if 0
-- {
-- QFileInfo zitaInfo = QString(OS_get_program_path()) + "/zita_rev_ladspa.so";
-- add_ladspa_plugin_type(zitaInfo);
-- }
--#endif
-+ QDir dir(dirname);
-+
-+ dir.setFilter(QDir::Files | QDir::NoDotAndDotDot);
-+ dir.setSorting(QDir::Name);
-+
-+ QFileInfoList list = dir.entryInfoList();
-+
-+ for (int i = 0; i < list.size(); ++i) {
-+ QFileInfo fileInfo = list.at(i);
-+ if(fileInfo.suffix()==LIB_SUFFIX)
-+ add_ladspa_plugin_type(fileInfo);
-+ }
-+
-+ }while ((dirname = strtok (NULL, ":")));
-
- init_menues();
- }
-diff -ru radium-1.9.1/audio/Sampler_plugin.c radium-master/audio/Sampler_plugin.c
---- radium-1.9.1/audio/Sampler_plugin.c 2012-11-10 19:41:11.000000000 +0100
-+++ radium-master/audio/Sampler_plugin.c 2012-11-12 09:08:12.000000000 +0100
-@@ -81,7 +81,7 @@
- double frequency_table[128];
- } Sample;
-
--// A voice object points to only one sample. Stereo-files uses two voice objects. Soundfonts using x sounds to play a note, needs x voice objects to play that note.
-+// A voice object points to only one sample. Stereo-files uses two voice objects. Soundfonts using x sounds to play a note, need x voice objects to play that note.
- typedef struct _Voice{
- struct _Voice *prev;
- struct _Voice *next;
-@@ -741,14 +741,49 @@
- #include "Sampler_plugin_xi_load.c"
- #include "Sampler_plugin_sf2_load.c"
-
-+static float *load_interleaved_samples(const char *filename, SF_INFO *sf_info){
-+ SNDFILE *sndfile = sf_open(filename,SFM_READ,sf_info);
-+ if(sndfile==NULL)
-+ return NULL;
-+
-+ float *ret = talloc_atomic(sizeof(float) * sf_info->channels * sf_info->frames);
-+ int allocated_frames = sf_info->frames;
-+
-+ int total_read_frames = sf_readf_float(sndfile, ret, sf_info->frames);
-+
-+ if(total_read_frames==0)
-+ return NULL;
-+
-+ while(true){
-+ float samples[1024*sf_info->channels];
-+ int read_now = sf_readf_float(sndfile, samples, 1024);
-+ if(read_now==0)
-+ break;
-+
-+ if(total_read_frames + read_now > allocated_frames){
-+ allocated_frames = (total_read_frames+read_now) * 2;
-+ ret = talloc_realloc(ret, allocated_frames * sizeof(float) * sf_info->channels);
-+ }
-+
-+ memcpy(ret + (total_read_frames*sf_info->channels), samples, sizeof(float)*1024*sf_info->channels);
-+
-+ total_read_frames += read_now;
-+ }
-+
-+ sf_close(sndfile);
-+
-+ sf_info->frames = total_read_frames;
-+ return ret;
-+}
-+
- static bool load_sample_with_libsndfile(Data *data, const char *filename){
- SF_INFO sf_info; memset(&sf_info,0,sizeof(sf_info));
-
- data->num_different_samples = 1;
-
-- SNDFILE *sndfile = sf_open(filename,SFM_READ,&sf_info);
-+ float *samples = load_interleaved_samples(filename, &sf_info);
-
-- if(sndfile==NULL){
-+ if(samples==NULL){
- fprintf(stderr,"could not open file\n");
- return false;
- }
-@@ -763,35 +798,23 @@
-
- int ch;
- for(ch=0;ch<num_channels;ch++){
-- Sample *sample=(Sample*)&data->samples[ch];
-- sample->num_frames = sf_info.frames;
-- sample->data = malloc(sizeof(float)*sample->num_frames);
-+ Sample *sample = (Sample*)&data->samples[ch];
-+ sample->num_frames = sf_info.frames;
-+ sample->data = malloc(sizeof(float)*sample->num_frames);
- }
-
-- int frames_read = 0;
-- while(frames_read < sf_info.frames){
-- float samples[1024*sf_info.channels];
--
-- int read_now = sf_readf_float(sndfile, samples, 1024);
-- //printf("Reading %d frames. Size: %d. Read: %d. samples[0]: %f. channels: %d/%d\n",read_now,sample->num_frames,frames_read,samples[0],sample->num_channels,sf_info.channels);
--
-- int interleaved_pos=0;
-- int i;
-- for(i=0;i<read_now;i++){
-- for(ch=0;ch<sf_info.channels;ch++){
-- if(ch<2){
-- Sample *sample=(Sample*)&data->samples[ch];
-- sample->data[frames_read+i] = samples[interleaved_pos];
-- }
-- interleaved_pos++;
-+ int interleaved_pos=0;
-+ int i;
-+ for(i=0;i<sf_info.frames;i++){
-+ for(ch=0;ch<sf_info.channels;ch++){
-+ if(ch<2){
-+ Sample *sample=(Sample*)&data->samples[ch];
-+ sample->data[i] = samples[interleaved_pos];
- }
-+ interleaved_pos++;
- }
--
-- frames_read += read_now;
- }
-
-- sf_close(sndfile);
--
- for(ch=0;ch<num_channels;ch++){
- Sample *sample=(Sample*)&data->samples[ch];
-
-diff -ru radium-1.9.1/bin/keybindings.conf radium-master/bin/keybindings.conf
---- radium-1.9.1/bin/keybindings.conf 2012-11-10 19:41:11.000000000 +0100
-+++ radium-master/bin/keybindings.conf 2012-11-12 09:08:12.000000000 +0100
-@@ -323,16 +323,19 @@
- ####################################################################
-
- 1:
-- CTRL_L : ra.editorWindowToFront
-- ALT_R : ra.maximizeEditorWindow
-- EXTRA_R : ra.minimizeEditorWindow
-+ CTRL_L : ra.setNoteScrollLength 1
-
- 2:
-- CTRL_L : ra.playListWindowToFront
-+ CTRL_L : ra.setNoteScrollLength 2
-+
- 3:
-- CTRL_L : ra.instrumentWindowToFront
-+ CTRL_L : ra.setNoteScrollLength 3
-+
- 4:
-- CTRL_L : ra.helpWindowToFront
-+ CTRL_L : ra.setNoteScrollLength 4
-+
-+5:
-+ CTRL_L : ra.setNoteScrollLength 5
-
-
- BACKSPACE : ra.insertReallines -1
-diff -ru radium-1.9.1/bin/menues.conf radium-master/bin/menues.conf
---- radium-1.9.1/bin/menues.conf 2012-11-10 19:41:11.000000000 +0100
-+++ radium-master/bin/menues.conf 2012-11-12 09:08:12.000000000 +0100
-@@ -74,6 +74,12 @@
- Add SHIFT_L+<key>
- Delete Delete
- Stop Notes Delete
-+ ---------------
-+ Set Note Scroll Length 1 | ra.setNoteScrollLength(1)
-+ Set Note Scroll Length 2 | ra.setNoteScrollLength(2)
-+ Set Note Scroll Length 3 | ra.setNoteScrollLength(3)
-+ Set Note Scroll Length 4 | ra.setNoteScrollLength(4)
-+ Set Note Scroll Length 5 | ra.setNoteScrollLength(5)
- Velocities
- Del | ra.generalDelete()
- Def Pos | ra.generalReturn()
-diff -ru radium-1.9.1/bin/new_song.rad radium-master/bin/new_song.rad
---- radium-1.9.1/bin/new_song.rad 2012-11-10 19:41:11.000000000 +0100
-+++ radium-master/bin/new_song.rad 2012-11-12 09:08:12.000000000 +0100
-@@ -53,10 +53,10 @@
- 0
-
- ?width
--1062
-+731
-
- ?height
--693
-+460
-
- ?fontID
- 0
-@@ -68,10 +68,10 @@
- 10
-
- ?fontheight
--18
-+19
-
- ?org_fontheight
--18
-+19
-
- ?curr_block
- 0
-@@ -125,16 +125,16 @@
- 30
-
- ?temponodearea
--156
-+70
-
- ?maxwtracksize
- 0
-
- ?curr_realline
--18
-+62
-
- ?num_reallines
--100
-+64
-
- ?reltempomax
- 2.000000
-@@ -156,7 +156,7 @@
-
- \
- LOCALZOOMS
--100
-+64
- /
-
- \
-@@ -308,7 +308,7 @@
- 8
-
- ?num_lines
--100
-+64
-
- ?reltempo
- 1.001876
-@@ -549,7 +549,7 @@
- RELTEMPO
- 0.000000
- 0.000000
--99
-+63
- 65533
- 65534
- /
-@@ -565,6 +565,13 @@
- INSTRUMENT
-
- ?instrumentname
-+MIDI instrument
-+/
-+
-+\
-+INSTRUMENT
-+
-+?instrumentname
- Audio instrument
-
- \
-@@ -1511,10 +1518,10 @@
- 7
- from_patch
- INT_TYPE
--17
-+0
- to_patch
- INT_TYPE
--20
-+1
- << HASH MAP END
- <int hash> 4
- HASH_TYPE
-@@ -1522,10 +1529,10 @@
- 7
- from_patch
- INT_TYPE
--20
-+19
- to_patch
- INT_TYPE
--0
-+7
- << HASH MAP END
- <int hash> 0
- HASH_TYPE
-@@ -1533,10 +1540,10 @@
- 7
- from_patch
- INT_TYPE
--19
-+20
- to_patch
- INT_TYPE
--7
-+0
- << HASH MAP END
- <int hash> 1
- HASH_TYPE
-@@ -1544,10 +1551,10 @@
- 7
- from_patch
- INT_TYPE
--0
-+17
- to_patch
- INT_TYPE
--1
-+20
- << HASH MAP END
- num_connections
- INT_TYPE
-@@ -1567,115 +1574,130 @@
- 11
- name
- STRING_TYPE
--System Out
-+Zita Reverb
- type_name
- STRING_TYPE
--Jack
-+Faust
- effects
- HASH_TYPE
- >> HASH MAP BEGIN
--2
--System Width On/Off
-+11
-+System Eq2 On/Off
- FLOAT_TYPE
--0.000000
--System Hs L.
-+1.000000
-+System Eq2 L.
- FLOAT_TYPE
--0.0
--System Hs F.
-+-5.243000
-+System Eq1 F.
- FLOAT_TYPE
--4500
--System Ls F.
-+399.359863
-+System Out
- FLOAT_TYPE
--400
--System Eq2 F.
-+0.999712
-+Low RT60
- FLOAT_TYPE
--1000
--System Eq1 F.
-+3.587200
-+LF X
- FLOAT_TYPE
--400
--System Lowpass On/Off
-+199.910004
-+System Hs On/Off
-+FLOAT_TYPE
-+1.000000
-+System Ls On/Off
- FLOAT_TYPE
- 0.000000
--System Dry/Wet
-+System Ls L.
- FLOAT_TYPE
--1.000000
--System Pan On/Off
-+0.000000
-+System Chorus
- FLOAT_TYPE
- 0.000000
--System Reverb On/Off
-+Mid RT60
-+FLOAT_TYPE
-+4.755500
-+Input: In Delay
-+FLOAT_TYPE
-+0.000000
-+System Effects On/Off
- FLOAT_TYPE
- 1.000000
- System Reverb
- FLOAT_TYPE
- 0.000000
--System Out
-+System Dry/Wet
-+FLOAT_TYPE
-+1.000000
-+System Ls F.
-+FLOAT_TYPE
-+399.359863
-+System Eq2 F.
-+FLOAT_TYPE
-+1000.000366
-+System Lp F.
- FLOAT_TYPE
--1.0
-+4999.347168
- System Volume On/Off
- FLOAT_TYPE
- 1.000000
--System Volume
--FLOAT_TYPE
--0.0
- System In On/Off
- FLOAT_TYPE
- 1.000000
--System In
--FLOAT_TYPE
--1.0
--System Width
-+System Pan
- FLOAT_TYPE
--0.005000
--System Hs On/Off
-+0.500000
-+System Reverb On/Off
- FLOAT_TYPE
--0.000000
--System Ls On/Off
-+1.000000
-+System Pan On/Off
- FLOAT_TYPE
- 0.000000
--System Ls L.
-+System Out On/Off
- FLOAT_TYPE
--0.0
--System Eq2 On/Off
-+1.000000
-+System Hs F.
- FLOAT_TYPE
--0.000000
--System Eq2 L.
-+4499.011719
-+System Chorus On/Off
- FLOAT_TYPE
--0.0
--System Eq1 On/Off
-+1.000000
-+System Eq1 L.
- FLOAT_TYPE
- 0.000000
--System Eq1 L.
-+System In
- FLOAT_TYPE
--0.0
--System Lp F.
-+0.999712
-+HF Damping
- FLOAT_TYPE
--5000
--System Effects On/Off
-+3657.959961
-+System Width On/Off
- FLOAT_TYPE
--1.000000
--System Pan
-+0.000000
-+System Width
- FLOAT_TYPE
--0.500000
--System Chorus On/Off
-+0.190000
-+System Hs L.
- FLOAT_TYPE
--1.000000
--System Chorus
-+9.639000
-+System Eq1 On/Off
- FLOAT_TYPE
- 0.000000
--System Out On/Off
-+System Lowpass On/Off
- FLOAT_TYPE
--1.000000
-+0.000000
-+System Volume
-+FLOAT_TYPE
-+1.039322
- << HASH MAP END
- << HASH MAP END
- patch
- INT_TYPE
--1
-+7
- y
- FLOAT_TYPE
---35.000000
-+-75.000000
- x
- FLOAT_TYPE
--120.000000
-+-120.000000
- << HASH MAP END
- <int hash> 1
- HASH_TYPE
-@@ -1687,10 +1709,10 @@
- 11
- name
- STRING_TYPE
--Bus 1
-+Pipe
- type_name
- STRING_TYPE
--Bus
-+Pipe
- effects
- HASH_TYPE
- >> HASH MAP BEGIN
-@@ -1703,16 +1725,16 @@
- 0.000000
- System Hs F.
- FLOAT_TYPE
--1500
-+4499.011719
- System Ls F.
- FLOAT_TYPE
--400
-+399.359863
- System Eq2 F.
- FLOAT_TYPE
--1000
-+1000.000366
- System Eq1 F.
- FLOAT_TYPE
--400
-+399.359863
- System Lowpass On/Off
- FLOAT_TYPE
- 0.000000
-@@ -1730,7 +1752,7 @@
- 0.000000
- System Out
- FLOAT_TYPE
--1.0
-+0.999712
- System Volume On/Off
- FLOAT_TYPE
- 1.000000
-@@ -1742,10 +1764,10 @@
- 1.000000
- System In
- FLOAT_TYPE
--1.0
-+0.999712
- System Width
- FLOAT_TYPE
--0.000000
-+0.005000
- System Hs On/Off
- FLOAT_TYPE
- 0.000000
-@@ -1769,7 +1791,7 @@
- 0.000000
- System Lp F.
- FLOAT_TYPE
--5000
-+4999.347168
- System Effects On/Off
- FLOAT_TYPE
- 1.000000
-@@ -1789,13 +1811,13 @@
- << HASH MAP END
- patch
- INT_TYPE
--19
-+0
- y
- FLOAT_TYPE
---75.000000
-+-35.000000
- x
- FLOAT_TYPE
---240.000000
-+0.000000
- << HASH MAP END
- <int hash> 4
- HASH_TYPE
-@@ -1807,10 +1829,10 @@
- 11
- name
- STRING_TYPE
--Pipe
-+Bus 1
- type_name
- STRING_TYPE
--Pipe
-+Bus
- effects
- HASH_TYPE
- >> HASH MAP BEGIN
-@@ -1820,19 +1842,19 @@
- 0.000000
- System Hs L.
- FLOAT_TYPE
--0.0
-+0.000000
- System Hs F.
- FLOAT_TYPE
--4500
-+1499.337646
- System Ls F.
- FLOAT_TYPE
--400
-+399.359863
- System Eq2 F.
- FLOAT_TYPE
--1000
-+1000.000366
- System Eq1 F.
- FLOAT_TYPE
--400
-+399.359863
- System Lowpass On/Off
- FLOAT_TYPE
- 0.000000
-@@ -1850,22 +1872,22 @@
- 0.000000
- System Out
- FLOAT_TYPE
--1.0
-+0.999712
- System Volume On/Off
- FLOAT_TYPE
- 1.000000
- System Volume
- FLOAT_TYPE
--1.0
-+0.999712
- System In On/Off
- FLOAT_TYPE
- 1.000000
- System In
- FLOAT_TYPE
--1.0
-+0.999712
- System Width
- FLOAT_TYPE
--0.005000
-+0.000000
- System Hs On/Off
- FLOAT_TYPE
- 0.000000
-@@ -1874,22 +1896,22 @@
- 0.000000
- System Ls L.
- FLOAT_TYPE
--0.0
-+0.000000
- System Eq2 On/Off
- FLOAT_TYPE
- 0.000000
- System Eq2 L.
- FLOAT_TYPE
--0.0
-+0.000000
- System Eq1 On/Off
- FLOAT_TYPE
- 0.000000
- System Eq1 L.
- FLOAT_TYPE
--0.0
-+0.000000
- System Lp F.
- FLOAT_TYPE
--5000
-+4999.347168
- System Effects On/Off
- FLOAT_TYPE
- 1.000000
-@@ -1909,13 +1931,13 @@
- << HASH MAP END
- patch
- INT_TYPE
--0
-+19
- y
- FLOAT_TYPE
---35.000000
-+-75.000000
- x
- FLOAT_TYPE
--0.000000
-+-240.000000
- << HASH MAP END
- num_chips
- INT_TYPE
-@@ -1930,148 +1952,115 @@
- 11
- name
- STRING_TYPE
--Calf MultiChorus LADSPA
-+Bus 2
- type_name
- STRING_TYPE
--Ladspa
-+Bus
- effects
- HASH_TYPE
- >> HASH MAP BEGIN
--17
--Dry Amount
-+2
-+System Width On/Off
- FLOAT_TYPE
- 0.000000
--System Ls On/Off
-+System Hs L.
- FLOAT_TYPE
- 0.000000
--System Dry/Wet
-+System Hs F.
- FLOAT_TYPE
--1.000000
--Center Frq 2
-+1499.337646
-+System Ls F.
- FLOAT_TYPE
--4999.503906
--System Width On/Off
-+399.359863
-+System Eq2 F.
- FLOAT_TYPE
--0.000000
--System Hs L.
-+1000.000366
-+System Eq1 F.
- FLOAT_TYPE
--0.000000
-+399.359863
- System Lowpass On/Off
- FLOAT_TYPE
- 0.000000
--Minimum delay
--FLOAT_TYPE
--4.999510
--Modulation depth
-+System Dry/Wet
- FLOAT_TYPE
--5.999410
--System Ls F.
-+1.000000
-+System Pan On/Off
- FLOAT_TYPE
--400
--System Pan
-+0.000000
-+System Reverb On/Off
- FLOAT_TYPE
--0.500000
-+1.000000
- System Reverb
- FLOAT_TYPE
- 0.000000
--System Out On/Off
-+System Out
- FLOAT_TYPE
--1.000000
-+0.999712
- System Volume On/Off
- FLOAT_TYPE
- 1.000000
--Center Frq 1
--FLOAT_TYPE
--97.956001
--Voices
--FLOAT_TYPE
--3.999500
--System Eq2 On/Off
--FLOAT_TYPE
--0.000000
--System Eq1 F.
-+System Volume
- FLOAT_TYPE
--400
--System Effects On/Off
-+0.999712
-+System In On/Off
- FLOAT_TYPE
- 1.000000
--System Chorus On/Off
-+System In
- FLOAT_TYPE
--1.000000
--System Chorus
-+0.999712
-+System Width
- FLOAT_TYPE
- 0.000000
--Modulation rate
--FLOAT_TYPE
--0.499755
--System Pan On/Off
-+System Hs On/Off
- FLOAT_TYPE
- 0.000000
--System Width
-+System Ls On/Off
- FLOAT_TYPE
- 0.000000
--System Eq1 On/Off
-+System Ls L.
- FLOAT_TYPE
- 0.000000
--Amount
-+System Eq2 On/Off
- FLOAT_TYPE
--2.000000
-+0.000000
- System Eq2 L.
- FLOAT_TYPE
- 0.000000
--System Eq2 F.
-+System Eq1 On/Off
- FLOAT_TYPE
--1000
-+0.000000
- System Eq1 L.
- FLOAT_TYPE
- 0.000000
--System Ls L.
-+System Lp F.
- FLOAT_TYPE
--0.000000
--System Reverb On/Off
-+1499.337646
-+System Effects On/Off
- FLOAT_TYPE
- 1.000000
--System In On/Off
-+System Pan
-+FLOAT_TYPE
-+0.500000
-+System Chorus On/Off
- FLOAT_TYPE
- 1.000000
--System Hs On/Off
-+System Chorus
- FLOAT_TYPE
- 0.000000
--Inter-voice phase
--FLOAT_TYPE
--63.972000
--System Hs F.
--FLOAT_TYPE
--1500
--System Lp F.
--FLOAT_TYPE
--5000
--System Out
--FLOAT_TYPE
--1.0
--Q
--FLOAT_TYPE
--0.125000
--Stereo phase
--FLOAT_TYPE
--180.000000
--System In
--FLOAT_TYPE
--1.0
--System Volume
-+System Out On/Off
- FLOAT_TYPE
--0.999712
-+1.000000
- << HASH MAP END
- << HASH MAP END
- patch
- INT_TYPE
--20
-+17
- y
- FLOAT_TYPE
- -115.000000
- x
- FLOAT_TYPE
---120.000000
-+-240.000000
- << HASH MAP END
- <int hash> 2
- HASH_TYPE
-@@ -2083,130 +2072,115 @@
- 11
- name
- STRING_TYPE
--Zita Reverb
-+System Out
- type_name
- STRING_TYPE
--Faust
-+Jack
- effects
- HASH_TYPE
- >> HASH MAP BEGIN
--11
--System Eq2 On/Off
--FLOAT_TYPE
--1.000000
--System Eq2 L.
--FLOAT_TYPE
---5.243000
--System Eq1 F.
--FLOAT_TYPE
--400
--System Out
-+2
-+System Width On/Off
- FLOAT_TYPE
--1.0
--Low RT60
-+0.000000
-+System Hs L.
- FLOAT_TYPE
--3.587200
--LF X
-+0.000000
-+System Hs F.
- FLOAT_TYPE
--199.910004
--System Hs On/Off
-+4499.011719
-+System Ls F.
- FLOAT_TYPE
--1.000000
--System Ls On/Off
-+399.359863
-+System Eq2 F.
- FLOAT_TYPE
--0.000000
--System Ls L.
-+1000.000366
-+System Eq1 F.
- FLOAT_TYPE
--0.000000
--System Chorus
-+399.359863
-+System Lowpass On/Off
- FLOAT_TYPE
- 0.000000
--Mid RT60
-+System Dry/Wet
- FLOAT_TYPE
--4.755500
--Input: In Delay
-+1.000000
-+System Pan On/Off
- FLOAT_TYPE
- 0.000000
--System Effects On/Off
-+System Reverb On/Off
- FLOAT_TYPE
- 1.000000
- System Reverb
- FLOAT_TYPE
- 0.000000
--System Dry/Wet
--FLOAT_TYPE
--1.000000
--System Ls F.
--FLOAT_TYPE
--400
--System Eq2 F.
--FLOAT_TYPE
--1000
--System Lp F.
-+System Out
- FLOAT_TYPE
--5000
-+0.999712
- System Volume On/Off
- FLOAT_TYPE
- 1.000000
-+System Volume
-+FLOAT_TYPE
-+0.000000
- System In On/Off
- FLOAT_TYPE
- 1.000000
--System Pan
-+System In
- FLOAT_TYPE
--0.500000
--System Reverb On/Off
-+0.999712
-+System Width
- FLOAT_TYPE
--1.000000
--System Pan On/Off
-+0.005000
-+System Hs On/Off
- FLOAT_TYPE
- 0.000000
--System Out On/Off
--FLOAT_TYPE
--1.000000
--System Hs F.
-+System Ls On/Off
- FLOAT_TYPE
--4500
--System Chorus On/Off
-+0.000000
-+System Ls L.
- FLOAT_TYPE
--1.000000
--System Eq1 L.
-+0.000000
-+System Eq2 On/Off
- FLOAT_TYPE
- 0.000000
--System In
-+System Eq2 L.
- FLOAT_TYPE
--1.0
--HF Damping
-+0.000000
-+System Eq1 On/Off
- FLOAT_TYPE
--3657.959961
--System Width On/Off
-+0.000000
-+System Eq1 L.
- FLOAT_TYPE
- 0.000000
--System Width
-+System Lp F.
- FLOAT_TYPE
--0.190000
--System Hs L.
-+4999.347168
-+System Effects On/Off
- FLOAT_TYPE
--9.639000
--System Eq1 On/Off
-+1.000000
-+System Pan
- FLOAT_TYPE
--0.000000
--System Lowpass On/Off
-+0.500000
-+System Chorus On/Off
-+FLOAT_TYPE
-+1.000000
-+System Chorus
- FLOAT_TYPE
- 0.000000
--System Volume
-+System Out On/Off
- FLOAT_TYPE
--1.039322
-+1.000000
- << HASH MAP END
- << HASH MAP END
- patch
- INT_TYPE
--7
-+1
- y
- FLOAT_TYPE
---75.000000
-+-35.000000
- x
- FLOAT_TYPE
---120.000000
-+120.000000
- << HASH MAP END
- <int hash> 0
- HASH_TYPE
-@@ -2218,115 +2192,148 @@
- 11
- name
- STRING_TYPE
--Bus 2
-+Calf MultiChorus LADSPA
- type_name
- STRING_TYPE
--Bus
-+Ladspa
- effects
- HASH_TYPE
- >> HASH MAP BEGIN
--2
--System Width On/Off
-+17
-+Dry Amount
- FLOAT_TYPE
- 0.000000
--System Hs L.
-+System Ls On/Off
- FLOAT_TYPE
- 0.000000
--System Hs F.
-+System Dry/Wet
- FLOAT_TYPE
--1500
--System Ls F.
-+1.000000
-+Center Frq 2
- FLOAT_TYPE
--400
--System Eq2 F.
-+4999.450195
-+System Width On/Off
- FLOAT_TYPE
--1000.000366
--System Eq1 F.
-+0.000000
-+System Hs L.
- FLOAT_TYPE
--400
-+0.000000
- System Lowpass On/Off
- FLOAT_TYPE
- 0.000000
--System Dry/Wet
-+Minimum delay
- FLOAT_TYPE
--1.000000
--System Pan On/Off
-+4.998043
-+Modulation depth
- FLOAT_TYPE
--0.000000
--System Reverb On/Off
-+5.997910
-+System Ls F.
- FLOAT_TYPE
--1.000000
-+399.359863
-+System Pan
-+FLOAT_TYPE
-+0.500000
- System Reverb
- FLOAT_TYPE
- 0.000000
--System Out
-+System Out On/Off
- FLOAT_TYPE
--1.0
-+1.000000
- System Volume On/Off
- FLOAT_TYPE
- 1.000000
--System Volume
-+Center Frq 1
- FLOAT_TYPE
--0.999712
--System In On/Off
-+97.867630
-+Voices
-+FLOAT_TYPE
-+3.999500
-+System Eq2 On/Off
-+FLOAT_TYPE
-+0.000000
-+System Eq1 F.
-+FLOAT_TYPE
-+399.359863
-+System Effects On/Off
- FLOAT_TYPE
- 1.000000
--System In
-+System Chorus On/Off
- FLOAT_TYPE
--1.0
--System Width
-+1.000000
-+System Chorus
- FLOAT_TYPE
- 0.000000
--System Hs On/Off
-+Modulation rate
- FLOAT_TYPE
--0.000000
--System Ls On/Off
-+0.499701
-+System Pan On/Off
- FLOAT_TYPE
- 0.000000
--System Ls L.
-+System Width
- FLOAT_TYPE
- 0.000000
--System Eq2 On/Off
-+System Eq1 On/Off
- FLOAT_TYPE
- 0.000000
-+Amount
-+FLOAT_TYPE
-+2.000000
- System Eq2 L.
- FLOAT_TYPE
- 0.000000
--System Eq1 On/Off
-+System Eq2 F.
- FLOAT_TYPE
--0.000000
-+1000.000366
- System Eq1 L.
- FLOAT_TYPE
- 0.000000
--System Lp F.
-+System Ls L.
- FLOAT_TYPE
--1500
--System Effects On/Off
-+0.000000
-+System Reverb On/Off
- FLOAT_TYPE
- 1.000000
--System Pan
--FLOAT_TYPE
--0.500000
--System Chorus On/Off
-+System In On/Off
- FLOAT_TYPE
- 1.000000
--System Chorus
-+System Hs On/Off
- FLOAT_TYPE
- 0.000000
--System Out On/Off
-+Inter-voice phase
- FLOAT_TYPE
--1.000000
-+63.972000
-+System Hs F.
-+FLOAT_TYPE
-+1499.337646
-+System Lp F.
-+FLOAT_TYPE
-+4999.347168
-+System Out
-+FLOAT_TYPE
-+0.999712
-+Q
-+FLOAT_TYPE
-+0.125000
-+Stereo phase
-+FLOAT_TYPE
-+180.000000
-+System In
-+FLOAT_TYPE
-+0.999712
-+System Volume
-+FLOAT_TYPE
-+0.999712
- << HASH MAP END
- << HASH MAP END
- patch
- INT_TYPE
--17
-+20
- y
- FLOAT_TYPE
- -115.000000
- x
- FLOAT_TYPE
---240.000000
-+-120.000000
- << HASH MAP END
- << HASH MAP END
- << HASH MAP END
-diff -ru radium-1.9.1/bin/packages/build.sh radium-master/bin/packages/build.sh
---- radium-1.9.1/bin/packages/build.sh 2012-11-10 19:41:11.000000000 +0100
-+++ radium-master/bin/packages/build.sh 2012-11-12 09:08:12.000000000 +0100
-@@ -69,7 +69,7 @@
- tar xvzf fluidsynth-1.1.6.tar.gz
- cd fluidsynth-1.1.6
- make clean
--CFLAGS="-mtune=native -O3" CPPFLAGS="-mtune=native -O3" ./configure --enable-static --disable-aufile-support --disable-pulse-support --disable-alsa-support --disable-libsndfile-support --disable-portaudio-support --disable-oss-support --disable-midishare --disable-jack-support --disable-coreaudio --disable-coremidi --disable-dart --disable-lash --disable-ladcca --disable-aufile-support --disable-dbus-support
-+CFLAGS="-mtune=native -O3" CPPFLAGS="-mtune=native -O3" ./configure --enable-static --disable-aufile-support --disable-pulse-support --disable-alsa-support --disable-libsndfile-support --disable-portaudio-support --disable-oss-support --disable-midishare --disable-jack-support --disable-coreaudio --disable-coremidi --disable-dart --disable-lash --disable-ladcca --disable-aufile-support --disable-dbus-support --without-readline
- # --enable-debug
- make -j3
- cd ..
-diff -ru radium-1.9.1/build_linux_binary.sh radium-master/build_linux_binary.sh
---- radium-1.9.1/build_linux_binary.sh 2012-11-10 19:41:11.000000000 +0100
-+++ radium-master/build_linux_binary.sh 2012-11-12 09:08:12.000000000 +0100
-@@ -4,8 +4,14 @@
-
- export IS_LINUX_BINARY="-DIS_LINUX_BINARY"
-
-+rm -f Qt_Main.o
-+
-+export OPTIMIZE="-mtune=generic -msse -O3"
-+export BUILDTYPE=RELEASE
-+
- ./build_linux.sh $@
-
-+
- cp README radium64_dist/
- cp bin/radium radium64_dist/bin/
- cp bin/*.py radium64_dist/bin/
-@@ -14,7 +20,7 @@
- cp bin/colors radium64_dist/bin/
- cp bin/menues.conf radium64_dist/bin/
- cp bin/keybindings.conf radium64_dist/bin/
--rm -f radium_0.9.1_linux64.tar.gz && tar cvzf radium_0.9.1_linux64.tar.gz radium64_dist
-+rm -f radium_1.9.1_linux64.tar.gz && tar cvzf radium_1.9.1_linux64.tar.gz radium64_dist
-
-
- #echo "Building finished."
-diff -ru radium-1.9.1/build_linux_common.sh radium-master/build_linux_common.sh
---- radium-1.9.1/build_linux_common.sh 2012-11-10 19:41:11.000000000 +0100
-+++ radium-master/build_linux_common.sh 2012-11-12 09:08:12.000000000 +0100
-@@ -7,8 +7,14 @@
- export UIC="`./find_moc_and_uic_paths.sh uic`"
-
- #export BUILDTYPE=RELEASE
--export BUILDTYPE=DEBUG
--export OPTIMIZE="-mtune=native -O3"
-+if ! env |grep BUILDTYPE ; then
-+ export BUILDTYPE=DEBUG
-+fi
-+
-+if ! env |grep OPTIMIZE ; then
-+ export OPTIMIZE="-mtune=native -O3"
-+fi
-+
- export CPUOPT="$OPTIMIZE" # Some files are so CPU intensive that we need to turn on optimizations even in debug mode, at least when running in valgrind.
-
- export CCC=g++
-diff -ru radium-1.9.1/Changelog radium-master/Changelog
---- radium-1.9.1/Changelog 2012-11-10 19:41:11.000000000 +0100
-+++ radium-master/Changelog 2012-11-12 09:08:12.000000000 +0100
-@@ -1,3 +1,37 @@
-+
-+Most important changes 1.9.1 -> 1.9.2:
-+* Give editor keyboard focus when clicking it
-+* Option to set number of lines to scroll when adding notes. (suggested by Florian Paul Schmidt)
-+* Right click to reset slider value
-+* Properly load samples. (Thanks to Erik de Castro Lopo for explaining the libsndfile API)
-+* Avoid playing samples two times (almost exactly on top of each other) when clicking the filename of a sample. (Bug found by Florian Paul Schmidt)
-+* Make bindir and libdir overridable in the Makefile. Requested by Dominique Michel to easier make ebuilds for Radium.
-+* Support several paths in LADSPA_PATH (Bug reported by Florian Paul Schmidt)
-+* Fix readline build errors (Bug reported by Florian Paul Schmidt)
-+
-+
-+
-+Most important changes 0.69.3 -> 1.9.1:
-+* Audio.
-+* A quick-to-use modular mixer. Jack ports can be inserted anywhere.
-+* VST plugins and instruments (native, not via wine)
-+* LADSPA
-+* Fluidsynth instrument
-+* 20 STK instruments. (Physical modelling)
-+* Sampler instrument (soundfiles, xi instruments, soundfonts)
-+* Multiband compressor
-+* Built-in filters and equalizers.
-+* Simple arpeggiator
-+* Drunk input velocity
-+* Various GUI improvements
-+* Pitch expand made available in the menues.
-+* Tapiir plugin
-+* Zita reverb plugin
-+* Demo song
-+* Reconfigured keybindings
-+* Various bug fixes
-+
-+
- Most important changes 0.69.2 -> 0.69.3:
- * Fix font update problem after changing size
- * Add Append Track function. Using F key, same as Append Block.
-diff -ru radium-1.9.1/common/notes.c radium-master/common/notes.c
---- radium-1.9.1/common/notes.c 2012-11-10 19:41:11.000000000 +0100
-+++ radium-master/common/notes.c 2012-11-12 09:08:12.000000000 +0100
-@@ -201,6 +201,8 @@
- return new_velocity;
- }
-
-+int g_downscroll = 1;
-+
- void InsertNoteCurrPos(struct Tracker_Windows *window,int notenum, int override){
- struct WBlocks *wblock;
- struct WTracks *wtrack;
-@@ -244,7 +246,7 @@
-
- }
- if(window->curr_track_sub==-1 && !pc->isplaying){
-- ScrollEditorDown(window,1);
-+ ScrollEditorDown(window,g_downscroll);
- }
-
- }else{
-@@ -277,7 +279,7 @@
- UpdateAllWTracksCoordinates(window,wblock);
-
- if(window->curr_track_sub==-1 && override==0 && !pc->isplaying){
-- ScrollEditorDown(window,1);
-+ ScrollEditorDown(window,g_downscroll);
- }
-
- UpdateTrackReallines(window,wblock,wtrack);
-@@ -386,7 +388,7 @@
- }
-
- if(window->curr_track_sub==-1 && !pc->isplaying){
-- ScrollEditorDown(window,1);
-+ ScrollEditorDown(window,g_downscroll);
- }
- UpdateTrackReallines(window,wblock,wtrack);
- ClearTrack(window,wblock,wtrack,wblock->top_realline,wblock->bot_realline);
-diff -ru radium-1.9.1/common/visual_proc.h radium-master/common/visual_proc.h
---- radium-1.9.1/common/visual_proc.h 2012-11-10 19:41:11.000000000 +0100
-+++ radium-master/common/visual_proc.h 2012-11-12 09:08:12.000000000 +0100
-@@ -82,6 +82,8 @@
- extern LANGSPEC void GFX_showHideEditor(void);
- extern LANGSPEC void GFX_showHideMixerWidget(void);
-
-+extern LANGSPEC bool GFX_InstrumentWindowIsVisible(void);
-+
- extern LANGSPEC void GFX_MaximizeEditorWindow(struct Tracker_Windows *tvisual);
- extern LANGSPEC void GFX_MinimizeEditorWindow(struct Tracker_Windows *tvisual);
-
-diff -ru radium-1.9.1/Makefile.Qt radium-master/Makefile.Qt
---- radium-1.9.1/Makefile.Qt 2012-11-10 19:41:11.000000000 +0100
-+++ radium-master/Makefile.Qt 2012-11-12 20:03:20.000000000 +0100
-@@ -8,8 +8,8 @@
- # 1. Where to install
- #
- PREFIX ?= /usr/local
--bindir = $(PREFIX)/bin
--libdir = $(PREFIX)/lib
-+bindir ?= $(PREFIX)/bin
-+libdir ?= $(PREFIX)/lib
-
-
- # 2. Where moc and uic for QT4 is installed.
-@@ -85,7 +85,7 @@
- GTK_LDFLAGS ?= `$(PKG) --libs gtk+-2.0`
-
-
--DEFINES= -DNOPAUSEPLAY
-+DEFINES=-DNOPAUSEPLAY
- # -DMEMORY_DEBUG
- # define SYSBASEDEBUG
- # define TRACKER_DEBUG
-@@ -264,10 +264,12 @@
- mkdir $(DESTDIR)$(libdir)/radium/packages/xmessage-1.0.3/
- cp bin/packages/xmessage-1.0.3/xmessage $(DESTDIR)$(libdir)/radium/packages/xmessage-1.0.3/
-
-+ rm -fr $(DESTDIR)$(libdir)/radium/python2.7
-+
- chmod -R a+rx $(DESTDIR)$(libdir)/radium/*
-
- echo "#!/bin/sh" >$(DESTDIR)$(bindir)/radium
-- echo "cd " $(DESTDIR)$(libdir)/radium >>$(DESTDIR)$(bindir)/radium
-+ echo "cd " $(libdir)/radium >>$(DESTDIR)$(bindir)/radium
- echo "./radium" >>$(DESTDIR)$(bindir)/radium
-
- chmod a+rx $(DESTDIR)$(bindir)/radium
-Seulement dans radium-master: Makefile.Qt_radium_script.patch
-diff -ru radium-1.9.1/Qt/Qt_EventReceiver.cpp radium-master/Qt/Qt_EventReceiver.cpp
---- radium-1.9.1/Qt/Qt_EventReceiver.cpp 2012-11-10 19:41:11.000000000 +0100
-+++ radium-master/Qt/Qt_EventReceiver.cpp 2012-11-12 09:08:12.000000000 +0100
-@@ -294,6 +294,8 @@
-
- EventReciever(&tevent,this->window);
-
-+ setFocus();
-+
- updateEditor();
- }
-
-diff -ru radium-1.9.1/Qt/Qt_instruments.cpp radium-master/Qt/Qt_instruments.cpp
---- radium-1.9.1/Qt/Qt_instruments.cpp 2012-11-10 19:41:11.000000000 +0100
-+++ radium-master/Qt/Qt_instruments.cpp 2012-11-12 09:08:12.000000000 +0100
-@@ -441,6 +441,7 @@
- return instruments_widget;
- }
-
-+#if 0
- static void set_widget_height(int height){
- QMainWindow *main_window = static_cast<QMainWindow*>(root->song->tracker_windows->os_visual.main_window);
- EditorWidget *editor = static_cast<EditorWidget*>(root->song->tracker_windows->os_visual.widget);
-@@ -458,13 +459,20 @@
- # undef QValueList
- #endif
- }
-+#endif
-+
-+bool GFX_InstrumentWindowIsVisible(void){
-+ return instruments_widget->isVisible();
-+}
-
- void GFX_InstrumentWindowToFront(void){
-- set_widget_height(300);
-+ //set_widget_height(30);
-+ instruments_widget->show();
- }
-
- void GFX_InstrumentWindowToBack(void){
-- set_widget_height(0);
-+ instruments_widget->hide();
-+ //set_widget_height(0);
- }
-
-
-diff -ru radium-1.9.1/Qt/Qt_Main.cpp radium-master/Qt/Qt_Main.cpp
---- radium-1.9.1/Qt/Qt_Main.cpp 2012-11-10 19:41:11.000000000 +0100
-+++ radium-master/Qt/Qt_Main.cpp 2012-11-12 09:08:12.000000000 +0100
-@@ -353,7 +353,7 @@
- #if 1
- if(override_default_qt_style){
- //QApplication::setStyle( new QOxygenStyle());
-- QApplication::setStyle( new QPlastiqueStyle());
-+ QApplication::setStyle( new QPlastiqueStyle());
- //QApplication::setStyle( new QCleanlooksStyle() );
- //QApplication::setStyle( new QWindowsStyle() );
- }
-@@ -544,9 +544,12 @@
- //exit(0);
- }
-
-- // Create application here in order to get default style. (not recommended, but can't find another way)
-- qapplication=new MyApplication(argc,argv);
-- g_qapplication = qapplication;
-+ QApplication::setDesktopSettingsAware(false);
-+
-+ // Create application here in order to get default style. (not recommended, but can't find another way)
-+ qapplication=new MyApplication(argc,argv);
-+ g_qapplication = qapplication;
-+
-
- {
- #if 0
-@@ -572,22 +575,27 @@
-
- QFontDatabase::addApplicationFont("fonts/LiberationMono-Bold.ttf");
- QFontDatabase::addApplicationFont("fonts/VeraMono.ttf");
-+ QFontDatabase::addApplicationFont("fonts/NimbusSansL.ttf");
-+
-
- //QApplication::setFont(QFont("Lohit-Tamil",8));
- //QApplication::setFont(QFont("Nimbus Sans L",8));
- //QApplication::setFont(QFont("Liberation Sans L",8));
-
-- printf("System font name: \"%s\". Size: %d\n",QApplication::font().family().ascii(),QApplication::font().pointSize());
-+ //printf("System font name: \"%s\". Size: %d\n",QApplication::font().family().ascii(),QApplication::font().pointSize());
-
- int system_font_size = SETTINGS_read_int((char*)"system_font_size",-1);
- if(system_font_size>=0){
- //QFont font=QFont(QApplication::font().family(),system_font_size);
- QFont font=QFont("Nimbus Sans L",system_font_size);
-+ //QFont font=QFont("Nimbus Sans L",10);
-+ //font.setPointSize(system_font_size);
- //QFont font=QFont("Bitstream Vera Sans Mono",system_font_size);
- QApplication::setFont(font);
- }
- }
-
-+
- signal(SIGINT,finish);
-
- #if GTK_IS_USED
-diff -ru radium-1.9.1/Qt/Qt_Menues.cpp radium-master/Qt/Qt_Menues.cpp
---- radium-1.9.1/Qt/Qt_Menues.cpp 2012-11-10 19:41:11.000000000 +0100
-+++ radium-master/Qt/Qt_Menues.cpp 2012-11-12 09:08:12.000000000 +0100
-@@ -127,7 +127,7 @@
- //QFont sansFont("WenQuanYi Zen Hei Mono",8);
- //QFont sansFont("Aurulent Sans Mono",8);
- QFont sansFont("Bitstream Vera Sans Mono",8);
--
-+ //sansFont.setPointSize(8);
- //sansFont.setBold(true);
-
- menu->menu->setFont(sansFont);
-diff -ru radium-1.9.1/Qt/Qt_sample_requester_widget_callbacks.h radium-master/Qt/Qt_sample_requester_widget_callbacks.h
---- radium-1.9.1/Qt/Qt_sample_requester_widget_callbacks.h 2012-11-10 19:41:11.000000000 +0100
-+++ radium-master/Qt/Qt_sample_requester_widget_callbacks.h 2012-11-12 09:08:12.000000000 +0100
-@@ -285,6 +285,7 @@
- successfully_selected = FLUIDSYNTH_set_new_preset(plugin, _sf2_file, bank_num, preset_num);
-
- if(successfully_selected==true && pc->isplaying==false)
-+ printf("playing note 1\n");
- PATCH_play_note(g_currpatch, 12*_preview_octave, MAX_VELOCITY/2, NULL);
- }
-
-@@ -345,6 +346,7 @@
-
- if(SAMPLER_set_new_sample(plugin,filename,file_list->currentRow()-1)==true){
- if(pc->isplaying==false)
-+ printf("playing note 2\n");
- PATCH_play_note(g_currpatch, 12*_preview_octave, MAX_VELOCITY/2, NULL);
- }
- }
-@@ -390,6 +392,7 @@
- }
-
- void handle_item_pressed(QString item_text){
-+ printf("item pressed\n");
- switch(_file_chooser_state){
- case IN_SF2_BANK:
- handle_sf2_preset_pressed(item_text);
-@@ -430,7 +433,8 @@
-
- void on_file_list_itemActivated ( QListWidgetItem * item ){
- bool was_normal_file = item!=NULL && !item->text().endsWith("/");
-- on_file_list_itemPressed(item);
-+ //on_file_list_itemPressed(item);
-+ handle_item_pressed(item->text());
- if(was_normal_file){
-
- if(g_filenames_hash.contains(item->text())==true)
-@@ -457,11 +461,12 @@
- void on_file_list_currentItemChanged ( QListWidgetItem * current, QListWidgetItem * previous ){
- printf("Current item changed!\n");
- if( current!=NULL && !current->text().endsWith("/"))
-- on_file_list_itemPressed(current);
-+ handle_item_pressed(current->text());
- }
-
- void on_file_list_itemPressed(QListWidgetItem * item ){
-- handle_item_pressed(item->text());
-+ printf("file_list item pressed\n");
-+ //handle_item_pressed(item->text());
- }
-
- #if 0
-@@ -530,6 +535,7 @@
-
- if(SAMPLER_set_new_sample(plugin,filename,file_list->currentRow()-1)==true){
- if(pc->isplaying==false)
-+ printf("playing note 3\n");
- PATCH_play_note(g_currpatch, 12*_preview_octave, MAX_VELOCITY/2, NULL);
- //SAMPLER_save_sample(plugin, "/tmp/tmp.wav", 0);
- }
-diff -ru radium-1.9.1/README radium-master/README
---- radium-1.9.1/README 2012-11-10 19:41:11.000000000 +0100
-+++ radium-master/README 2012-11-12 09:08:12.000000000 +0100
-@@ -1,7 +1,7 @@
-
-
--Radium V1.9.1
--Released 2012-11-10
-+Radium V1.9.2
-+Released 2012-11-12
-
-
-
Added: trunk/overlays/proaudio/media-sound/radium/files/radium-1.9.2.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/radium/files/radium-1.9.2.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/radium/files/radium-1.9.2.patch 2012-11-14 18:43:20 UTC (rev 2308)
@@ -0,0 +1,736 @@
+Seulement dans radium-1.9.2/audio: faust_multibandcomp_noselect.cpp
+diff -ru radium-1.9.2/audio/Ladspa_plugins.cpp radium-master/audio/Ladspa_plugins.cpp
+--- radium-1.9.2/audio/Ladspa_plugins.cpp 2012-11-12 16:08:58.000000000 +0100
++++ radium-master/audio/Ladspa_plugins.cpp 2012-11-14 10:07:22.000000000 +0100
+@@ -854,7 +854,7 @@
+ #endif
+
+ #if defined(FOR_WINDOWS) || defined(FOR_MACOSX)
+- sprintf(ladspa_path,"%s",QSring(QString(OS_get_program_path()) + OS_get_directory_separator() + "ladspa").ascii());
++ sprintf(ladspa_path,"%s",QString(QString(OS_get_program_path()) + OS_get_directory_separator() + "ladspa").ascii());
+ #endif
+
+ char *dirname = strtok (ladspa_path, ":");
+diff -ru radium-1.9.2/audio/Sampler_plugin.c radium-master/audio/Sampler_plugin.c
+--- radium-1.9.2/audio/Sampler_plugin.c 2012-11-12 16:08:58.000000000 +0100
++++ radium-master/audio/Sampler_plugin.c 2012-11-14 10:07:22.000000000 +0100
+@@ -1102,7 +1102,6 @@
+ get_effect_format : NULL,
+ get_effect_num : get_effect_num,
+ get_effect_name : get_effect_name,
+- get_display_value_string : NULL,
+ effect_is_RT : NULL,
+ create_plugin_data : create_plugin_data,
+ cleanup_plugin_data : cleanup_plugin_data,
+diff -ru radium-1.9.2/audio/SoundPlugin.c radium-master/audio/SoundPlugin.c
+--- radium-1.9.2/audio/SoundPlugin.c 2012-11-12 16:08:58.000000000 +0100
++++ radium-master/audio/SoundPlugin.c 2012-11-14 10:07:22.000000000 +0100
+@@ -996,3 +996,8 @@
+ for(i=0;i<type->num_effects;i++)
+ PLUGIN_set_effect_value(plugin, 0, i, plugin->initial_effect_values[i], PLUGIN_STORED_TYPE, PLUGIN_STORE_VALUE);
+ }
++
++void PLUGIN_reset_one_effect(SoundPlugin *plugin, int effect_num){
++ Undo_AudioEffect_CurrPos(plugin->patch, effect_num);
++ PLUGIN_set_effect_value(plugin, 0, effect_num, plugin->initial_effect_values[effect_num], PLUGIN_STORED_TYPE, PLUGIN_STORE_VALUE);
++}
+diff -ru radium-1.9.2/audio/SoundPlugin_proc.h radium-master/audio/SoundPlugin_proc.h
+--- radium-1.9.2/audio/SoundPlugin_proc.h 2012-11-12 16:08:58.000000000 +0100
++++ radium-master/audio/SoundPlugin_proc.h 2012-11-14 10:07:22.000000000 +0100
+@@ -52,5 +52,6 @@
+ extern LANGSPEC SoundPlugin *PLUGIN_create_from_state(hash_t *state);
+
+ extern LANGSPEC void PLUGIN_reset(SoundPlugin *plugin);
++extern LANGSPEC void PLUGIN_reset_one_effect(SoundPlugin *plugin, int effect_num);
+
+ #endif // AUDIO_SOUNDPLUGIN_PROC_H
+diff -ru radium-1.9.2/audio/VST_plugins.cpp radium-master/audio/VST_plugins.cpp
+--- radium-1.9.2/audio/VST_plugins.cpp 2012-11-12 16:08:58.000000000 +0100
++++ radium-master/audio/VST_plugins.cpp 2012-11-14 10:07:22.000000000 +0100
+@@ -23,6 +23,13 @@
+ // http://code.breakfastquay.com/projects/dssi-vst/repository/entry/dssi-vst-server.cpp
+
+
++#if defined(FOR_MACOSX)
++# import <Carbon/Carbon.h>
++# undef EVENT_H
++//
++#endif
++
++
+ #include <stdlib.h>
+ #include <string.h>
+ #include <stdio.h>
+@@ -32,7 +39,7 @@
+
+ #include <vector>
+
+-#if defined(USE_VESTIGE)
++#if USE_VESTIGE
+
+ # include "vestige/aeffectx.h"
+
+@@ -51,15 +58,18 @@
+
+ const int kVstMaxParamStrLen = 8;
+
+-#else // defined(USE_VESTIGE)
++#else // USE_VESTIGE
+
+ // If this fails, and you don't bother downloading and installing vstsdk from steinberg, set USE_VESTIGE to 1 in the Makefile!
+
+ # define VST_FORCE_DEPRECATED 0
+ # include <vstsdk2.4/pluginterfaces/vst2.x/aeffectx.h>
+
+-#endif // defined(USE_VESTIGE)
++#endif // USE_VESTIGE
+
++#include <QMacNativeWidget>
++#include <QApplication>
++#include <QBoxLayout>
+
+ #include <QWidget>
+ #include <QLibrary>
+@@ -70,6 +80,7 @@
+ #include <QSlider>
+
+ #include "../common/nsmtracker.h"
++#include "../common/visual_proc.h"
+ #include "../common/OS_visual_input.h"
+ #include "../common/settings_proc.h"
+
+@@ -104,8 +115,8 @@
+ AEffect *aeffect;
+ EditorWidget *editor_widget;
+ float sample_rate;
+- struct VstEvents *events;
+- struct VstMidiEvent midi_events[MAX_EVENTS];
++ VstEvents *events;
++ VstMidiEvent midi_events[MAX_EVENTS];
+ };
+
+ struct TypeDataParam{
+@@ -178,7 +189,7 @@
+
+ // Constructor.
+ EditorWidget(QWidget *pParent, Qt::WindowFlags wflags = 0)
+- : QWidget(pParent, wflags),
++ : QWidget(pParent, wflags),
+ _is_open(false),
+ #if defined(Q_WS_X11)
+ m_pDisplay(QX11Info::display()),
+@@ -196,13 +207,6 @@
+ {
+ _effect = effect;
+
+- // Start the proper (child) editor...
+- long value = 0;
+- void *ptr = (void *) winId();
+- #if defined(Q_WS_X11)
+- value = (long) m_pDisplay;
+- #endif
+-
+ // Make it the right size
+ struct ERect {
+ short top;
+@@ -212,19 +216,42 @@
+ } *pRect;
+
+ if (effect->dispatcher(effect, effEditGetRect, 0, 0, &pRect, 0.0f)) {
++#if !defined(FOR_MACOSX)
+ int w = pRect->right - pRect->left;
+ int h = pRect->bottom - pRect->top;
+ if (w > 0 && h > 0)
+ QWidget::setFixedSize(w, h);
++#endif
+ }
+
+- _effect->dispatcher(_effect, effEditOpen, 0, value, ptr, 0.0f);
++#if defined(FOR_WINDOWS)
++ void *ptr = (void *) winId();
++ _effect->dispatcher(_effect, effEditOpen, 0, 0, ptr, 0.0f);
++#endif
++
++#if defined(FOR_MACOSX)
++
++ Rect contentRect = {pRect->top+100, pRect->left+100, pRect->bottom+100, pRect->right+100};
++ //SetRect(&contentRect, 200, 200, 400, 400);
++ HIWindowRef windowRef;
++ CreateNewWindow(kDocumentWindowClass, kWindowStandardFloatingAttributes | kWindowCompositingAttribute | kWindowStandardHandlerAttribute, &contentRect, &windowRef);
++ HIViewRef contentView = 0;
++ GetRootControl(windowRef, &contentView);
+
+- #if defined(Q_WS_X11)
++ _effect->dispatcher(_effect,effEditOpen, 0, 0, (void*)windowRef, 0.0f);
++
++ ShowWindow(windowRef);
++#endif // defined(FOR_MACOSX)
++
++
++#if defined(Q_WS_X11)
++ void *ptr = (void *) winId();
++ long value = (long) m_pDisplay;
++ _effect->dispatcher(_effect, effEditOpen, 0, value, ptr, 0.0f);
+ m_wVstEditor = getXChildWindow(m_pDisplay, (Window) winId());
+ if (m_wVstEditor)
+ m_pVstEventProc = getXEventProc(m_pDisplay, m_wVstEditor);
+- #endif
++#endif
+
+ g_vstEditors.append(this);
+
+@@ -237,19 +264,23 @@
+
+ // this is the same as m_pVstPlugin->idleEditor()
+ _effect->dispatcher(_effect, effEditIdle, 0, 0, NULL, 0.0f);
++#if !defined(FOR_MACOSX)
+ show();
+ update();
++#endif
+
+- _is_open=true;
++ _is_open=true;
+
+ }
+
+ // Close the editor widget.
+ void close()
+ {
+- printf("Close()\n");
+- QWidget::close();
++ printf("Close()\n");
+
++#if !defined(FOR_MACOSX)
++ QWidget::close();
++#endif
+ if (_effect && _is_open) {
+ _effect->dispatcher(_effect,effEditClose, 0, 0, NULL, 0.0f);
+ // m_pVstPlugin->setEditorVisible(false);
+@@ -260,9 +291,16 @@
+ if (iIndex >= 0)
+ g_vstEditors.removeAt(iIndex);
+
+- _is_open=false;
++ _is_open=false;
+ }
+
++#if 0
++ bool macEvent ( EventHandlerCallRef caller, EventRef event ){
++ printf("got mac event\n");
++ return false;
++ }
++#endif
++
+ #if defined(Q_WS_X11)
+
+ // Local X11 event filter.
+@@ -300,6 +338,7 @@
+ */
+
+ protected:
++#if !defined(FOR_MACOSX)
+
+ // Visibility event handlers.
+ void showEvent(QShowEvent *pShowEvent)
+@@ -333,6 +372,7 @@
+ }
+ #endif
+ }
++#endif // !defined(FOR_MACOSX)
+
+ private:
+
+@@ -344,7 +384,7 @@
+ bool m_bButtonPress;
+ #endif
+
+- AEffect *_effect;
++ AEffect *_effect;
+ };
+
+ } // namespace vst
+@@ -696,7 +736,7 @@
+
+ static void add_midi_event(struct SoundPlugin *plugin,int time,int val1, int val2, int val3){
+ Data *data = (Data*)plugin->data;
+- struct VstEvents *events=data->events;
++ VstEvents *events=data->events;
+
+ if(events->numEvents==MAX_EVENTS){
+ fprintf(stderr,"Error, too many vst midi events at once. Skipping.\n");
+@@ -704,7 +744,7 @@
+ }
+
+ {
+- struct VstMidiEvent *pevent=(struct VstMidiEvent*)events->events[events->numEvents];
++ VstMidiEvent *pevent=(VstMidiEvent*)events->events[events->numEvents];
+ events->numEvents++;
+
+ // printf("note: %d\n",note);
+@@ -841,13 +881,15 @@
+
+ AEffect *aeffect = type_data->get_plugin_instance(VSTS_audioMaster);
+ if (aeffect == NULL){
++ GFX_Message("Loading VST plugin %s failed",plugin_type->name);
+ fprintf(stderr,"nope2\n");
+- abort();
++ //abort();
+ return NULL;
+ }
+ if (aeffect->magic != kEffectMagic){
++ GFX_Message("Loading VST plugin %s failed. It doesnt seem to be a VST plugin...",plugin_type->name);
+ fprintf(stderr,"nope3\n");
+- abort();
++ //abort();
+ return NULL;
+ }
+
+@@ -875,9 +917,9 @@
+ data->editor_widget = editor_widget;
+ data->sample_rate = sample_rate;
+
+- data->events = (struct VstEvents*)calloc(1,sizeof(struct VstEvents) + (MAX_EVENTS*sizeof(struct VstMidiEvent*)));
++ data->events = (VstEvents*)calloc(1,sizeof(VstEvents) + (MAX_EVENTS*sizeof(VstMidiEvent*)));
+ for(int i=0;i<MAX_EVENTS;i++)
+- data->events->events[i] = (struct VstEvent*)&data->midi_events[i];
++ data->events->events[i] = (VstEvent*)&data->midi_events[i];
+
+ aeffect->dispatcher(aeffect, effMainsChanged, 0, 1, NULL, 0.0f);
+
+@@ -939,7 +981,9 @@
+ type_data->get_plugin_instance = get_plugin_instance;
+
+ QString basename = file_info.fileName();
++#if !defined(FOR_MACOSX)
+ basename.resize(basename.size()-strlen(VST_SUFFIX)-1);
++#endif
+
+ plugin_type->type_name = "VST";
+ plugin_type->name = strdup(basename.ascii());
+@@ -971,23 +1015,29 @@
+
+ void create_vst_plugins(void){
+
+-#if 0
+- {
+- QDir dir("/home/kjetil/vst/");
++#if defined(FOR_MACOSX)
++ QDir dir("/Library/Audio/Plug-Ins/VST/");
++
++ //Digits.vst/Contents/MacOS/Digits
++
++ dir.setFilter(QDir::Dirs | QDir::NoDotAndDotDot);
++ dir.setSorting(QDir::Name);
++ QFileInfoList list = dir.entryInfoList();
++ for (int i = 0; i < list.size(); ++i) {
++ QFileInfo fileInfo = list.at(i);
++ QDir dir(fileInfo.absoluteFilePath() + "/Contents/MacOS/");
+ dir.setFilter(QDir::Files | QDir::NoDotAndDotDot);
+ dir.setSorting(QDir::Name);
+
+ QFileInfoList list = dir.entryInfoList();
+ for (int i = 0; i < list.size(); ++i) {
+ QFileInfo fileInfo = list.at(i);
+- if(fileInfo.suffix()==VST_SUFFIX)
+- add_vst_plugin_type(fileInfo);
++ add_vst_plugin_type(fileInfo);
+ }
+-
+- PR_add_menu_entry(PluginMenuEntry::separator());
+ }
+-#endif
+
++
++#else // defined(FOR_MACOSX)
+ int num_paths = SETTINGS_read_int("num_vst_paths", 0);
+
+ for(int i=0;i<num_paths; i++){
+@@ -1005,9 +1055,10 @@
+ if(fileInfo.suffix()==VST_SUFFIX)
+ add_vst_plugin_type(fileInfo);
+ }
+-
++
+ PR_add_menu_entry(PluginMenuEntry::separator());
+ }
++#endif // defined(FOR_MACOSX)
+ }
+
+
+diff -ru radium-1.9.2/audio/VST_plugins_proc.h radium-master/audio/VST_plugins_proc.h
+--- radium-1.9.2/audio/VST_plugins_proc.h 2012-11-12 16:08:58.000000000 +0100
++++ radium-master/audio/VST_plugins_proc.h 2012-11-14 10:07:22.000000000 +0100
+@@ -20,7 +20,7 @@
+ #endif
+
+ #if defined(FOR_MACOSX)
+-# define VST_SUFFIX "dylib"
++# define VST_SUFFIX ""
+ #endif
+
+ #if defined(FOR_WINDOWS)
+diff -ru radium-1.9.2/common/mouse_temponodeborder.c radium-master/common/mouse_temponodeborder.c
+--- radium-1.9.2/common/mouse_temponodeborder.c 2012-11-12 16:08:58.000000000 +0100
++++ radium-master/common/mouse_temponodeborder.c 2012-11-14 10:07:22.000000000 +0100
+@@ -42,28 +42,32 @@
+ ){
+ struct WBlocks *wblock=window->wblock;
+ struct WTracks *wtrack2;
+- int oldwidth;
+ NInt oldrighttrack;
+
+ // PlayStop();
+
+ x-=window->prevaction.eint1;
+
+- oldwidth=wblock->temponodearea.width;
++ int old_width=wblock->temponodearea.width;
+ oldrighttrack=wblock->right_track;
+
++ struct WTracks *leftmost_track = ListFindElement1(&wblock->wtracks->l,wblock->left_track);
++ //int max_x2 = R_MAX(wblock->t.x2-window->fontwidth*10, leftmost_track->x2 - 5);
++ //printf("max_x2: %d, leftmost_track->x2-5: %d\n",max_x2,leftmost_track->x2-5);
++
+ x=R_BOUNDARIES(wblock->temponodearea.x+3, x, wblock->t.x2-window->fontwidth*10);
+
+- wblock->temponodearea.width=x - wblock->temponodearea.x;
++ int new_width = x - wblock->temponodearea.x;
++ if(old_width == new_width)
++ return 0;
++
++ int change = new_width - old_width;
++ //printf("Change: %d, leftmost->x2: %d, wblock->t.x2: %d\n",change,leftmost_track->x2,wblock->t.x2);
++ if(leftmost_track->x2 + change >= wblock->t.x2)
++ return 0;
++
++ wblock->temponodearea.width = new_width;
+
+- if(oldwidth==wblock->temponodearea.width){
+- /*
+- if(window->prevaction.action==NOACTION){
+- DrawUpTrackerWindow(window);
+- }
+- */
+- return 0;
+- }
+
+ // UpdateWTempoNodes(window,wblock);
+
+@@ -71,7 +75,7 @@
+ // DrawUpTrackerWindow(window);
+ // }else{
+ // UpdateTrackerWindow(window);
+- GFX_BitBlt(window,wblock->temponodearea.width-oldwidth,0,
++ GFX_BitBlt(window,wblock->temponodearea.width-old_width,0,
+ wblock->temponodearea.x2-2,wblock->a.y1,
+ wblock->a.x2,wblock->t.y2
+ );
+@@ -86,7 +90,7 @@
+ DrawUpWTempoNodes(window,wblock);
+ // Blt_blt(window);
+
+- if(oldwidth>wblock->temponodearea.width){
++ if(old_width>wblock->temponodearea.width){
+ wtrack2=ListFindElement1(&wblock->wtracks->l,oldrighttrack);
+ while(wtrack2!=NULL && wtrack2->l.num<=wblock->right_track){
+ DrawUpWTrack(window,wblock,wtrack2);
+diff -ru radium-1.9.2/common/mouse_wtrackborder.c radium-master/common/mouse_wtrackborder.c
+--- radium-1.9.2/common/mouse_wtrackborder.c 2012-11-12 16:08:58.000000000 +0100
++++ radium-master/common/mouse_wtrackborder.c 2012-11-14 10:07:22.000000000 +0100
+@@ -63,6 +63,7 @@
+ if(oldfxwidth==wtrack->fxwidth && window->prevaction.action!=NOACTION){
+ return 0;
+ }
++
+ GFX_BitBlt(window,wtrack->fxwidth-oldfxwidth,0,
+ wtrack->fxarea.x2-2,wblock->a.y1,
+ wblock->a.x2,wblock->t.y2
+diff -ru radium-1.9.2/Makefile.Qt radium-master/Makefile.Qt
+--- radium-1.9.2/Makefile.Qt 2012-11-12 16:08:58.000000000 +0100
++++ radium-master/Makefile.Qt 2012-11-14 10:07:22.000000000 +0100
+@@ -70,7 +70,11 @@
+ CCC ?= g++
+ CC ?= gcc
+ LINKER ?= g++
++
++# Note, in case you want to change this variable, beware that the include files in audio/faudiostream are copied from Faust 0.9.55.
+ FAUST ?= /home/kjetil/faudiostream/compiler/faust
++
++
+ JACKOPT ?=
+ LRDFOPT ?= `$(PKG) --cflags lrdf`
+ SNDFILEOPT ?= `$(PKG) --cflags sndfile`
+@@ -269,7 +273,7 @@
+ chmod -R a+rx $(DESTDIR)$(libdir)/radium/*
+
+ echo "#!/bin/sh" >$(DESTDIR)$(bindir)/radium
+- echo "cd " $(DESTDIR)$(libdir)/radium >>$(DESTDIR)$(bindir)/radium
++ echo "cd " $(libdir)/radium >>$(DESTDIR)$(bindir)/radium
+ echo "./radium" >>$(DESTDIR)$(bindir)/radium
+
+ chmod a+rx $(DESTDIR)$(bindir)/radium
+@@ -288,7 +292,7 @@
+ ./build_linux.sh -j7 && rm memory.o && cd bin && valgrind --suppressions=../valgrind-python.supp --suppressions=../Qt47supp.txt --tool=memcheck --leak-check=no --read-var-info=yes --track-origins=yes --fair-sched=yes ./radium
+ # --dont-load-new-song
+ # make -j3 && cd bin && valgrind gdb --args $(PYTHONEXE) start.py keybindings.conf
+- killall -9 X11_Qtstuff.py radium
++# killall -9 X11_Qtstuff.py radium
+
+ # --tool=memcheck --read-var-info=yes --track-origins=yes
+
+diff -ru radium-1.9.2/Qt/EditorWidget.h radium-master/Qt/EditorWidget.h
+--- radium-1.9.2/Qt/EditorWidget.h 2012-11-12 16:08:58.000000000 +0100
++++ radium-master/Qt/EditorWidget.h 2012-11-14 10:07:22.000000000 +0100
+@@ -78,7 +78,7 @@
+ ~EditorWidget();
+
+ #if USE_QT_VISUAL && USE_QT4
+- const QPaintEngine* paintEngine();
++ //const QPaintEngine* paintEngine();
+ #endif
+
+ QColor colors[16]; // color array
+diff -ru radium-1.9.2/Qt/qt4_instruments_widget.ui radium-master/Qt/qt4_instruments_widget.ui
+--- radium-1.9.2/Qt/qt4_instruments_widget.ui 2012-11-12 16:08:58.000000000 +0100
++++ radium-master/Qt/qt4_instruments_widget.ui 2012-11-14 10:07:22.000000000 +0100
+@@ -32,7 +32,7 @@
+ <item row="0" column="1">
+ <widget class="QStackedWidget" name="tabs">
+ <property name="sizePolicy">
+- <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
++ <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+@@ -43,7 +43,7 @@
+ <property name="styleSheet">
+ <string notr="true"/>
+ </property>
+- <widget class="QWidget" name="tabsPage1" native="true"/>
++ <widget class="QWidget" name="tabsPage1"/>
+ </widget>
+ </item>
+ </layout>
+diff -ru radium-1.9.2/Qt/Qt_EventReceiver.cpp radium-master/Qt/Qt_EventReceiver.cpp
+--- radium-1.9.2/Qt/Qt_EventReceiver.cpp 2012-11-12 16:08:58.000000000 +0100
++++ radium-master/Qt/Qt_EventReceiver.cpp 2012-11-14 10:07:22.000000000 +0100
+@@ -84,7 +84,7 @@
+
+
+ #if USE_QT_VISUAL && USE_QT4
+-#if 1
++#if 0
+ const QPaintEngine* EditorWidget::paintEngine(){
+ //qDebug()<<"Paint Engine";
+ return NULL;
+diff -ru radium-1.9.2/Qt/Qt_instruments.cpp radium-master/Qt/Qt_instruments.cpp
+--- radium-1.9.2/Qt/Qt_instruments.cpp 2012-11-12 16:08:58.000000000 +0100
++++ radium-master/Qt/Qt_instruments.cpp 2012-11-14 10:07:22.000000000 +0100
+@@ -366,6 +366,12 @@
+ static Audio_instrument_widget *create_audio_instrument_widget(struct Patch *patch){
+ Audio_instrument_widget *instrument = new Audio_instrument_widget(NULL,patch);
+
++ fprintf(stderr,"instrument: %p, patch: %p\n",instrument,patch);
++ if(instrument==NULL){
++ fprintf(stderr,"instrument==NULL\n");
++ return NULL;
++ }
++
+ instrument->_patch_widget->name_widget->setText(patch->name);
+
+ //instruments_widget->tabs->insertTab(instrument, QString::fromLatin1(patch->name), instruments_widget->tabs->count());
+@@ -545,7 +551,9 @@
+ Undo_MixerConnections_CurrPos();
+
+ plugin = MW_add_plugin(plugin_type, x, y);
+-
++ if(plugin==NULL)
++ return NULL;
++
+ char patchname[200];
+ if(name!=NULL)
+ snprintf(patchname,198,"%s",name);
+@@ -888,10 +896,13 @@
+
+
+ void OS_VST_config(struct Tracker_Windows *window){
++#if defined(FOR_MACOSX)
++ GFX_Message("No VST options to edit on OSX");
++#else
+ //EditorWidget *editor=(EditorWidget *)window->os_visual.widget;
+ Vst_paths_widget *vst_paths_widget=new Vst_paths_widget(NULL); // I'm not quite sure i it's safe to make this one static. It seems to work, but shouldn't the dialog be deleted when destroying the window? Not having it static is at least safe, although it might leak some memory.
+ vst_paths_widget->show();
+-
++#endif
+ printf("Ohjea\n");
+ }
+
+diff -ru radium-1.9.2/Qt/Qt_instruments_widget_callbacks.h radium-master/Qt/Qt_instruments_widget_callbacks.h
+--- radium-1.9.2/Qt/Qt_instruments_widget_callbacks.h 2012-11-12 16:08:58.000000000 +0100
++++ radium-master/Qt/Qt_instruments_widget_callbacks.h 2012-11-14 10:07:22.000000000 +0100
+@@ -9,6 +9,7 @@
+ {
+ setupUi(this);
+ //tabs->tabBar()->hide();
++ //resize(width(),30);
+ }
+
+ public slots:
+diff -ru radium-1.9.2/Qt/Qt_Main.cpp radium-master/Qt/Qt_Main.cpp
+--- radium-1.9.2/Qt/Qt_Main.cpp 2012-11-12 16:08:58.000000000 +0100
++++ radium-master/Qt/Qt_Main.cpp 2012-11-14 10:07:22.000000000 +0100
+@@ -353,7 +353,7 @@
+ #if 1
+ if(override_default_qt_style){
+ //QApplication::setStyle( new QOxygenStyle());
+- QApplication::setStyle( new QPlastiqueStyle());
++ QApplication::setStyle( new QPlastiqueStyle());
+ //QApplication::setStyle( new QCleanlooksStyle() );
+ //QApplication::setStyle( new QWindowsStyle() );
+ }
+@@ -544,9 +544,12 @@
+ //exit(0);
+ }
+
+- // Create application here in order to get default style. (not recommended, but can't find another way)
+- qapplication=new MyApplication(argc,argv);
+- g_qapplication = qapplication;
++ QApplication::setDesktopSettingsAware(false);
++
++ // Create application here in order to get default style. (not recommended, but can't find another way)
++ qapplication=new MyApplication(argc,argv);
++ g_qapplication = qapplication;
++
+
+ {
+ #if 0
+@@ -572,22 +575,30 @@
+
+ QFontDatabase::addApplicationFont("fonts/LiberationMono-Bold.ttf");
+ QFontDatabase::addApplicationFont("fonts/VeraMono.ttf");
++ QFontDatabase::addApplicationFont("fonts/NimbusSansL.ttf");
++
+
+ //QApplication::setFont(QFont("Lohit-Tamil",8));
+ //QApplication::setFont(QFont("Nimbus Sans L",8));
+ //QApplication::setFont(QFont("Liberation Sans L",8));
+
+- printf("System font name: \"%s\". Size: %d\n",QApplication::font().family().ascii(),QApplication::font().pointSize());
++ //printf("System font name: \"%s\". Size: %d\n",QApplication::font().family().ascii(),QApplication::font().pointSize());
+
+ int system_font_size = SETTINGS_read_int((char*)"system_font_size",-1);
+ if(system_font_size>=0){
+- //QFont font=QFont(QApplication::font().family(),system_font_size);
++#if 0 //defined(FOR_MACOSX)
++ QFont font=QFont(QApplication::font().family(),system_font_size);
++#else
+ QFont font=QFont("Nimbus Sans L",system_font_size);
++#endif
++ //QFont font=QFont("Nimbus Sans L",10);
++ //font.setPointSize(system_font_size);
+ //QFont font=QFont("Bitstream Vera Sans Mono",system_font_size);
+ QApplication::setFont(font);
+ }
+ }
+
++
+ signal(SIGINT,finish);
+
+ #if GTK_IS_USED
+diff -ru radium-1.9.2/Qt/Qt_Menues.cpp radium-master/Qt/Qt_Menues.cpp
+--- radium-1.9.2/Qt/Qt_Menues.cpp 2012-11-12 16:08:58.000000000 +0100
++++ radium-master/Qt/Qt_Menues.cpp 2012-11-14 10:07:22.000000000 +0100
+@@ -27,6 +27,7 @@
+
+ #include "../common/nsmtracker.h"
+ #include "../common/gfx_proc.h"
++#include "../common/settings_proc.h"
+ #include "EditorWidget.h"
+
+ #include "../api/api_requesters_proc.h"
+@@ -126,8 +127,8 @@
+ //QFont sansFont("Nimbus Mono L", 9);
+ //QFont sansFont("WenQuanYi Zen Hei Mono",8);
+ //QFont sansFont("Aurulent Sans Mono",8);
+- QFont sansFont("Bitstream Vera Sans Mono",8);
+-
++ QFont sansFont("Bitstream Vera Sans Mono",SETTINGS_read_int((char*)"system_font_size",8));
++ //sansFont.setPointSize(8);
+ //sansFont.setBold(true);
+
+ menu->menu->setFont(sansFont);
+diff -ru radium-1.9.2/Qt/Qt_MyQSlider.h radium-master/Qt/Qt_MyQSlider.h
+--- radium-1.9.2/Qt/Qt_MyQSlider.h 2012-11-12 16:08:58.000000000 +0100
++++ radium-master/Qt/Qt_MyQSlider.h 2012-11-14 10:07:22.000000000 +0100
+@@ -27,10 +27,14 @@
+ #include "EditorWidget.h"
+
+ #include "../common/instruments_proc.h"
++#include "../common/vector_proc.h"
++
+ #include "../audio/undo_audio_effect_proc.h"
+ #include "../audio/SoundPlugin.h"
+ #include "../audio/SoundPlugin_proc.h"
+
++#include "Qt_instruments_proc.h"
++
+ #include "Qt_SliderPainter_proc.h"
+
+ static float scale(float x, float x1, float x2, float y1, float y2){
+@@ -47,7 +51,7 @@
+ struct MyQSlider;
+
+ extern QVector<MyQSlider*> g_all_myqsliders;
+-
++extern struct Root *root;
+
+ struct MyQSlider : public QSlider{
+
+@@ -115,8 +119,33 @@
+ handle_mouse_event(event);
+ _has_mouse = true;
+
+- }else
+- QSlider::mousePressEvent(event);
++ }else{
++ vector_t options = {0};
++ VECTOR_push_back(&options, "Reset");
++ //VECTOR_push_back(&options, "Set Value");
++
++ int command = GFX_Menu(root->song->tracker_windows, NULL, "", &options);
++
++ if(command==0 && _patch!=NULL && _patch->instrument==get_audio_instrument()){
++ SoundPlugin *plugin = (SoundPlugin*)_patch->patchdata;
++ PLUGIN_reset_one_effect(plugin,_effect_num);
++ GFX_update_instrument_widget(_patch);
++ }
++#if 0
++ else if(command==1 && _patch!=NULL && _patch->instrument==get_audio_instrument()){
++ SoundPlugin *plugin = (SoundPlugin*)_patch->patchdata;
++ char *s = GFX_GetString(root->song->tracker_windows,NULL, (char*)"new value");
++ if(s!=NULL){
++ float value = atof(s);
++ Undo_AudioEffect_CurrPos(_patch, _effect_num);
++ PLUGIN_set_effect_value(plugin,-1,_effect_num,value,PLUGIN_STORED_TYPE,PLUGIN_STORE_VALUE);
++ GFX_update_instrument_widget(_patch);
++ }
++ }
++#endif
++
++ event->accept();
++ }
+ }
+
+ void mouseMoveEvent ( QMouseEvent * event )
+diff -ru radium-1.9.2/Qt/Qt_SliderPainter.cpp radium-master/Qt/Qt_SliderPainter.cpp
+--- radium-1.9.2/Qt/Qt_SliderPainter.cpp 2012-11-12 16:08:58.000000000 +0100
++++ radium-master/Qt/Qt_SliderPainter.cpp 2012-11-14 10:07:22.000000000 +0100
+@@ -533,7 +533,7 @@
+ p->drawRect(0,0,width(),height());
+ }
+
+- QRect rect(5,0,width(),height());
++ QRect rect(5,5,width()-5,height()-5);
+
+ if(_display_string!=""){
+ if(isEnabled()){
Modified: trunk/overlays/proaudio/media-sound/radium/metadata.xml
===================================================================
(Binary files differ)
Deleted: trunk/overlays/proaudio/media-sound/radium/radium-1.9.1-r1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/radium/radium-1.9.1-r1.ebuild 2012-11-14 16:14:13 UTC (rev 2307)
+++ trunk/overlays/proaudio/media-sound/radium/radium-1.9.1-r1.ebuild 2012-11-14 18:43:20 UTC (rev 2308)
@@ -1,58 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-PYTHON_DEPEND="2:2.7"
-inherit eutils multilib python
-
-RESTRICT="mirror"
-DESCRIPTION="Open source music editor with a novel interface and fever limitations than trackers"
-HOMEPAGE="http://users.notam02.no/~kjetism/${PN}/";
-SRC_URI="http://dl.dropbox.com/u/4814054/${P}.tar.gz";
-
-KEYWORDS="~x86 amd64"
-SLOT="0"
-IUSE="+calf -faust"
-
-DEPEND="x11-libs/qt-core[qt3support]
- x11-libs/libXaw
- faust? ( dev-lang/faust )
- media-libs/alsa-lib
- media-sound/jack-audio-connection-kit
- media-libs/libsamplerate
- media-libs/liblrdf
- media-libs/libsndfile
- media-libs/ladspa-sdk
- >=dev-libs/glib-2.0
- >=media-libs/rtmidi-2.0.0[alsa,jack]"
-RDEPEND="${DEPEND}
- calf? ( <media-plugins/calf-0.0.19[ladspa] )"
-
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${P}.patch" || die "epatch failed"
-}
-
-src_compile() {
- emake DESTDIR="${D}" PREFIX="/usr" libdir="/usr/$(get_libdir)" BUILDTYPE="RELEASE" \
- OPTIMIZE="${CXXFLAGS}" packages || die "make packages failed"
- ./build_linux.sh -j7 || die "Build failed"
-}
-
-src_install() {
- emake libdir="/usr/$(get_libdir)" DESTDIR="${D}" PREFIX="/usr" install \
- || die "install failed"
- insinto /usr/share/pixmaps
- doins ${FILESDIR}/radium.xpm
- make_desktop_entry radium Radium "radium" "AudioVideo;Audio;AudioVideoEditing;"
-}
-
-#pkg_preinst() {
-# sed -i -e "s:${D}::" "${D}/usr/bin/radium" || "sed failed"
-#}
Added: trunk/overlays/proaudio/media-sound/radium/radium-1.9.2.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/radium/radium-1.9.2.ebuild (rev 0)
+++ trunk/overlays/proaudio/media-sound/radium/radium-1.9.2.ebuild 2012-11-14 18:43:20 UTC (rev 2308)
@@ -0,0 +1,61 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+PYTHON_DEPEND="2:2.7"
+inherit eutils multilib python
+
+RESTRICT="mirror"
+DESCRIPTION="Open source music editor with a novel interface and fever limitations than trackers"
+HOMEPAGE="http://users.notam02.no/~kjetism/${PN}/";
+SRC_URI="http://archive.notam02.no/arkiv/src/${P}.tar.gz";
+
+KEYWORDS="~x86 amd64"
+SLOT="0"
+IUSE="+calf"
+LICENSE="GPL-2"
+
+DEPEND="x11-libs/qt-core[qt3support]
+ x11-libs/libXaw
+ media-libs/alsa-lib
+ media-sound/jack-audio-connection-kit
+ media-libs/libsamplerate
+ media-libs/liblrdf
+ media-libs/libsndfile
+ media-libs/ladspa-sdk
+ >=dev-libs/glib-2.0"
+# repoman doesn't like this:
+# RDEPEND="${DEPEND}
+# calf? ( <media-plugins/calf-0.0.19[ladspa] )"
+# somebody knows?
+if use calf; then
+ RDEPEND="${DEPEND}
+# <media-plugins/calf-0.0.19[ladspa]"
+else
+ RDEPEND="${DEPEND}"
+fi
+
+pkg_setup() {
+ python_set_active_version 2
+ python_pkg_setup
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}.patch" || die "epatch failed"
+}
+
+src_compile() {
+ emake DESTDIR="${D}" PREFIX="/usr" libdir="/usr/$(get_libdir)" BUILDTYPE="RELEASE" \
+ OPTIMIZE="${CXXFLAGS}" packages || die "make packages failed"
+ ./build_linux.sh -j7 || die "Build failed"
+}
+
+src_install() {
+ emake libdir="/usr/$(get_libdir)" DESTDIR="${D}" PREFIX="/usr" install \
+ || die "install failed"
+ insinto /usr/share/pixmaps
+ doins "${FILESDIR}/radium.xpm"
+ make_desktop_entry radium Radium "radium" "AudioVideo;Audio;AudioVideoEditing;"
+}