From fd9cc1d648a702eaca11fc3cd97c35ec735b73b6 Mon Sep 17 00:00:00 2001
From: ale <ale@incal.net>
Date: Sat, 9 Mar 2019 17:43:38 +0000
Subject: [PATCH] Many UI fixes
---
COPYING | 340 +++++++++++++++++++++++++++++++++++++++++++
README.md | 40 +++++
engine/drumkit.c | 29 +++-
engine/voice.c | 6 +-
plugin/hydrumkit.ttl | 8 +-
plugin/ui.c | 108 ++++++++++----
6 files changed, 496 insertions(+), 35 deletions(-)
create mode 100644 COPYING
create mode 100644 README.md
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..5b6e7c6
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,340 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..e51442b
--- /dev/null
+++ b/README.md
@@ -0,0 +1,40 @@
+hydrumkit
+===
+
+HyDrumkit is a LV2 drum sampler plugin. It can load
+[Hydrogen](http://www.hydrogen-music.com/) drum kits and play them,
+with minimal runtime controls. It will use settings (volume, pan,
+envelopes, etc.) from the drumkit itself, and downmix the instruments
+to a simple stereo output.
+
+Some features:
+
+* full LV2 support:
+ * state save/restore
+ * asynchronous loading of samples
+* extensive support for Hydrogen drumkit features
+ * multi-layer instruments
+ * pan / volume
+ * envelopes
+ * notably missing: pitch shifting
+* minimalist UI with a single button to load a new drumkit
+
+It offers very similar functionality to
+[DrMr](https://github.com/nicklan/drmr), but with a slightly improved
+engine. The code is based on the [LV2 Sampler
+example](http://lv2plug.in/book/#_sampler), with abundant inspiration
+taken from [Fabla](https://github.com/openAVproductions/openAV-Fabla),
+[Drumgizmo](https://drumgizmo.org/) and of course Hydrogen itself.
+
+## Installation
+
+To install from source, run:
+
+```shell
+./configure
+make
+make install
+```
+
+By default this will install the plugin in *~/.lv2/*, but this can be
+controlled with the *--with-lv2-plugin-dir* option to *configure*.
diff --git a/engine/drumkit.c b/engine/drumkit.c
index 67d0936..ca1d071 100644
--- a/engine/drumkit.c
+++ b/engine/drumkit.c
@@ -57,8 +57,12 @@ static char *sf_format_name(int format) {
// Dump instrument metadata to standard output.
static void print_instrument(struct instrument *ins) {
int i;
- printf("instrument %s: pan=%g/%g, gain=%g\n", ins->name, ins->pan_l,
- ins->pan_r, ins->gain);
+ printf("instrument %s: note=%d, pan=%g/%g, gain=%g, vol=%g", ins->name,
+ ins->note, ins->pan_l, ins->pan_r, ins->gain, ins->volume);
+ if (ins->mute_group >= 0) {
+ printf(", mute_group=%d", ins->mute_group);
+ }
+ printf("\n");
for (i = 0; i < ins->num_layers; i++) {
printf(" + [%f,%f] @%dHz %s/%s\n", ins->layers[i].min, ins->layers[i].max,
ins->layers[i].sample.info.samplerate,
@@ -317,6 +321,27 @@ static int parse_instrument(struct instrument *ins, xmlNodePtr node,
goto fail;
}
}
+ } else {
+ // Some old drumkit.xml files do not contain layers within
+ // instruments but simply specify a filename. In this case we just
+ // make up a layer ourselves.
+ char *sample_filename = NULL, *full_sample_filename = NULL;
+ xpath_get_string(&sample_filename, node, "dk:filename/text()", xpathCtx);
+ if (sample_filename) {
+ fprintf(stderr, "warning: found legacy (layer-less) instrument\n");
+
+ ins->num_layers = 1;
+ ins->layers = (struct layer *)calloc(1, sizeof(struct layer));
+ ins->layers[0].min = 0;
+ ins->layers[0].max = 1;
+ ins->layers[0].gain = 1;
+ full_sample_filename = path_join(basedir, sample_filename);
+ if (!load_sample(&ins->layers[0].sample, full_sample_filename, target_samplerate)) {
+ goto fail;
+ }
+ free(full_sample_filename);
+ free(sample_filename);
+ }
}
xmlXPathFreeObject(layers);
diff --git a/engine/voice.c b/engine/voice.c
index 561604d..a0a7f9d 100644
--- a/engine/voice.c
+++ b/engine/voice.c
@@ -9,6 +9,10 @@ static float velocity_to_gain(int velocity) {
return f * f;
}
+static float volume_to_gain(int volume) {
+ return volume * volume;
+}
+
void voice_init(struct voice *voice, int samplerate) {
voice->samplerate = samplerate;
voice->cur_sample = NULL;
@@ -27,7 +31,7 @@ int voice_noteon(struct voice *voice, struct instrument *ins, int note, int velo
voice->cur_sample = &layer->sample;
voice->pan_l = ins->pan_l;
voice->pan_r = ins->pan_r;
- voice->gain = ins->volume * ins->gain * layer->gain * velocity_to_gain(velocity);
+ voice->gain = volume_to_gain(ins->volume) * ins->gain * layer->gain * velocity_to_gain(velocity);
voice->mute_group = ins->mute_group;
adsr_trigger(&voice->adsr,
(int)ins->envelope_attack,
diff --git a/plugin/hydrumkit.ttl b/plugin/hydrumkit.ttl
index 06b5c13..4327aab 100644
--- a/plugin/hydrumkit.ttl
+++ b/plugin/hydrumkit.ttl
@@ -30,8 +30,7 @@
lv2:extensionData state:interface ,
work:interface ;
ui:ui <http://lv2.incal.net/plugins/hydrumkit#ui> ;
- patch:writable <http://lv2.incal.net/plugins/hydrumkit#drumkit> ,
- param:gain ;
+ patch:writable <http://lv2.incal.net/plugins/hydrumkit#drumkit> ;
lv2:port [
a lv2:InputPort ,
atom:AtomPort ;
@@ -73,12 +72,11 @@
]
];
state:state [
- <http://lv2.incal.net/plugins/hydrumkit#drumkit> <empty> ;
- param:gain 1.0
+ <http://lv2.incal.net/plugins/hydrumkit#drumkit> <none>
] .
<http://lv2.incal.net/plugins/hydrumkit#ui>
- a ui:GtkUI ;
+ a ui:Gtk3UI ;
lv2:requiredFeature urid:map ;
lv2:extensionData ui:showInterface ;
ui:portNotification [
diff --git a/plugin/ui.c b/plugin/ui.c
index 510f349..d1f5576 100644
--- a/plugin/ui.c
+++ b/plugin/ui.c
@@ -26,6 +26,7 @@
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
+#include <sys/stat.h>
#define SAMPLER_UI_URI "http://lv2.incal.net/plugins/hydrumkit#ui"
@@ -38,10 +39,11 @@ struct plugin_ui {
LV2UI_Write_Function write;
LV2UI_Controller controller;
- GtkWidget *box;
GtkWidget *label;
- GtkWidget *file_button;
+ GtkWidget *load_button;
+ GtkWidget *load_dialog;
GtkWidget *button_box;
+ GtkWidget *box;
GtkWidget *window; /* For optional show interface. */
char *filename;
@@ -49,22 +51,53 @@ struct plugin_ui {
uint8_t forge_buf[1024];
};
-static void on_file_set(GtkFileChooserButton *widget, void *handle) {
+static void on_load_button_click(GtkButton *widget, void *handle) {
struct plugin_ui *ui = (struct plugin_ui *)handle;
- LV2_Atom *msg;
- // Get the filename from the file chooser
- char *filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget));
+ /* Setup the dialog parent to be chooser button's toplevel, and be modal
+ as needed. */
+ if (!gtk_widget_get_visible(ui->load_dialog)) {
+ GtkWidget *toplevel;
- // Write a set message to the plugin to load new file
- lv2_atom_forge_set_buffer(&ui->forge, ui->forge_buf, sizeof(ui->forge_buf));
- msg = (LV2_Atom *)write_set_file(&ui->forge, &ui->uris, filename,
- strlen(filename));
+ toplevel = gtk_widget_get_toplevel(GTK_WIDGET(widget));
+ if (gtk_widget_is_toplevel(toplevel) && GTK_IS_WINDOW(toplevel)) {
+ if (GTK_WINDOW(toplevel) != gtk_window_get_transient_for(GTK_WINDOW(ui->load_dialog)))
+ gtk_window_set_transient_for(GTK_WINDOW(ui->load_dialog), GTK_WINDOW(toplevel));
- ui->write(ui->controller, 0, lv2_atom_total_size(msg),
- ui->uris.atom_eventTransfer, msg);
+ gtk_window_set_modal(GTK_WINDOW(ui->load_dialog),
+ gtk_window_get_modal(GTK_WINDOW(toplevel)));
+ }
+ }
+
+ gtk_window_present(GTK_WINDOW(ui->load_dialog));
+}
+
+static void on_load_dialog_response(GtkDialog *widget, gint response, void *handle) {
+ struct plugin_ui *ui = (struct plugin_ui *)handle;
- g_free(filename);
+ gtk_widget_hide(ui->load_dialog);
+
+ if (response == GTK_RESPONSE_ACCEPT || response == GTK_RESPONSE_OK) {
+ LV2_Atom *msg;
+
+ // Get the filename from the file chooser
+ char *filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(ui->load_dialog));
+
+ // Write a set message to the plugin to load new file
+ lv2_atom_forge_set_buffer(&ui->forge, ui->forge_buf, sizeof(ui->forge_buf));
+ msg = (LV2_Atom *)write_set_file(&ui->forge, &ui->uris, filename,
+ strlen(filename));
+
+ ui->write(ui->controller, 0, lv2_atom_total_size(msg),
+ ui->uris.atom_eventTransfer, msg);
+
+ g_free(filename);
+ };
+}
+
+static int path_exists(const char *path) {
+ struct stat stbuf;
+ return (0 == stat(path, &stbuf)) ? 1 : 0;
}
static LV2UI_Handle instantiate(const LV2UI_Descriptor *descriptor,
@@ -104,31 +137,49 @@ static LV2UI_Handle instantiate(const LV2UI_Descriptor *descriptor,
lv2_atom_forge_init(&ui->forge, ui->map);
// Construct Gtk UI
- ui->box = gtk_vbox_new(FALSE, 4);
+ ui->box = gtk_grid_new();
ui->label = gtk_label_new("No drumkit loaded.");
- ui->button_box = gtk_hbox_new(FALSE, 4);
+ ui->button_box = gtk_grid_new();
- filter = gtk_file_filter_new ();
+ filter = gtk_file_filter_new();
gtk_file_filter_add_pattern(filter, "drumkit.xml");
- ui->file_button =
- gtk_file_chooser_button_new("Load Drumkit", GTK_FILE_CHOOSER_ACTION_OPEN);
- gtk_file_chooser_set_filter(GTK_FILE_CHOOSER(ui->file_button), filter);
- gtk_file_chooser_add_shortcut_folder(GTK_FILE_CHOOSER(ui->file_button), "/usr/share/hydrogen/data/drumkits", NULL);
+ ui->load_button = gtk_button_new_from_icon_name("document-open", GTK_ICON_SIZE_BUTTON);
+ g_signal_connect(ui->load_button, "clicked", G_CALLBACK(on_load_button_click), ui);
+
+ ui->load_dialog = gtk_file_chooser_dialog_new(NULL, NULL,
+ GTK_FILE_CHOOSER_ACTION_OPEN,
+ "_Cancel", GTK_RESPONSE_CANCEL,
+ "_Open", GTK_RESPONSE_ACCEPT,
+ NULL);
+ gtk_file_chooser_set_filter(GTK_FILE_CHOOSER(ui->load_dialog), filter);
+
+ // Add common paths for system and user Hydrogen drumkit installs.
+ if (path_exists("/usr/share/hydrogen/data/drumkits")) {
+ gtk_file_chooser_add_shortcut_folder(GTK_FILE_CHOOSER(ui->load_dialog), "/usr/share/hydrogen/data/drumkits", NULL);
+ }
+ if (path_exists("/usr/local/share/hydrogen/data/drumkits")) {
+ gtk_file_chooser_add_shortcut_folder(GTK_FILE_CHOOSER(ui->load_dialog), "/usr/local/share/hydrogen/data/drumkits", NULL);
+ }
home = getenv("HOME");
if (home) {
char *homebuf = (char *)malloc(strlen(home) + 48);
sprintf(homebuf, "%s/.hydrogen/data/drumkits", home);
- gtk_file_chooser_add_shortcut_folder(GTK_FILE_CHOOSER(ui->file_button), homebuf, NULL);
+ if (path_exists(homebuf)) {
+ gtk_file_chooser_add_shortcut_folder(GTK_FILE_CHOOSER(ui->load_dialog), homebuf, NULL);
+ }
free(homebuf);
}
gtk_container_set_border_width(GTK_CONTAINER(ui->box), 4);
- gtk_box_pack_start(GTK_BOX(ui->box), ui->button_box, TRUE, TRUE, 0);
- gtk_box_pack_start(GTK_BOX(ui->button_box), ui->label, FALSE, FALSE, 0);
- gtk_box_pack_start(GTK_BOX(ui->button_box), ui->file_button, TRUE, TRUE, 0);
+ gtk_container_add(GTK_CONTAINER(ui->box), ui->button_box);
+ gtk_container_add(GTK_CONTAINER(ui->button_box), ui->label);
+ gtk_widget_set_hexpand(ui->label, TRUE);
+ gtk_widget_set_halign(ui->label, GTK_ALIGN_CENTER);
+ gtk_container_add(GTK_CONTAINER(ui->button_box), ui->load_button);
+ gtk_widget_set_hexpand(ui->load_button, FALSE);
- g_signal_connect(ui->file_button, "file-set", G_CALLBACK(on_file_set), ui);
+ g_signal_connect(ui->load_dialog, "response", G_CALLBACK(on_load_dialog_response), ui);
// Request state (filename) from plugin
lv2_atom_forge_set_buffer(&ui->forge, ui->forge_buf, sizeof(ui->forge_buf));
@@ -148,12 +199,15 @@ static void cleanup(LV2UI_Handle handle) {
struct plugin_ui *ui = (struct plugin_ui *)handle;
gtk_widget_destroy(ui->label);
- gtk_widget_destroy(ui->file_button);
+ gtk_widget_destroy(ui->load_dialog);
+ gtk_widget_destroy(ui->load_button);
gtk_widget_destroy(ui->button_box);
gtk_widget_destroy(ui->box);
free(ui);
}
+// The drumkit "name" that we show to the user is just the basename of
+// the drumkit directory.
static char *get_drumkit_label(const char *filename) {
char *buf = g_strdup(filename), *p, *q, *result;
@@ -184,7 +238,7 @@ static void port_event(LV2UI_Handle handle, uint32_t port_index,
g_free(ui->filename);
ui->filename = g_strdup(path);
- gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(ui->file_button),
+ gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(ui->load_dialog),
path);
gtk_label_set_text(GTK_LABEL(ui->label), label);
} else if (!path) {
--
GitLab