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

support different views of reloaded - added back good old 1024x768 reloaded glade as reloaded_classic.glade, load it with -S1 and hope its workable, next commit will do proper enabling/disabling of widgets and updating of labels.

Browse Source 
git-svn-id: svn://code.dyne.org/veejay/trunk@1215 eb8d1916-c9e9-0310-b8de-cf0c9472ead5
This commit is contained in:
Niels Elburg
2008-11-24 21:17:45 +00:00
parent 4868d51ca5
commit b477e46f9d
3 changed files with 16077 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16064
veejay-current/veejay-client/share/reloaded_classic.glade Normal file
View File

File diff suppressed because it is too large Load Diff

13
veejay-current/veejay-client/src/gveejay.c
View File

@@ -32,6 +32,7 @@
#include <src/vj-api.h> #include <src/vj-api.h>
#include <sched.h> #include <sched.h>
static int selected_skin = 0;
extern int mt_get_max_tracks(); extern int mt_get_max_tracks();
static int port_num = 3490; static int port_num = 3490;
@@ -52,6 +53,7 @@ static struct
char *file; char *file;
} skins[] = { } skins[] = {
{ "gveejay.reloaded.glade" }, { "gveejay.reloaded.glade" },
{ "reloaded_classic.glade" },
{ NULL } { NULL }
}; };
@@ -84,7 +86,10 @@ static int set_option( const char *name, char *value )
{ {
if(sscanf( optarg, "%d", &port_num )) if(sscanf( optarg, "%d", &port_num ))
launcher++; launcher++;
} }
else if (strcmp(name, "S" ) == 0 ) {
selected_skin = atoi( optarg);
}
else if (strcmp(name, "n") == 0 ) else if (strcmp(name, "n") == 0 )
{ {
veejay_set_colors(0); veejay_set_colors(0);
@@ -196,7 +201,7 @@ int main(int argc, char *argv[]) {
// default host to connect to // default host to connect to
sprintf(hostname, "127.0.0.1"); sprintf(hostname, "127.0.0.1");
while( ( n = getopt( argc, argv, "s:h:p:tnvHf:X:P:q")) != EOF ) while( ( n = getopt( argc, argv, "s:h:p:tnvHf:X:P:qS:")) != EOF )
{ {
sprintf(option, "%c", n ); sprintf(option, "%c", n );
err += set_option( option, optarg); err += set_option( option, optarg);
@@ -227,11 +232,11 @@ int main(int argc, char *argv[]) {
vj_gui_set_debug_level( verbosity , n_tracks,pw,ph); vj_gui_set_debug_level( verbosity , n_tracks,pw,ph);
vj_gui_set_timeout(timer); vj_gui_set_timeout(timer);
set_skin( 1 ); set_skin( selected_skin );
default_bank_values( &col, &row ); default_bank_values( &col, &row );
gui_load_theme(); gui_load_theme();
vj_gui_init( skins[0].file, launcher, hostname, port_num, use_threads ); vj_gui_init( skins[selected_skin].file, launcher, hostname, port_num, use_threads );
vj_gui_style_setup(); vj_gui_style_setup();

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

@@ -5144,7 +5144,7 @@ void find_user_themes(int theme)
veejay_memset( theme_file, 0, sizeof(theme_file)); veejay_memset( theme_file, 0, sizeof(theme_file));
theme_settings = gtk_settings_get_default(); theme_settings = gtk_settings_get_default();
snprintf( glade_path, sizeof(glade_path), "%s/gveejay.reloaded.glade",GVEEJAY_DATADIR); // snprintf( glade_path, sizeof(glade_path), "%s/gveejay.reloaded.glade",GVEEJAY_DATADIR);
if(!home) if(!home)
@@ -6114,7 +6114,7 @@ void default_bank_values(int *col, int *row )
void set_skin(int skin) void set_skin(int skin)
{ {
timeline_theme_colors( skin ? 1: 0 ); timeline_theme_colors( 1 );
} }
int vj_gui_sleep_time( void ) int vj_gui_sleep_time( void )
@@ -6354,6 +6354,8 @@ void vj_gui_init(char *glade_file, int launcher, char *hostname, int port_num,
{ {
return; return;
} }
snprintf( glade_path, sizeof(glade_path), "%s/%s",GVEEJAY_DATADIR,glade_file);
veejay_memset( gui->status_tokens, 0, sizeof(int) * STATUS_TOKENS ); veejay_memset( gui->status_tokens, 0, sizeof(int) * STATUS_TOKENS );
veejay_memset( gui->sample, 0, 2 ); veejay_memset( gui->sample, 0, 2 );