eessppeelllloo/veejay
1
0
Fork 0
mirror of https://github.com/game-stop/veejay.git synced 2025-12-22 07:40:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

support 1024x768 in reloaded

Browse Source 
git-svn-id: svn://code.dyne.org/veejay/trunk@1217 eb8d1916-c9e9-0310-b8de-cf0c9472ead5
This commit is contained in:
Niels Elburg
2008-11-25 18:38:08 +00:00
parent 057be31cd4
commit 6efb0bfa5d
5 changed files with 935 additions and 689 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
veejay-current/veejay-client/share/gveejay.reloaded.glade
View File

@@ -1275,7 +1275,7 @@
<property name="digits">0</property> <property name="digits">0</property>
<property name="update_policy">GTK_UPDATE_CONTINUOUS</property> <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
<property name="inverted">True</property> <property name="inverted">True</property>
<property name="adjustment">0 0 255 0 0 0</property> <property name="adjustment">255 0 255 0 0 0</property>
<signal name="value_changed" handler="on_slider_p3_value_changed" last_modification_time="Wed, 23 Mar 2005 20:23:25 GMT"/> <signal name="value_changed" handler="on_slider_p3_value_changed" last_modification_time="Wed, 23 Mar 2005 20:23:25 GMT"/>
</widget> </widget>
<packing> <packing>
@@ -10900,6 +10900,12 @@ MLZO</property>
<property name="left_padding">0</property> <property name="left_padding">0</property>
<property name="right_padding">2</property> <property name="right_padding">2</property>
<child>
<widget class="GtkHBox" id="sample_loop_box">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child> <child>
<widget class="GtkFrame" id="frame326"> <widget class="GtkFrame" id="frame326">
<property name="visible">True</property> <property name="visible">True</property>
@@ -11044,22 +11050,13 @@ MLZO</property>
</widget> </widget>
</child> </child>
</widget> </widget>
</child>
</widget>
<packing> <packing>
<property name="padding">0</property> <property name="padding">0</property>
<property name="expand">False</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
</packing> </packing>
</child> </child>
<child>
<widget class="GtkFrame" id="frame323">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="label_yalign">0.5</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
<child> <child>
<widget class="GtkAlignment" id="alignment537"> <widget class="GtkAlignment" id="alignment537">
<property name="visible">True</property> <property name="visible">True</property>
@@ -11100,6 +11097,7 @@ MLZO</property>
<property name="active">False</property> <property name="active">False</property>
<property name="inconsistent">False</property> <property name="inconsistent">False</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<property name="group">loop_normal</property>
<signal name="clicked" handler="on_loop_none_clicked" last_modification_time="Sun, 27 Mar 2005 06:13:22 GMT"/> <signal name="clicked" handler="on_loop_none_clicked" last_modification_time="Sun, 27 Mar 2005 06:13:22 GMT"/>
<child> <child>
@@ -11159,7 +11157,7 @@ MLZO</property>
<property name="active">False</property> <property name="active">False</property>
<property name="inconsistent">False</property> <property name="inconsistent">False</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<property name="group">loop_none</property> <property name="group">loop_normal</property>
<signal name="clicked" handler="on_loop_random_clicked" last_modification_time="Thu, 04 Jan 2007 00:30:21 GMT"/> <signal name="clicked" handler="on_loop_random_clicked" last_modification_time="Thu, 04 Jan 2007 00:30:21 GMT"/>
<child> <child>
@@ -11209,6 +11207,13 @@ MLZO</property>
</widget> </widget>
</child> </child>
</widget> </widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
</child>
</widget>
</child> </child>
</widget> </widget>
<packing> <packing>

33
veejay-current/veejay-client/share/gveejay.reloaded.glade.bak
View File

