Browse Source

fix format

audio_region_bpm_change_fix
parent
commit
2ae32f71f7
Signed by: alex
GPG Key ID: 022EAE42313D70F3
  1. 70
      src/gui/widgets/dialogs/scripting_dialog.c
  2. 11
      src/gui/widgets/dialogs/welcome_message_dialog.c
  3. 24
      src/guile/guile.c
  4. 4
      src/guile/project_generator.c
  5. 4
      tests/guile/script_runner.c

70
src/gui/widgets/dialogs/scripting_dialog.c

@ -37,8 +37,7 @@ on_execute_clicked ( @@ -37,8 +37,7 @@ on_execute_clicked (
GTK_TEXT_BUFFER (self->buffer), &start_iter,
&end_iter, false);
GuileScriptLanguage lang =
(GuileScriptLanguage)
GuileScriptLanguage lang = (GuileScriptLanguage)
adw_combo_row_get_selected (
self->lang_select_combo_row);
@ -60,10 +59,10 @@ on_lang_selection_changed ( @@ -60,10 +59,10 @@ on_lang_selection_changed (
Z_SCRIPTING_DIALOG_WIDGET (data);
AdwComboRow * combo_row = ADW_COMBO_ROW (gobject);
const char * source_lang_str = NULL;
const char * source_lang_str = NULL;
GuileScriptLanguage script_lang =
(GuileScriptLanguage)
adw_combo_row_get_selected (combo_row);
adw_combo_row_get_selected (combo_row);
switch (script_lang)
{
case GUILE_SCRIPT_LANGUAGE_SCHEME:
@ -101,22 +100,18 @@ scripting_dialog_widget_new () @@ -101,22 +100,18 @@ scripting_dialog_widget_new ()
}
static void
setup_lang_selection (
ScriptingDialogWidget * self)
setup_lang_selection (ScriptingDialogWidget * self)
{
adw_preferences_row_set_title (
ADW_PREFERENCES_ROW (
self->lang_select_combo_row),
_("Language"));
ADW_PREFERENCES_ROW (self->lang_select_combo_row),
_ ("Language"));
adw_action_row_set_subtitle (
ADW_ACTION_ROW (
self->lang_select_combo_row),
_("Select the language of the script"));
ADW_ACTION_ROW (self->lang_select_combo_row),
_ ("Select the language of the script"));
GtkStringList * string_list =
gtk_string_list_new (NULL);
for (int i = 0; i < NUM_GUILE_SCRIPT_LANGUAGES;
i++)
for (int i = 0; i < NUM_GUILE_SCRIPT_LANGUAGES; i++)
{
gtk_string_list_append (
string_list,
@ -148,9 +143,8 @@ scripting_dialog_widget_init ( @@ -148,9 +143,8 @@ scripting_dialog_widget_init (
GtkWidget * content_area =
gtk_dialog_get_content_area (GTK_DIALOG (self));
GtkPaned * paned =
GTK_PANED (
gtk_paned_new (GTK_ORIENTATION_VERTICAL));
GtkPaned * paned = GTK_PANED (
gtk_paned_new (GTK_ORIENTATION_VERTICAL));
gtk_paned_set_shrink_start_child (paned, false);
gtk_paned_set_shrink_end_child (paned, false);
gtk_widget_set_hexpand (GTK_WIDGET (paned), true);
@ -158,14 +152,12 @@ scripting_dialog_widget_init ( @@ -158,14 +152,12 @@ scripting_dialog_widget_init (
gtk_box_append (
GTK_BOX (content_area), GTK_WIDGET (paned));
GtkBox * top_box =
GTK_BOX (
gtk_box_new (GTK_ORIENTATION_VERTICAL, 0));
GtkBox * top_box = GTK_BOX (
gtk_box_new (GTK_ORIENTATION_VERTICAL, 0));
gtk_paned_set_start_child (
paned, GTK_WIDGET (top_box));
GtkScrolledWindow * scroll =
GTK_SCROLLED_WINDOW (
gtk_scrolled_window_new ());
GtkScrolledWindow * scroll = GTK_SCROLLED_WINDOW (
gtk_scrolled_window_new ());
gtk_box_append (top_box, GTK_WIDGET (scroll));
gtk_widget_set_size_request (
GTK_WIDGET (scroll), 596, 320);
@ -271,19 +263,18 @@ scripting_dialog_widget_init ( @@ -271,19 +263,18 @@ scripting_dialog_widget_init (
/* setup language selection */
GtkListBox * list_box =
GTK_LIST_BOX (gtk_list_box_new ());
gtk_box_append (
top_box, GTK_WIDGET (list_box));
gtk_box_append (top_box, GTK_WIDGET (list_box));
gtk_list_box_set_selection_mode (
list_box, GTK_SELECTION_NONE);
self->lang_select_combo_row =
ADW_COMBO_ROW (adw_combo_row_new ());
gtk_list_box_append (
list_box, GTK_WIDGET (self->lang_select_combo_row));
list_box,
GTK_WIDGET (self->lang_select_combo_row));
setup_lang_selection (self);
self->execute_btn =
GTK_BUTTON (
gtk_button_new_with_label (_("Execute")));
self->execute_btn = GTK_BUTTON (
gtk_button_new_with_label (_ ("Execute")));
gtk_widget_set_receives_default (
GTK_WIDGET (self->execute_btn), true);
gtk_widget_set_focusable (
@ -294,24 +285,19 @@ scripting_dialog_widget_init ( @@ -294,24 +285,19 @@ scripting_dialog_widget_init (
G_OBJECT (self->execute_btn), "clicked",
G_CALLBACK (on_execute_clicked), self);
GtkBox * bot_box =
GTK_BOX (
gtk_box_new (GTK_ORIENTATION_VERTICAL, 0));
GtkBox * bot_box = GTK_BOX (
gtk_box_new (GTK_ORIENTATION_VERTICAL, 0));
gtk_paned_set_end_child (
paned, GTK_WIDGET (bot_box));
scroll =
GTK_SCROLLED_WINDOW (gtk_scrolled_window_new ());
scroll = GTK_SCROLLED_WINDOW (
gtk_scrolled_window_new ());
gtk_box_append (bot_box, GTK_WIDGET (scroll));
gtk_widget_set_size_request (
GTK_WIDGET (scroll), -1, 105);
gtk_widget_set_hexpand (
GTK_WIDGET (scroll), true);
gtk_widget_set_vexpand (
GTK_WIDGET (scroll), true);
self->output =
GTK_LABEL (
gtk_label_new (
_("The result will be printed here")));
gtk_widget_set_hexpand (GTK_WIDGET (scroll), true);
gtk_widget_set_vexpand (GTK_WIDGET (scroll), true);
self->output = GTK_LABEL (gtk_label_new (
_ ("The result will be printed here")));
gtk_label_set_selectable (self->output, true);
gtk_scrolled_window_set_child (
scroll, GTK_WIDGET (self->output));

11
src/gui/widgets/dialogs/welcome_message_dialog.c

@ -70,17 +70,16 @@ welcome_message_dialog_new (GtkWindow * parent) @@ -70,17 +70,16 @@ welcome_message_dialog_new (GtkWindow * parent)
"this."));
g_string_append_printf (
gstr, "<b>%s</b>: %s\n\n", _ ("Flatpak limitation"),
_ (
"Only Flatpak-installed plugins are "
"supported."));
gstr, "<b>%s</b>: %s\n\n",
_ ("Flatpak limitation"),
_ ("Only Flatpak-installed plugins are "
"supported."));
#endif
/* copyright line */
g_string_append_printf (
gstr, "%s",
"© " COPYRIGHT_YEARS
", " COPYRIGHT_NAME ".");
"© " COPYRIGHT_YEARS ", " COPYRIGHT_NAME ".");
/* trademark info */
#if !defined(HAVE_CUSTOM_NAME) \

24
src/guile/guile.c

@ -12,8 +12,8 @@ @@ -12,8 +12,8 @@
#include <glib/gi18n.h>
#include <gtk/gtk.h>
#include "guile/modules.h"
#include "guile/guile.h"
#include "guile/modules.h"
#include <libguile.h>
#include <pthread.h>
@ -34,11 +34,13 @@ typedef struct ExecutionInfo @@ -34,11 +34,13 @@ typedef struct ExecutionInfo
} ExecutionInfo;
static const char * guile_lang_strings[] = {
"Scheme", "ECMAScript",
"Scheme",
"ECMAScript",
};
static const char * guile_lang_canonical_strings[] = {
"scheme", "ecmascript",
"scheme",
"ecmascript",
};
const char *
@ -60,11 +62,9 @@ guile_get_script_language_canonical_str ( @@ -60,11 +62,9 @@ guile_get_script_language_canonical_str (
}
GuileScriptLanguage
guile_get_script_language_from_str (
const char * str)
guile_get_script_language_from_str (const char * str)
{
for (int i = 0; i < NUM_GUILE_SCRIPT_LANGUAGES;
i++)
for (int i = 0; i < NUM_GUILE_SCRIPT_LANGUAGES; i++)
{
if (string_is_equal (
guile_lang_strings[i], str))
@ -129,8 +129,7 @@ call_proc (void * data) @@ -129,8 +129,7 @@ call_proc (void * data)
const char * lang_str =
guile_get_script_language_canonical_str (
nfo->lang);
SCM s_from_lang =
scm_from_utf8_symbol (lang_str);
SCM s_from_lang = scm_from_utf8_symbol (lang_str);
SCM kwd_lang = scm_from_utf8_keyword ("lang");
scm_call_3 (
eval_string_proc, code, kwd_lang, s_from_lang);
@ -184,8 +183,8 @@ guile_mode_func (void * data) @@ -184,8 +183,8 @@ guile_mode_func (void * data)
SCM captured_stack = SCM_BOOL_F;
SCM ret = scm_c_catch (
SCM_BOOL_T, call_proc, data,
eval_handler, &captured_stack, preunwind_proc,
SCM_BOOL_T, call_proc, data, eval_handler,
&captured_stack, preunwind_proc,
&captured_stack);
SCM str_scm = scm_get_output_string (out_port);
@ -229,7 +228,8 @@ guile_run_script ( @@ -229,7 +228,8 @@ guile_run_script (
AUDIO_ENGINE, &state, Z_F_NO_FORCE);
ExecutionInfo nfo = {
.script = script, .lang = lang };
.script = script, .lang = lang
};
char * ret = scm_with_guile (
&guile_mode_func, (void *) &nfo);

4
src/guile/project_generator.c

@ -70,8 +70,8 @@ guile_project_generator_generate_project_from_string ( @@ -70,8 +70,8 @@ guile_project_generator_generate_project_from_string (
PROJECT = prj;
/* run the script to fill in the project */
char * markup =
(char *) guile_run_script (script, GUILE_SCRIPT_LANGUAGE_SCHEME);
char * markup = (char *) guile_run_script (
script, GUILE_SCRIPT_LANGUAGE_SCHEME);
g_message ("\nResult:\n%s", markup);
if (!guile_script_succeeded (markup))

4
tests/guile/script_runner.c

@ -46,8 +46,8 @@ test_run_script (void) @@ -46,8 +46,8 @@ test_run_script (void)
bool ret = g_file_get_contents (
args[1], &content, NULL, NULL);
g_assert_true (ret);
char * res =
guile_run_script (content, GUILE_SCRIPT_LANGUAGE_SCHEME);
char * res = guile_run_script (
content, GUILE_SCRIPT_LANGUAGE_SCHEME);
g_message ("%s", res);
g_assert_true (guile_script_succeeded (res));

Loading…
Cancel
Save