Changeset 9

Timestamp:

11/04/06 20:06:02 (2 years ago)

Author:

gordonjcp

Message:

fixed missing widgets.h

Files:

• nekostring/trunk/configure.ac (modified) (1 diff)
• nekostring/trunk/gui/Makefile.am (modified) (1 diff)
• nekostring/trunk/gui/callbacks.c (modified) (1 diff)
• nekostring/trunk/gui/callbacks.h (modified) (1 diff)
• nekostring/trunk/gui/interface.c (modified) (5 diffs)
• nekostring/trunk/gui/main.c (modified) (3 diffs)
• nekostring/trunk/src/neko_data.c (modified) (5 diffs)

nekostring/trunk/configure.ac

@@ -2 +2 @@
-# Process this file with autoconf to produce a configure script.
-
+# we need at least version 2.59 of autoconf
-AC_PREREQ(2.59)
+
+# name and version for package
-AC_INIT(configure.ac)
-AM_INIT_AUTOMAKE(nekostring, 0.1.1)
+
+# make sure we're looking in the right place, for --srcdir
-AC_CONFIG_SRCDIR([config.h.in])
+
+# config defines go into this file
-AC_CONFIG_HEADER([config.h])
-

nekostring/trunk/gui/Makefile.am

@@ -20 +20 @@
-        support.c support.h \
-        interface.c interface.h \
-
+
+
-
-nekostring_gtk_LDADD = @PACKAGE_LIBS@ -lm -llo -lpthread

nekostring/trunk/gui/callbacks.c

@@ -19 +19 @@
-#include "interface.h"
-#include "support.h"
+#include "widgets.h"
+
+void on_voice_slider_change( GtkWidget *widget, gpointer data )
+{
+   GtkAdjustment *adj;
+
+
+        int index = (int)data;
+   // struct xsynth_port_descriptor *xpd = &xsynth_port_description[index];
+    //float cval = GTK_ADJUSTMENT(widget)->value; // / 10.0f;
+        float cval = gtk_range_get_adjustment(GTK_RANGE(widget))->value; // / 10.0f;
+    float value;
+
+        printf("from slider: %f\n",cval);
+        
+        adj= gtk_range_get_adjustment(GTK_RANGE(vs_viola));
+        adj->value=cval;
+        gtk_signal_emit_by_name (GTK_OBJECT (adj), "value_changed");
+        
+        
+  //  if (internal_gui_update_only) {
+  //      /* GDB_MESSAGE(GDB_GUI, " on_voice_slider_change: skipping further action\n"); */
+  //      return;
+  //  }
+
+ //   if (xpd->type == XSYNTH_PORT_TYPE_LINEAR) {
+
+   //     value = (xpd->a * cval + xpd->b) * cval + xpd->c;  /* linear or quadratic */
+
+ //   } else { /* XSYNTH_PORT_TYPE_LOGARITHMIC */
+
+  //      value = xpd->a * exp(xpd->c * cval * log(xpd->b));
+
+ //   }
+
+ //   GDB_MESSAGE(GDB_GUI, " on_voice_slider_change: slider %d changed to %10.6f => %10.6f\n",
+  //          index, GTK_ADJUSTMENT(widget)->value, value);
+
+//    lo_send(osc_host_address, osc_control_path, "if", index, value);
+}

nekostring/trunk/gui/callbacks.h

@@ -11 +11 @@
-
-#include 
+void on_voice_slider_change( GtkWidget *widget, gpointer data );

nekostring/trunk/gui/interface.c