@@ -1275,7 +1275,7 @@
<property name="digits">0</property> <property name="digits">0</property>
<property name="update_policy">GTK_UPDATE_CONTINUOUS</property> <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
<property name="inverted">True</property> <property name="inverted">True</property>
<property name="adjustment">0 0 255 0 0 0</property> <property name="adjustment">255 0 255 0 0 0</property>
<signal name="value_changed" handler="on_slider_p3_value_changed" last_modification_time="Wed, 23 Mar 2005 20:23:25 GMT"/> <signal name="value_changed" handler="on_slider_p3_value_changed" last_modification_time="Wed, 23 Mar 2005 20:23:25 GMT"/>
</widget> </widget>
<packing> <packing>
@@ -6148,7 +6148,7 @@
<property name="yscale">1</property> <property name="yscale">1</property>
<property name="top_padding">0</property> <property name="top_padding">0</property>
<property name="bottom_padding">0</property> <property name="bottom_padding">0</property>
<property name="left_padding">200</property> <property name="left_padding">20</property>
<property name="right_padding">0</property> <property name="right_padding">0</property>
<child> <child>
@@ -10900,6 +10900,12 @@ MLZO</property>
<property name="left_padding">0</property> <property name="left_padding">0</property>
<property name="right_padding">2</property> <property name="right_padding">2</property>
<child>
<widget class="GtkHBox" id="sample_loop_box">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child> <child>
<widget class="GtkFrame" id="frame326"> <widget class="GtkFrame" id="frame326">
<property name="visible">True</property> <property name="visible">True</property>
@@ -11044,22 +11050,13 @@ MLZO</property>
</widget> </widget>
</child> </child>
</widget> </widget>
</child>
</widget>
<packing> <packing>
<property name="padding">0</property> <property name="padding">0</property>
<property name="expand">False</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
</packing> </packing>
</child> </child>
<child>
<widget class="GtkFrame" id="frame323">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="label_yalign">0.5</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
<child> <child>
<widget class="GtkAlignment" id="alignment537"> <widget class="GtkAlignment" id="alignment537">
<property name="visible">True</property> <property name="visible">True</property>
@@ -11099,7 +11096,8 @@ MLZO</property>
<property name="focus_on_click">True</property> <property name="focus_on_click">True</property>
<property name="active">False</property> <property name="active">False</property>
<property name="inconsistent">False</property> <property name="inconsistent">False</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">False</property>
<property name="group">loop_normal</property>
<signal name="clicked" handler="on_loop_none_clicked" last_modification_time="Sun, 27 Mar 2005 06:13:22 GMT"/> <signal name="clicked" handler="on_loop_none_clicked" last_modification_time="Sun, 27 Mar 2005 06:13:22 GMT"/>
<child> <child>
@@ -11159,7 +11157,7 @@ MLZO</property>
<property name="active">False</property> <property name="active">False</property>
<property name="inconsistent">False</property> <property name="inconsistent">False</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<property name="group">loop_none</property> <property name="group">loop_normal</property>
<signal name="clicked" handler="on_loop_random_clicked" last_modification_time="Thu, 04 Jan 2007 00:30:21 GMT"/> <signal name="clicked" handler="on_loop_random_clicked" last_modification_time="Thu, 04 Jan 2007 00:30:21 GMT"/>
<child> <child>
@@ -11209,6 +11207,13 @@ MLZO</property>
</widget> </widget>
</child> </child>
</widget> </widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
</child>
</widget>
</child> </child>
</widget> </widget>
<packing> <packing>

161
veejay-current/veejay-client/share/reloaded_classic.glade
View File

