| [proaudio] [2414] radium: version bump to 1.9.26 |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 2414
Author: dominique
Date: 2013-01-30 01:17:05 +0100 (Wed, 30 Jan 2013)
Log Message:
-----------
radium: version bump to 1.9.26
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/radium-1.9.26.ebuild
Removed Paths:
-------------
trunk/overlays/proaudio/media-sound/radium/files/radium-1.9.2.patch
trunk/overlays/proaudio/media-sound/radium/radium-1.9.2.ebuild
Modified: trunk/overlays/proaudio/media-sound/radium/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/radium/ChangeLog 2013-01-29 23:42:06 UTC (rev 2413)
+++ trunk/overlays/proaudio/media-sound/radium/ChangeLog 2013-01-30 00:17:05 UTC (rev 2414)
@@ -2,6 +2,11 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+
+ 29 Jan 2013; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxx>;
+ +radium-1.9.26.ebuild; -radium-1.9.2.ebuild: version bump;
+ metadata.xml: removed no-herd
+
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.);
Modified: trunk/overlays/proaudio/media-sound/radium/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/radium/Manifest 2013-01-29 23:42:06 UTC (rev 2413)
+++ trunk/overlays/proaudio/media-sound/radium/Manifest 2013-01-30 00:17:05 UTC (rev 2414)
@@ -1,6 +1,5 @@
-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.2.tar.gz 20899041 SHA256 3c4aeab3370d7d0df33ab810f711018e1481eb5a6834e1adf3f336e73cdd0000 SHA512 676c9f29e47ef2d1ba8ed90c1e33b97955f2872c28bc641cdf75b555f6da4f68ce90f9f36020c783e5a61f8625e51337593f589fdebb2615c93cf2eca734f853 WHIRLPOOL 2193623c41ca74b3a7bbe59fb887e1a66762858c00ee8852f94e560dab7bf83d9809518d86c56af6dffdadb64cb047434fdad9ec21d0c16285eb3eabae0b861a
-EBUILD radium-1.9.2.ebuild 1616 SHA256 5bbe56b1a4ccfccb7a085943c23d40f005dce320a399c88e3729576932b7e5f0 SHA512 96bcd2fb7ef2a62d1474d98661786916b42e3b4c142ffac103319cdaab3cf1db6a8f9b325698869020e6112a3de4f2a07162170c120d06405a43eb350810c697 WHIRLPOOL fae617dfb750a3ab3416be3c1c47c73afb8be7062f8b888f789ac33479a545890485fffc64cfa913c71e648a8f698a616573c193e220b60313779dc6d5fcd7b5
-MISC ChangeLog 949 SHA256 920ed3a6d073fa7d2a3f0ba278f60b08858514f53455253df343af6f9e739583 SHA512 7b66384483d11c1fc4a011cd7871ad938bddfeac42ca0cc496274ca0ee50afed2214d79ca75f8ff7973d05b571388abcec82efdb7a71d0329e62dc90010da186 WHIRLPOOL 021e6f1496a8b316e244b87825a88123de079fa592bc7d872ad4da05e396f8d2d20d7525448f16c33f05575a1e53a9f19799d5e3ee6f1d4c6e6edab5b44839af
-MISC metadata.xml 338 SHA256 a0c146bcb60d23a0596c3ba44b1ab06f8b4abc3cc786691e8e5ea2a6542c96b4 SHA512 a73bb0072f48189d04d4bb7754011db9a7afe771ca86bbe2ec7d54eb2693f103f31f0bdef14012bc88064e8fcf08c7e2f91d3261376e47a2cd10e8d866f7fc26 WHIRLPOOL b32c8e304ddcfdda0ce24dbea2adba1ec7a8b602770f4063bcebe1a4841a0cca733a447b1429354db1e7ef43e6f356215e1ba4379a73be54425189ca6a99ea05
+DIST radium-1.9.26.tar.gz 21547058 SHA256 b368259ef2c959d3fc77a4c838998d98b603247115c9869d3efa87de3555af6c SHA512 c5f6282a4e17bda59a059306d3f949a955523c17bbb6b9cb6600dd352384186361b2ca055c92226605144aba5dbc3e74d431c849b7b8f9a8b23884ddbd4b389b WHIRLPOOL 085ee045c91e242ab3865e156d5f4c89dcafc634317fdf34f76050d22d6067ba11558d220af8ca0eeac9f927536e1e9b7ba2fbb8a55efd840af8b025882b855c
+EBUILD radium-1.9.26.ebuild 1634 SHA256 830520b74579e04c2975777048b2c45efe21ab08c8e3792e27db2866c7be8515 SHA512 4ce0cfee95acc954b4287f24152a138e583594703412f8337c45c7f7fa33c979b38765f98fb3c54ae43bea4e89e911f5992a097d90140d7b90a6a754ecc1fe00 WHIRLPOOL 94c39fd9e1f2ea121de7deec3257ad2eff2299a1a4a42d067b3484a412cdef6bd2dbb5eeecc8e99ed43df0d31be41f95b565c32e8b585e0d64182c850530d623
+MISC ChangeLog 1111 SHA256 eb8f01e4292d854b13972accf1318a02078fa47c1728f0e109a7355c054ad074 SHA512 12a72cecfb7d119e071a28cc79a7cfb436b00775cbdbfef1c845a6676fa14cca7086c6462fcf9c40c3a1fd0e39bf2f65e88668974b4bd4c1ca8501d1617b0fe3 WHIRLPOOL 47651736931aa964efecccedf0f07b5f498e50223e8681c1f8beffa123bdfd4303a885c1d8c4698001e2b5c37cad948f2a269f91ad4a161c8606fccd4a907dc4
+MISC metadata.xml 316 SHA256 60e097c30f61d2521643915ca64fb8e79df20ff11a57e242da008ee371ba96a3 SHA512 11236fda76de0872268fca44810a13e6859801c8de4f3329f0e38ebac9e126feaaa87bac07e856317aa50aad3a19d1daa2b9b79e1808c1e3d50cb07ccaacc8da WHIRLPOOL e19464afe75d5807c635ea54fd835422ed5cc21e5555ae79e60c6c0e5cfbe8eea8f377f130ed9a92d2f295bd65e94036b0dacac46c0f5c71117343c3f83ad482
Deleted: trunk/overlays/proaudio/media-sound/radium/files/radium-1.9.2.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/radium/files/radium-1.9.2.patch 2013-01-29 23:42:06 UTC (rev 2413)
+++ trunk/overlays/proaudio/media-sound/radium/files/radium-1.9.2.patch 2013-01-30 00:17:05 UTC (rev 2414)
@@ -1,736 +0,0 @@
-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.2.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/radium/radium-1.9.2.ebuild 2013-01-29 23:42:06 UTC (rev 2413)
+++ trunk/overlays/proaudio/media-sound/radium/radium-1.9.2.ebuild 2013-01-30 00:17:05 UTC (rev 2414)
@@ -1,62 +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://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"
- sed -i -e 's:DUSE_VESTIGE=0:DUSE_VESTIGE=1:' "${S}/Makefile.Qt" || die "sed 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;"
-}
Added: trunk/overlays/proaudio/media-sound/radium/radium-1.9.26.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/radium/radium-1.9.26.ebuild (rev 0)
+++ trunk/overlays/proaudio/media-sound/radium/radium-1.9.26.ebuild 2013-01-30 00:17:05 UTC (rev 2414)
@@ -0,0 +1,66 @@
+# Copyright 1999-2013 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="~amd64 ~x86"
+SLOT="0"
+IUSE="+calf debug"
+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() {
+# sed -i -e 's:DUSE_VESTIGE=0:DUSE_VESTIGE=1:' "${S}/Makefile.Qt" || die "sed failed"
+#}
+
+src_compile() {
+ if use debug; then
+ BUILDT=DEBUG
+ else
+ BUILDT=RELEASE
+ fi
+ emake DESTDIR="${D}" PREFIX="/usr" libdir="/usr/$(get_libdir)" \
+ OPTIMIZE="${CXXFLAGS}" packages || die "make packages failed"
+ BUILDTYPE="${BUILDT}" ./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;"
+}