diff --git a/veejay-1.0/veejay-client/README b/veejay-1.0/veejay-client/README index 4d972775..18d242d2 100644 --- a/veejay-1.0/veejay-client/README +++ b/veejay-1.0/veejay-client/README @@ -21,7 +21,7 @@ ..::,,.: :||=~=.|| ,...::,,, |~:=|||||+| :..,:::||||~~~====++ - ,:,,,:::~~~~~===++++ GveejayReloaded + ,:,,,:::~~~~~===++++ Reloaded ,::::~~~====++++ ~~~~~===+++++ version 1.0 ~~===+++++++: @@ -32,7 +32,7 @@ || - :: GveejayReloaded, a graphical interface for Veejay :: + :: Reloaded, a graphical interface for Veejay :: FEATURE OVERVIEW @@ -61,7 +61,7 @@ See source code. Running ======= -$ gveejayreloaded +$ reloaded To use a midi controller with veejay you must connect @@ -91,7 +91,7 @@ About ===== GveejayReloaded is a client for veejay. As long as veejay (the server) -is running, you can connect and disconnect from it with gveejayreloaded. +is running, you can connect and disconnect from it with reloaded. diff --git a/veejay-1.0/veejay-client/configure.ac b/veejay-1.0/veejay-client/configure.ac index 45c97d11..cd905833 100644 --- a/veejay-1.0/veejay-client/configure.ac +++ b/veejay-1.0/veejay-client/configure.ac @@ -8,7 +8,7 @@ VEEJAY_MAJOR_VERSION=1 VEEJAY_MINOR_VERSION=0 VEEJAY_MICRO_VERSION=0 VEEJAY_VERSION=$VEEJAY_MAJOR_VERSION.$VEEJAY_MINOR_VERSION.$VEEJAY_MICRO_VERSION -VEEJAY_CODENAME="GVeejayReloaded - build $VEEJAY_MINOR_VERSION $VEEJAY_MICRO_VERSION" +VEEJAY_CODENAME="Reloaded - build $VEEJAY_MINOR_VERSION $VEEJAY_MICRO_VERSION" AC_CONFIG_HEADERS([config.h]) AC_CANONICAL_HOST diff --git a/veejay-1.0/veejay-client/share/gveejay.reloaded.glade b/veejay-1.0/veejay-client/share/gveejay.reloaded.glade index 09cc5bda..1c49a119 100644 --- a/veejay-1.0/veejay-client/share/gveejay.reloaded.glade +++ b/veejay-1.0/veejay-client/share/gveejay.reloaded.glade @@ -4,7 +4,7 @@ - GVeejayReloaded + Reloaded GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False @@ -547,7 +547,7 @@ True - About GVeejayReloaded + About Reloaded True @@ -12466,7 +12466,7 @@ MLZO False False - GVeejayReloaded Launcher + Reloaded Launcher diff --git a/veejay-1.0/veejay-client/src/Makefile.am b/veejay-1.0/veejay-client/src/Makefile.am index 395c6192..0c96a64d 100644 --- a/veejay-1.0/veejay-client/src/Makefile.am +++ b/veejay-1.0/veejay-client/src/Makefile.am @@ -5,10 +5,10 @@ AM_CFLAGS=$(OP_CFLAGS) INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src $(VEEJAY_CFLAGS ) $(GTK_CFLAGS) \ $(MJPEGTOOLS_CFLAGS) $(GLIB_CFLAGS) $(GLADE_CFLAGS) $(GTKCAIRO_CFLAGS) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DGVEEJAY_DATADIR=\""$(gveejay_datadir)"\" -GVEEJAY_BIN=gveejayreloaded +GVEEJAY_BIN=reloaded bin_PROGRAMS = $(GVEEJAY_BIN) -gveejayreloaded_SOURCES = widgets/gtkcolorsel.c widgets/gtkknob.c widgets/cellrendererspin.c widgets/gtktimeselection.c vj-midi.c curve.c utils.c tracksources.c gveejay.c keyboard.c sequence.c multitrack.c vj-api.c ${gveejay_headers} +reloaded_SOURCES = widgets/gtkcolorsel.c widgets/gtkknob.c widgets/cellrendererspin.c widgets/gtktimeselection.c vj-midi.c curve.c utils.c tracksources.c gveejay.c keyboard.c sequence.c multitrack.c vj-api.c ${gveejay_headers} -gveejayreloaded_LDFLAGS = $(VEEJAY_LIBS) $(MJPEGTOOLS_LIBS) $(GTK_LIBS) $(GLIB_LIBS)\ +reloaded_LDFLAGS = $(VEEJAY_LIBS) $(MJPEGTOOLS_LIBS) $(GTK_LIBS) $(GLIB_LIBS)\ $(GLADE_LIBS) $(GTKCAIRO_LIBS) $(FFMPEG_AVCODEC_LIBS) $(FFMPEG_SWSCALER_LIBS) $(ALSA_LIBS) -lgthread-2.0 -export-dynamic diff --git a/veejay-1.0/veejay-client/src/gveejay.c b/veejay-1.0/veejay-client/src/gveejay.c index dfc4ca0f..b5d30d36 100644 --- a/veejay-1.0/veejay-client/src/gveejay.c +++ b/veejay-1.0/veejay-client/src/gveejay.c @@ -179,7 +179,7 @@ int main(int argc, char *argv[]) { if( sched_setscheduler( 0, SCHED_FIFO, &schp ) != 0 ) veejay_msg(0, "Error setting RR"); else - veejay_msg(VEEJAY_MSG_INFO, "GVeejayReloaded running with low priority"); + veejay_msg(VEEJAY_MSG_INFO, "Reloaded running with low priority"); if( preview ) { diff --git a/veejay-1.0/veejay-client/src/vj-api.c b/veejay-1.0/veejay-client/src/vj-api.c index ad55e7d8..ada8b61d 100644 --- a/veejay-1.0/veejay-client/src/vj-api.c +++ b/veejay-1.0/veejay-client/src/vj-api.c @@ -258,7 +258,6 @@ typedef struct static int user_preview = 0; static int NUM_BANKS = 35; -static int NUM_PAGES = 10; static int NUM_SAMPLES_PER_PAGE = 12; static int NUM_SAMPLES_PER_COL = 2; static int NUM_SAMPLES_PER_ROW = 6; @@ -1502,7 +1501,7 @@ void about_dialog() ( path, NULL ); GtkWidget *about = g_object_new( GTK_TYPE_ABOUT_DIALOG, - "name", "GVeejay Reloaded", + "name", "Reloaded", "version", VERSION, "copyright", "(C) 2004 - 2007 N. Elburg et all.", "comments", "The graphical interface for Veejay", @@ -6345,7 +6344,7 @@ void default_bank_values(int *col, int *row ) { if( *col == 0 && *row == 0 ) { - NUM_SAMPLES_PER_COL = 3; + NUM_SAMPLES_PER_COL = 5; NUM_SAMPLES_PER_ROW = 4; } else @@ -6594,7 +6593,7 @@ void vj_gui_init(char *glade_file, int launcher, char *hostname, int port_num) setup_samplebank( NUM_SAMPLES_PER_COL, NUM_SAMPLES_PER_ROW ); //@ FIXME: to setup_defaults - create_ref_slots( 16 ); + create_ref_slots( 12 ); create_sequencer_slots( 10 ); @@ -6994,6 +6993,10 @@ gboolean is_alive( void ) veejay_stop_connecting(gui); multrack_audoadd( info->mt, remote, port ); info->watch.p_state = 0; + + if(!user_preview) + multitrack_set_quality( info->mt, 2 ); + if( user_preview ) { multitrack_set_quality( info->mt, user_preview );