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

build fixes

Browse Source
This commit is contained in:
niels
2013-12-30 21:35:31 +01:00
parent 138aaddc5b
commit f995c5690a
13 changed files with 128 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,7 +54,9 @@
#include <gtkknob.h>
#include <gtktimeselection.h>
#include <libgen.h>
#ifdef HAVE_SDL
#include <src/keyboard.h>
#endif
#include <gtk/gtkversion.h>
#include <gdk/gdk.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
@@ -1577,9 +1579,22 @@ void about_dialog()
char blob[1024];
char *os_str = produce_os_str();
sprintf(blob, "Veejay - A visual instrument and realtime video sampler for GNU/Linux\n%s", os_str );
const gchar *donate =
{
"You can donate cryptocoins!\n"\
"Bitcoin: 1PUNRsv8vDt1upTx9tTpY5sH8mHW1DTrKJ\n"\
"Devcoin: 1DtYKQx6kLnCxX5S8atf6b3dD42A2UavvE\n"\
"Litecoin: LcccLQCB7DbqGj9u52urRjVi43yYz7WeND\n"\
"Feathercoin: 6i4G4C9jEZuL6R7vSspZ6JMAUP2zb6M1Yu\n"
};
sprintf(blob, "Veejay - A visual instrument and realtime video sampler for GNU/Linux\n%s\n%s", os_str, donate );
free(os_str);
const gchar *license =
{
"This program is Free Software; You can redistribute it and/or modify\n" \
@@ -1628,6 +1643,7 @@ gboolean dialogkey_snooper( GtkWidget *w, GdkEventKey *event, gpointer user_data
{
return FALSE;
}
#ifdef HAVE_SDL
if(event->type == GDK_KEY_PRESS)
{
gchar tmp[100];
@@ -1648,11 +1664,11 @@ gboolean dialogkey_snooper( GtkWidget *w, GdkEventKey *event, gpointer user_data
g_free(utf8_text);
}
}
#endif
return FALSE;
}
gboolean key_handler( GtkWidget *w, GdkEventKey *event, gpointer user_data)
#ifdef HAVE_SDL
static gboolean key_handler( GtkWidget *w, GdkEventKey *event, gpointer user_data)
{
if(event->type != GDK_KEY_PRESS)
return FALSE;
@@ -1667,7 +1683,7 @@ gboolean key_handler( GtkWidget *w, GdkEventKey *event, gpointer user_data)
}
return FALSE;
}
#endif
static int check_format_string( char *args, char *format )
{
if(!format || !args )
@@ -1735,7 +1751,7 @@ prompt_keydialog(const char *title, char *msg)
gtk_container_add( GTK_CONTAINER(hbox1), arglabel );
gtk_container_add( GTK_CONTAINER(hbox1), pentry );
}
#ifdef HAVE_SDL
if( info->uc.selected_vims_entry )
{
char tmp[100];
@@ -1757,7 +1773,7 @@ prompt_keydialog(const char *title, char *msg)
gtk_entry_set_text( GTK_ENTRY(keyentry), tmp );
}
}
#endif
gtk_container_add( GTK_CONTAINER( GTK_DIALOG( dialog )->vbox ), hbox1 );
gtk_container_add( GTK_CONTAINER( GTK_DIALOG( dialog )->vbox ), hbox2 );
@@ -4464,15 +4480,16 @@ gboolean
int m=0;
gchar *key = NULL;
gchar *mod = NULL;
#ifdef HAVE_SDL
gtk_tree_model_get(model,&iter, VIMS_KEY, &key, -1);
gtk_tree_model_get(model,&iter, VIMS_MOD, &mod, -1);
#endif
if(sscanf( vimsid, "%d", &event_id ))
{
#ifdef HAVE_SDL
k = sdlkey_by_name( key );
m = sdlmod_by_name( mod );
#endif
info->uc.selected_vims_entry = event_id;
if( event_id >= VIMS_BUNDLE_START && event_id < VIMS_BUNDLE_END )
@@ -4486,7 +4503,7 @@ gboolean
if( n_params > 0 && text )
info->uc.selected_vims_args = strdup( text );
info->uc.selected_vims_accel[0] = m;
info->uc.selected_vims_accel[1] = k;
@@ -4805,8 +4822,13 @@ static void reload_bundles()
gchar *g_descr = NULL;
gchar *g_format = NULL;
gchar *g_content = NULL;
#ifdef HAVE_SDL
gchar *g_keyname = sdlkey_by_id( val[1] );
gchar *g_keymod = sdlmod_by_id( val[2] );
#else
gchar *g_keyname = "N/A";
gchar *g_keymod = "";
#endif
gchar *g_vims[5];
sprintf( (char*) g_vims, "%03d", val[0] );
@@ -7312,7 +7334,9 @@ gboolean is_alive( int *do_sync )
else
{
info->watch.state = STATE_PLAYING;
#ifdef HAVE_SDL
info->key_id = gtk_key_snooper_install( key_handler , NULL);
#endif
multrack_audoadd( info->mt, remote, port );
*do_sync = 1;
if( user_preview ) {