@@ -1001,7 +1001,13 @@
<property name="shadow_type">GTK_SHADOW_NONE</property> <property name="shadow_type">GTK_SHADOW_NONE</property>
<child> <child>
<widget class="GtkHBox" id="hbox718"> <widget class="GtkHBox" id="hbox879">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
<widget class="GtkHBox" id="sample_loop_box">
<property name="visible">True</property> <property name="visible">True</property>
<property name="homogeneous">False</property> <property name="homogeneous">False</property>
<property name="spacing">0</property> <property name="spacing">0</property>
@@ -1237,6 +1243,38 @@
</packing> </packing>
</child> </child>
</widget> </widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="sample_length_label">
<property name="visible">True</property>
<property name="label" translatable="yes"></property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
</widget>
</child> </child>
<child> <child>
@@ -7239,7 +7277,7 @@ MLZO</property>
<widget class="GtkTable" id="table89"> <widget class="GtkTable" id="table89">
<property name="visible">True</property> <property name="visible">True</property>
<property name="n_rows">3</property> <property name="n_rows">3</property>
<property name="n_columns">4</property> <property name="n_columns">5</property>
<property name="homogeneous">False</property> <property name="homogeneous">False</property>
<property name="row_spacing">0</property> <property name="row_spacing">0</property>
<property name="column_spacing">0</property> <property name="column_spacing">0</property>
@@ -7523,6 +7561,90 @@ MLZO</property>
<property name="y_options"></property> <property name="y_options"></property>
</packing> </packing>
</child> </child>
<child>
<widget class="GtkLabel" id="label_current_mode">
<property name="visible">True</property>
<property name="label" translatable="yes"></property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">3</property>
<property name="right_attach">4</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label922">
<property name="visible">True</property>
<property name="label" translatable="yes">PM:</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="playhint">
<property name="visible">True</property>
<property name="label" translatable="yes"></property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">4</property>
<property name="right_attach">5</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
</child>
</widget> </widget>
</child> </child>
@@ -7794,9 +7916,15 @@ MLZO</property>
<property name="yscale">1</property> <property name="yscale">1</property>
<property name="top_padding">0</property> <property name="top_padding">0</property>
<property name="bottom_padding">0</property> <property name="bottom_padding">0</property>
<property name="left_padding">12</property> <property name="left_padding">0</property>
<property name="right_padding">0</property> <property name="right_padding">0</property>
<child>
<widget class="GtkHBox" id="hbox878">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child> <child>
<widget class="GtkHScale" id="speed_slider"> <widget class="GtkHScale" id="speed_slider">
<property name="width_request">80</property> <property name="width_request">80</property>
@@ -7810,6 +7938,31 @@ MLZO</property>
<property name="adjustment">0 0 0 0 0 0</property> <property name="adjustment">0 0 0 0 0 0</property>
<signal name="value_changed" handler="on_speed_slider_value_changed" last_modification_time="Tue, 15 Nov 2005 20:18:51 GMT"/> <signal name="value_changed" handler="on_speed_slider_value_changed" last_modification_time="Tue, 15 Nov 2005 20:18:51 GMT"/>
</widget> </widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">True</property>
</packing>
</child>
<child>
<widget class="GtkHScale" id="slow_slider">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="draw_value">True</property>
<property name="value_pos">GTK_POS_RIGHT</property>
<property name="digits">0</property>
<property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
<property name="inverted">False</property>
<property name="adjustment">0 0 0 0 0 0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
</child>
</widget>
</child> </child>
</widget> </widget>
</child> </child>
@@ -8032,7 +8185,7 @@ MLZO</property>
</child> </child>
<child> <child>
<widget class="GtkHBox" id="hbox638"> <widget class="GtkHBox" id="video_navigation_buttons">
<property name="visible">True</property> <property name="visible">True</property>
<property name="homogeneous">False</property> <property name="homogeneous">False</property>
<property name="spacing">0</property> <property name="spacing">0</property>

2
veejay-current/veejay-client/src/callback.c
View File