@@ -26 +26 @@
-#include "interface.h"
-#include "support.h"
+#include "widgets.h"
+
+#include "../src/neko.h"
+#include "../src/neko_ports.h"
-
-#define GLADE_HOOKUP_OBJECT(component,widget,name) \
@@ -37 +41 @@
-create_window1 (void)
-{
-  GtkWidget *window1;
-  GtkWidget *notebook1;
-  GtkWidget *vbox1;
-  GtkWidget *hbox1;
-  GtkWidget *frame_voicing;
-  GtkWidget *alignment3;
-  GtkWidget *hbox2;
-  GtkWidget *vb_contrabass;
-  GtkWidget *vs_bass;
-  GtkWidget *label8;
-  GtkWidget *vbox4;
-  GtkWidget *vs_cello;
-  GtkWidget *label10;
-  GtkWidget *vbox5;
-  GtkWidget *vs_viola;
-  GtkWidget *label11;
-  GtkWidget *vbox6;
-  GtkWidget *vs_violin;
-  GtkWidget *label12;
-  GtkWidget *label_voicing;
-  GtkWidget *frame_ensemble;
-  GtkWidget *alignment2;
-  GtkWidget *hbox3;
-  GtkWidget *vbox7;
-  GtkWidget *vs_cspeed;
-  GtkWidget *label13;
-  GtkWidget *vbox8;
-  GtkWidget *vs_cdepth;
-  GtkWidget *label14;
-  GtkWidget *vbox9;
-  GtkWidget *vs_vspeed;
-  GtkWidget *label15;
-  GtkWidget *vbox10;
-  GtkWidget *vs_vdepth;
-  GtkWidget *label16;
-  GtkWidget *label_ensemble;
-  GtkWidget *frame4;
-  GtkWidget *alignment4;
-  GtkWidget *hbox4;
-  GtkWidget *vbox11;
-  GtkWidget *vscale14;
-  GtkWidget *label18;
-  GtkWidget *vbox12;
-  GtkWidget *vscale15;
-  GtkWidget *label19;
-  GtkWidget *label17;
-  GtkWidget *hbox5;
-  GtkWidget *image1;
-  GtkWidget *frame5;
-  GtkWidget *alignment5;
-  GtkWidget *hbox6;
-  GtkWidget *vbox17;
-  GtkWidget *vscale19;
-  GtkWidget *label25;
-  GtkWidget *vbox18;
-  GtkWidget *vscale20;
-  GtkWidget *label26;
-  GtkWidget *vbox19;
-  GtkWidget *vscale21;
-  GtkWidget *label27;
-  GtkWidget *label23;
-  GtkWidget *frame6;
-  GtkWidget *alignment6;
-  GtkWidget *vbox16;
-  GtkWidget *combobox1;
-  GtkWidget *btn_savepatch;
-  GtkWidget *label24;
-  GtkWidget *label_main;
-  GtkWidget *image2;
-  GtkWidget *label2;
-
-  window1 = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_widget_set_size_request (window1, 600, 300);
-window1
+nekostring
-  gtk_window_set_resizable (GTK_WINDOW (window1), FALSE);
-
@@ -146 +80 @@
-  gtk_widget_set_size_request (vb_contrabass, 50, 135);
-
-s_bass = gtk_vscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (0, 0, 1
-s_bass
-s_bass
-s_bass
-s_bass
-s_bass
+oice_widget[NEKO_PORT_BASS_LEVEL] = gtk_vscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (1.706, 0, 2
+oice_widget[NEKO_PORT_BASS_LEVEL]
+oice_widget[NEKO_PORT_BASS_LEVEL]
+oice_widget[NEKO_PORT_BASS_LEVEL]
+oice_widget[NEKO_PORT_BASS_LEVEL]
+oice_widget[NEKO_PORT_BASS_LEVEL]
-
-  label8 = gtk_label_new ("Bass");
@@ -492 +426 @@
-  GLADE_HOOKUP_OBJECT (window1, hbox2, "hbox2");
-  GLADE_HOOKUP_OBJECT (window1, vb_contrabass, "vb_contrabass");
-s_bass
+oice_widget[NEKO_PORT_BASS_LEVEL]
-  GLADE_HOOKUP_OBJECT (window1, label8, "label8");
-  GLADE_HOOKUP_OBJECT (window1, vbox4, "vbox4");
@@ -554 +488 @@
-  GLADE_HOOKUP_OBJECT (window1, image2, "image2");
-  GLADE_HOOKUP_OBJECT (window1, label2, "label2");
+  
+  
+      gtk_signal_connect (GTK_OBJECT (voice_widget[NEKO_PORT_BASS_LEVEL]),
+                        "value_changed", GTK_SIGNAL_FUNC(on_voice_slider_change),
+                        (gpointer)NEKO_PORT_BASS_LEVEL);
+                      gtk_signal_connect (GTK_OBJECT (vs_cello),
+                        "value_changed", GTK_SIGNAL_FUNC(on_voice_slider_change),
+                        (gpointer)NEKO_PORT_CELLO_LEVEL);
-
-  return window1;

nekostring/trunk/gui/main.c

@@ -18 +18 @@
-#include "interface.h"
-#include "support.h"
+#include "widgets.h"
-
-int
@@ -23 +24 @@
-{
-  GtkWidget *window1;
+        GtkAdjustment *adj;
-
-  gtk_set_locale ();
@@ -36 +38 @@
-  window1 = create_window1 ();
-  gtk_widget_show (window1);
-
+
+
+
+
+
+
+
+
-  gtk_main ();
-  return 0;

nekostring/trunk/src/neko_data.c

@@ -190 +190 @@
-    neko_patch_t *tmp, *pp;
-
-
-
-
-
+//
+//
+//
+//
-    ep += 4;
-
@@ -203 +203 @@
-        pp = &tmp[j];
-
-
+//
-        if (!n) {
-            /* fprintf(stderr, "failed in name\n"); */
@@ -210 +210 @@
-        ep += n;
-
-
+/*
-                   &pp->bass, &i0, &pp->viola,
-                   &pp->violin, &i1, &pp->osc2_pulsewidth,
@@ -216 +216 @@
-                   &i3, &pp->bass_decay, &pp->tone,
-                   &n) != 12) {
-
-
-
+*/
+//
+//
-        pp->cello = (unsigned char)i0;
-        pp->speed = (unsigned char)i1;
@@ -229 +229 @@
-        while (*ep == ' ') ep++;
-    
-
-
-
-
-
+//
+//
+//
+//
+//
-
-    memcpy(patches, tmp, 32 * sizeof(neko_patch_t));