78 lines
3.0 KiB
Diff
78 lines
3.0 KiB
Diff
|
--- trunk/src/gx_engine.cpp 2009/12/13 09:24:02 433
|
||
|
|
+++ trunk/src/gx_engine.cpp 2009/12/16 19:36:03 434
|
||
|
|
@@ -533,11 +533,11 @@
|
||
|
|
/* --- adding rest of engine class by file inclusion for readability --- */
|
||
|
|
|
||
|
|
/* MIDI engine */
|
||
|
|
-#ifdef USE_RINGBUFFER
|
||
|
|
-#include "gx_engine_midi_ringbuf.cpp"
|
||
|
|
-#else
|
||
|
|
+//#ifdef USE_RINGBUFFER
|
||
|
|
+//#include "gx_engine_midi_ringbuf.cpp"
|
||
|
|
+//#else
|
||
|
|
#include "gx_engine_midi.cpp"
|
||
|
|
-#endif
|
||
|
|
+//#endif
|
||
|
|
|
||
|
|
/* audio engine */
|
||
|
|
#include "gx_engine_audio.cpp"
|
||
|
|
--- trunk/src/gx_engine_midi.cpp 2009/12/13 09:24:02 433
|
||
|
|
+++ trunk/src/gx_engine_midi.cpp 2009/12/16 19:36:03 434
|
||
|
|
@@ -411,8 +411,8 @@
|
||
|
|
if(Beat_is < rms)Beat_is += 2;
|
||
|
|
//Beat_is = rms;
|
||
|
|
send+=step;
|
||
|
|
- if (fcheckbox10 == 1.0) send1+=step;
|
||
|
|
- if (fcheckbox11 == 1.0) send2+=step;
|
||
|
|
+ if (fcheckbox10 ) send1+=step;
|
||
|
|
+ if (fcheckbox11 ) send2+=step;
|
||
|
|
}
|
||
|
|
// else weg +=step;
|
||
|
|
}
|
||
|
|
--- trunk/src/gx_gui_helpers.cpp 2009/12/13 09:24:02 433
|
||
|
|
+++ trunk/src/gx_gui_helpers.cpp 2009/12/16 19:36:03 434
|
||
|
|
@@ -1525,6 +1525,33 @@
|
||
|
|
return FALSE;
|
||
|
|
}
|
||
|
|
|
||
|
|
+ gboolean label_expose(GtkWidget *wi, GdkEventExpose *ev, gpointer user_data)
|
||
|
|
+ {
|
||
|
|
+ if (int(float(gx_current_skin)==1))
|
||
|
|
+ {
|
||
|
|
+ GdkColor colorGreen;
|
||
|
|
+ gdk_color_parse("#000000", &colorGreen);
|
||
|
|
+ gtk_widget_modify_fg (wi, GTK_STATE_NORMAL, &colorGreen);
|
||
|
|
+ gdk_color_parse("#111111", &colorGreen);
|
||
|
|
+ gtk_widget_modify_fg (wi, GTK_STATE_PRELIGHT, &colorGreen);
|
||
|
|
+ gdk_color_parse("#222222", &colorGreen);
|
||
|
|
+ gtk_widget_modify_fg (wi, GTK_STATE_ACTIVE, &colorGreen);
|
||
|
|
+ gdk_color_parse("#333333", &colorGreen);
|
||
|
|
+ gtk_widget_modify_fg (wi, GTK_STATE_SELECTED, &colorGreen);
|
||
|
|
+ }
|
||
|
|
+ else{
|
||
|
|
+ GdkColor colorGreen;
|
||
|
|
+ gdk_color_parse("#a6a9aa", &colorGreen);
|
||
|
|
+ gtk_widget_modify_fg (wi, GTK_STATE_NORMAL, &colorGreen);
|
||
|
|
+ gdk_color_parse("#ffffff", &colorGreen);
|
||
|
|
+ gtk_widget_modify_fg (wi, GTK_STATE_PRELIGHT, &colorGreen);
|
||
|
|
+ gdk_color_parse("#ffffff", &colorGreen);
|
||
|
|
+ gtk_widget_modify_fg (wi, GTK_STATE_ACTIVE, &colorGreen);
|
||
|
|
+ gdk_color_parse("#a6a9aa", &colorGreen);
|
||
|
|
+ gtk_widget_modify_fg (wi, GTK_STATE_SELECTED, &colorGreen);
|
||
|
|
+ }
|
||
|
|
+ return FALSE;
|
||
|
|
+ }
|
||
|
|
|
||
|
|
gboolean box7_expose(GtkWidget *wi, GdkEventExpose *ev, gpointer user_data)
|
||
|
|
{
|
||
|
|
--- trunk/src/headers/gx_gui_helpers.h 2009/12/13 09:24:02 433
|
||
|
|
+++ trunk/src/headers/gx_gui_helpers.h 2009/12/16 19:36:03 434
|
||
|
|
@@ -44,6 +44,7 @@
|
||
|
|
gboolean box2_expose(GtkWidget *wi, GdkEventExpose *ev, gpointer user_data);
|
||
|
|
gboolean box1_expose(GtkWidget *wi, GdkEventExpose *ev, gpointer user_data);
|
||
|
|
gboolean box_expose (GtkWidget *wi, GdkEventExpose *ev, gpointer user_data);
|
||
|
|
+ gboolean label_expose(GtkWidget *wi, GdkEventExpose *ev, gpointer user_data);
|
||
|
|
|
||
|
|
/* guitarix skin related functions */
|
||
|
|
unsigned int gx_fetch_available_skins();
|