@@ -2776,7 +2776,7 @@ on_spin_samplebank_select_value_changed
page = max_page; page = max_page;
gtk_spin_button_set_value(spinbutton,page); gtk_spin_button_set_value(spinbutton,page);
} }
gtk_notebook_set_current_page(samplebank, page); gtk_notebook_set_current_page_(samplebank, page);
} }
void void
on_button_samplebank_prev_clicked (GtkButton *button, on_button_samplebank_prev_clicked (GtkButton *button,

177
veejay-current/veejay-client/src/vj-api.c
View File

@@ -81,6 +81,18 @@
#ifdef STRICT_CHECKING #ifdef STRICT_CHECKING
#include <assert.h> #include <assert.h>
#endif #endif
static int ui_skin_ = 0;
static struct
{
const int id;
const char *name;
const int page;
} crappy_design[] =
{
{ 1,"notebook18", 3 }, // On which notebook page is the multitrack view
{ 0,"vjdeck", 2 },
{ NULL, 0 }
};
static struct static struct
{ {
@@ -605,6 +617,44 @@ static void set_textview_buffer(const char *name, gchar *utf8text);
void interrupt_cb(); void interrupt_cb();
//static gboolean update_log(gpointer data); //static gboolean update_log(gpointer data);
GtkWidget *glade_xml_get_widget_( GladeXML *m, const char *name )
{
GtkWidget *widget = glade_xml_get_widget( m , name );
if(!widget)
{
veejay_msg(0,"Missing widget: %s %s ",__FUNCTION__,name);
return NULL;
}
#ifdef STRICT_CHECKING
assert( widget != NULL );
#endif
return widget;
}
void gtk_notebook_set_current_page__( GtkWidget *w, gint num, const char *f, int line )
{
#ifdef STRICT_CHECKING
veejay_msg(0, "%s: %d from %s:%d", __FUNCTION__, num,f,line);
#endif
gtk_notebook_set_current_page( GTK_NOTEBOOK(w), num );
}
void gtk_widget_set_size_request__( GtkWidget *w, gint iw, gint h, const char *f, int line )
{
#ifdef STRICT_CHECKING
// veejay_msg(0, "%s: %dx%d from %s:%d", __FUNCTION__, iw,h,f,line);
#endif
gtk_widget_set_size_request(w, iw, h );
}
#ifndef STRICT_CHECKING
#define gtk_widget_set_size_request_(a,b,c) gtk_widget_set_size_request(a,b,c)
#define gtk_notebook_set_current_page_(a,b) gtk_notebook_set_current_page(a,b)
#else
#define gtk_widget_set_size_request_(a,b,c) gtk_widget_set_size_request__(a,b,c,__FUNCTION__,__LINE__)
#define gtk_notebook_set_current_page_(a,b) gtk_notebook_set_current_page__(a,b,__FUNCTION__,__LINE__)
#endif
static struct static struct
{ {
const char *text; const char *text;
@@ -789,34 +839,6 @@ GdkColor *widget_get_fg(GtkWidget *w )
return c; return c;
} }
GtkWidget *glade_xml_get_widget_( GladeXML *m, const char *name )
{
GtkWidget *widget = glade_xml_get_widget( m , name );
if(!widget)
{
veejay_msg(0,"Missing widget: %s ",__FUNCTION__,name);
return NULL;
}
#ifdef STRICT_CHECKING
assert( widget != NULL );
#endif
return widget;
}
void gtk_widget_set_size_request__( GtkWidget *w, gint iw, gint h, const char *f, int line )
{
#ifdef STRICT_CHECKING
// veejay_msg(0, "%s: %dx%d from %s:%d", __FUNCTION__, iw,h,f,line);
#endif
gtk_widget_set_size_request(w, iw, h );
}
#ifndef STRICT_CHECKING
#define gtk_widget_set_size_request_(a,b,c) gtk_widget_set_size_request(a,b,c)
#else
#define gtk_widget_set_size_request_(a,b,c) gtk_widget_set_size_request__(a,b,c,__FUNCTION__,__LINE__)
#endif
static void scan_devices( const char *name) static void scan_devices( const char *name)
{ {
GtkWidget *tree = glade_xml_get_widget_(info->main_window,name); GtkWidget *tree = glade_xml_get_widget_(info->main_window,name);
@@ -2232,7 +2254,10 @@ static void update_curve_accessibility(const char *name)
static int get_nums(const char *name) static int get_nums(const char *name)
{ {
GtkWidget *w = glade_xml_get_widget_( info->main_window, name); GtkWidget *w = glade_xml_get_widget_( info->main_window, name);
if(!w) return 0; if(!w) {
veejay_msg(0, "No such widget (spin): '%s'",name);
return 0;
}
return (int) gtk_spin_button_get_value( GTK_SPIN_BUTTON( w ) ); return (int) gtk_spin_button_get_value( GTK_SPIN_BUTTON( w ) );
} }
@@ -2251,6 +2276,10 @@ static int count_textview_buffer(const char *name)
static void clear_textview_buffer(const char *name) static void clear_textview_buffer(const char *name)
{ {
GtkWidget *view = glade_xml_get_widget_( info->main_window, name ); GtkWidget *view = glade_xml_get_widget_( info->main_window, name );
if(!view) {
veejay_msg(0, "No such widget (textview): '%s'",name);
return;
}
if(view) if(view)
{ {
GtkTextBuffer *tb = NULL; GtkTextBuffer *tb = NULL;
@@ -2265,6 +2294,10 @@ static void clear_textview_buffer(const char *name)
static gchar *get_textview_buffer(const char *name) static gchar *get_textview_buffer(const char *name)
{ {
GtkWidget *view = glade_xml_get_widget_( info->main_window,name ); GtkWidget *view = glade_xml_get_widget_( info->main_window,name );
if(!view) {
veejay_msg(0, "No such widget (textview): '%s'",name);
return;
}
if(view) if(view)
{ {
GtkTextBuffer *tb = NULL; GtkTextBuffer *tb = NULL;
@@ -2282,6 +2315,10 @@ static gchar *get_textview_buffer(const char *name)
static void set_textview_buffer(const char *name, gchar *utf8text) static void set_textview_buffer(const char *name, gchar *utf8text)
{ {
GtkWidget *view = glade_xml_get_widget_( info->main_window, name ); GtkWidget *view = glade_xml_get_widget_( info->main_window, name );
if(!view) {
veejay_msg(0, "No such widget (textview): '%s'",name);
return;
}
if(view) if(view)
{ {
GtkTextBuffer *tb = gtk_text_view_get_buffer( GtkTextBuffer *tb = gtk_text_view_get_buffer(
@@ -2293,13 +2330,20 @@ static void set_textview_buffer(const char *name, gchar *utf8text)
static gchar *get_text(const char *name) static gchar *get_text(const char *name)
{ {
GtkWidget *w = glade_xml_get_widget_(info->main_window, name ); GtkWidget *w = glade_xml_get_widget_(info->main_window, name );
if(!w) return NULL; if(!w) {
veejay_msg(0, "No such widget (text): '%s'",name);
return NULL;
}
return (gchar*) gtk_entry_get_text( GTK_ENTRY(w)); return (gchar*) gtk_entry_get_text( GTK_ENTRY(w));
} }
static void put_text(const char *name, char *text) static void put_text(const char *name, char *text)
{ {
GtkWidget *w = glade_xml_get_widget_(info->main_window, name ); GtkWidget *w = glade_xml_get_widget_(info->main_window, name );
if(!w) {
veejay_msg(0, "No such widget (text): '%s'",name);
return;
}
if(w) if(w)
{ {
gchar *utf8_text = _utf8str( text ); gchar *utf8_text = _utf8str( text );
@@ -2311,7 +2355,11 @@ static void put_text(const char *name, char *text)
int is_button_toggled(const char *name) int is_button_toggled(const char *name)
{ {
GtkWidget *w = glade_xml_get_widget_( info->main_window, name); GtkWidget *w = glade_xml_get_widget_( info->main_window, name);
if(!w) return 0; if(!w) {
veejay_msg(0, "No such widget (togglebutton): '%s'",name);
return 0;
}
if( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(w) ) == TRUE ) if( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(w) ) == TRUE )
return 1; return 1;
return 0; return 0;
@@ -2319,18 +2367,22 @@ int is_button_toggled(const char *name)
static void set_toggle_button(const char *name, int status) static void set_toggle_button(const char *name, int status)
{ {
GtkWidget *w = glade_xml_get_widget_(info->main_window, name ); GtkWidget *w = glade_xml_get_widget_(info->main_window, name );
if(w) if(!w) {
{ veejay_msg(0, "No such widget (togglebutton): '%s'",name);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w), (status==1 ? TRUE: FALSE)); return;
} }
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w), (status==1 ? TRUE: FALSE));
} }
static void update_slider_gvalue(const char *name, gdouble value) static void update_slider_gvalue(const char *name, gdouble value)
{ {
GtkWidget *w = glade_xml_get_widget_( info->main_window, name ); GtkWidget *w = glade_xml_get_widget_( info->main_window, name );
if(!w) if(!w) {
veejay_msg(0, "No such widget (slider): '%s'",name);
return; return;
}
gtk_adjustment_set_value( gtk_adjustment_set_value(
GTK_ADJUSTMENT(GTK_RANGE(w)->adjustment), value ); GTK_ADJUSTMENT(GTK_RANGE(w)->adjustment), value );
} }
@@ -2338,8 +2390,10 @@ static void update_slider_gvalue(const char *name, gdouble value)
static void update_slider_value(const char *name, gint value, gint scale) static void update_slider_value(const char *name, gint value, gint scale)
{ {
GtkWidget *w = glade_xml_get_widget_( info->main_window, name ); GtkWidget *w = glade_xml_get_widget_( info->main_window, name );
if(!w) if(!w) {
veejay_msg(0, "No such widget (slider): '%s'",name);
return; return;
}
gdouble gvalue; gdouble gvalue;
if(scale) if(scale)
gvalue = (gdouble) value / (gdouble) scale; gvalue = (gdouble) value / (gdouble) scale;
@@ -2385,14 +2439,20 @@ static void update_knob_range(GtkWidget *w, gdouble min, gdouble max, gdouble v
static void update_spin_incr( const char *name, gdouble step, gdouble page ) static void update_spin_incr( const char *name, gdouble step, gdouble page )
{ {
GtkWidget *w = glade_xml_get_widget_( info->main_window, name ); GtkWidget *w = glade_xml_get_widget_( info->main_window, name );
if(!w) return; if(!w) {
veejay_msg(0, "No such widget (spin): '%s'",name);
return;
}
gtk_spin_button_set_increments(GTK_SPIN_BUTTON(w),step,page ); gtk_spin_button_set_increments(GTK_SPIN_BUTTON(w),step,page );
} }
static void update_spin_range(const char *name, gint min, gint max, gint val) static void update_spin_range(const char *name, gint min, gint max, gint val)
{ {
GtkWidget *w = glade_xml_get_widget_( info->main_window, name ); GtkWidget *w = glade_xml_get_widget_( info->main_window, name );
if(!w) return; if(!w) {
veejay_msg(0, "No such widget (spin): '%s'",name);
return;
}
gtk_spin_button_set_range( GTK_SPIN_BUTTON(w), (gdouble)min, (gdouble) max ); gtk_spin_button_set_range( GTK_SPIN_BUTTON(w), (gdouble)min, (gdouble) max );
gtk_spin_button_set_value( GTK_SPIN_BUTTON(w), (gdouble)val); gtk_spin_button_set_value( GTK_SPIN_BUTTON(w), (gdouble)val);
@@ -2417,14 +2477,20 @@ static int get_maxs(const char *name)
static void update_spin_value(const char *name, gint value ) static void update_spin_value(const char *name, gint value )
{ {
GtkWidget *w = glade_xml_get_widget_(info->main_window, name ); GtkWidget *w = glade_xml_get_widget_(info->main_window, name );
if(!w) return; if(!w) {
veejay_msg(0, "No such widget (spin): '%s'",name);
return;
}
gtk_spin_button_set_value( GTK_SPIN_BUTTON(w), (gdouble) value ); gtk_spin_button_set_value( GTK_SPIN_BUTTON(w), (gdouble) value );
} }
static void update_slider_range(const char *name, gint min, gint max, gint value, gint scaled) static void update_slider_range(const char *name, gint min, gint max, gint value, gint scaled)
{ {
GtkWidget *w = glade_xml_get_widget_( info->main_window, name ); GtkWidget *w = glade_xml_get_widget_( info->main_window, name );
if(!w) return; if(!w) {
veejay_msg(0, "No such widget (slider): '%s'",name);
return;
}
GtkRange *range = GTK_RANGE(w); GtkRange *range = GTK_RANGE(w);
if(!scaled) if(!scaled)
{ {
@@ -2447,7 +2513,10 @@ static void update_label_i(const char *name, int num, int prefix)
{ {
GtkWidget *label = glade_xml_get_widget_( GtkWidget *label = glade_xml_get_widget_(
info->main_window, name); info->main_window, name);
if(!label) return; if(!label) {
veejay_msg(0, "No such widget (label): '%s'",name);
return;
}
char str[20]; char str[20];
if(prefix) if(prefix)
g_snprintf( str,20, "%09d", num ); g_snprintf( str,20, "%09d", num );
@@ -2461,7 +2530,10 @@ static void update_label_f(const char *name, float val )
{ {
GtkWidget *label = glade_xml_get_widget_( GtkWidget *label = glade_xml_get_widget_(
info->main_window, name); info->main_window, name);
if(!label) return; if(!label) {
veejay_msg(0, "No such widget (label): '%s'",name);
return;
}
char value[10]; char value[10];
snprintf( value, sizeof(value)-1, "%2.2f", val ); snprintf( value, sizeof(value)-1, "%2.2f", val );
@@ -2474,6 +2546,7 @@ static void update_label_str(const char *name, gchar *text)
GtkWidget *label = glade_xml_get_widget_( GtkWidget *label = glade_xml_get_widget_(
info->main_window, name); info->main_window, name);
#ifdef STRICT_CHECKING #ifdef STRICT_CHECKING
if(!label) veejay_msg(0, "No such widget (label): '%s'",name);
assert( label != NULL ); assert( label != NULL );
#else #else
if(!label ||!text) return; if(!label ||!text) return;
@@ -3232,7 +3305,7 @@ static void setup_effectchain_info( void )
g_object_unref( G_OBJECT( store )); g_object_unref( G_OBJECT( store ));
setup_tree_text_column( "tree_chain", FXC_ID, "#",0 ); setup_tree_text_column( "tree_chain", FXC_ID, "#",0 );
setup_tree_text_column( "tree_chain", FXC_FXID, "Effect",350 ); setup_tree_text_column( "tree_chain", FXC_FXID, "Effect",( ui_skin_ == 0?350 : 250) );
setup_tree_pixmap_column( "tree_chain", FXC_FXSTATUS, "Run"); // todo: could be checkbox!! setup_tree_pixmap_column( "tree_chain", FXC_FXSTATUS, "Run"); // todo: could be checkbox!!
setup_tree_pixmap_column( "tree_chain", FXC_KF , "Anim" ); // parameter interpolation on/off per entry setup_tree_pixmap_column( "tree_chain", FXC_KF , "Anim" ); // parameter interpolation on/off per entry
GtkTreeSelection *selection; GtkTreeSelection *selection;
@@ -5373,6 +5446,9 @@ int gveejay_time_to_sync( vj_gui_t *ui )
return 0; return 0;
} }
// skin 0: notebook18, page 3
// skin 1: vjdeck , page 2
int veejay_update_multitrack( void *data ) int veejay_update_multitrack( void *data )
{ {
vj_gui_t *gui = (vj_gui_t*) data; vj_gui_t *gui = (vj_gui_t*) data;
@@ -5385,7 +5461,7 @@ int veejay_update_multitrack( void *data )
GtkWidget *maintrack = glade_xml_get_widget( info->main_window, "imageA"); GtkWidget *maintrack = glade_xml_get_widget( info->main_window, "imageA");
int i; int i;
GtkWidget *ww = glade_xml_get_widget_( info->main_window, "notebook18" ); GtkWidget *ww = glade_xml_get_widget_( info->main_window, crappy_design[ui_skin_].name );
int deckpage = gtk_notebook_get_current_page(GTK_NOTEBOOK(ww)); int deckpage = gtk_notebook_get_current_page(GTK_NOTEBOOK(ww));
#ifdef STRICT_CHECKING #ifdef STRICT_CHECKING
@@ -5453,7 +5529,7 @@ int veejay_update_multitrack( void *data )
vj_img_cb( s->img_list[i] ); vj_img_cb( s->img_list[i] );
} }
if(deckpage == 3) if(deckpage == crappy_design[ui_skin_].page)
multitrack_update_sequence_image( gui->mt, i, s->img_list[i] ); multitrack_update_sequence_image( gui->mt, i, s->img_list[i] );
gdk_pixbuf_unref( s->img_list[i] ); gdk_pixbuf_unref( s->img_list[i] );
@@ -6098,10 +6174,16 @@ int vj_gui_get_preview_priority(void)
void default_bank_values(int *col, int *row ) void default_bank_values(int *col, int *row )
{ {
int nsc = 2;
int nsy = 6;
if( ui_skin_ == 1 ) {
nsc = 5;
nsy = 4;
}
if( *col == 0 && *row == 0 ) if( *col == 0 && *row == 0 )
{ {
NUM_SAMPLES_PER_COL = 2; NUM_SAMPLES_PER_COL = nsc;
NUM_SAMPLES_PER_ROW = 6; NUM_SAMPLES_PER_ROW = nsy;
} }
else else
{ {
@@ -6114,6 +6196,7 @@ void default_bank_values(int *col, int *row )
void set_skin(int skin) void set_skin(int skin)
{ {
ui_skin_ = skin;
timeline_theme_colors( 1 ); timeline_theme_colors( 1 );
} }