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

rename gveejayreloaded to reloaded

Browse Source 
git-svn-id: svn://code.dyne.org/veejay/trunk@952 eb8d1916-c9e9-0310-b8de-cf0c9472ead5
This commit is contained in:
Niels Elburg
2007-04-08 13:29:37 +00:00
parent 3041d8d119
commit fa70a276a0
6 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
veejay-1.0/veejay-client/README
View File

@@ -21,7 +21,7 @@
..::,,.: :||=~=.|| ..::,,.: :||=~=.||
,...::,,, |~:=|||||+| ,...::,,, |~:=|||||+|
:..,:::||||~~~====++ :..,:::||||~~~====++
,:,,,:::~~~~~===++++ GveejayReloaded ,:,,,:::~~~~~===++++ Reloaded
,::::~~~====++++ ,::::~~~====++++
~~~~~===+++++ version 1.0 ~~~~~===+++++ version 1.0
~~===+++++++: ~~===+++++++:
@@ -32,7 +32,7 @@
|| ||
:: GveejayReloaded, a graphical interface for Veejay :: :: Reloaded, a graphical interface for Veejay ::
FEATURE OVERVIEW FEATURE OVERVIEW
@@ -61,7 +61,7 @@ See source code.
Running Running
======= =======
$ gveejayreloaded $ reloaded
To use a midi controller with veejay you must connect 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) 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.

2
veejay-1.0/veejay-client/configure.ac
View File

@@ -8,7 +8,7 @@ VEEJAY_MAJOR_VERSION=1
VEEJAY_MINOR_VERSION=0 VEEJAY_MINOR_VERSION=0
VEEJAY_MICRO_VERSION=0 VEEJAY_MICRO_VERSION=0
VEEJAY_VERSION=$VEEJAY_MAJOR_VERSION.$VEEJAY_MINOR_VERSION.$VEEJAY_MICRO_VERSION 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_CONFIG_HEADERS([config.h])
AC_CANONICAL_HOST AC_CANONICAL_HOST

6
veejay-1.0/veejay-client/share/gveejay.reloaded.glade
View File

@@ -4,7 +4,7 @@
<glade-interface> <glade-interface>
<widget class="GtkWindow" id="gveejay_window"> <widget class="GtkWindow" id="gveejay_window">
<property name="title" translatable="yes">GVeejayReloaded </property> <property name="title" translatable="yes">Reloaded</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property> <property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property> <property name="window_position">GTK_WIN_POS_NONE</property>
<property name="modal">False</property> <property name="modal">False</property>
@@ -547,7 +547,7 @@
<child> <child>
<widget class="GtkImageMenuItem" id="about1"> <widget class="GtkImageMenuItem" id="about1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">About GVeejayReloaded</property> <property name="label" translatable="yes">About Reloaded</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<signal name="activate" handler="on_about1_activate" last_modification_time="Thu, 15 Sep 2005 22:07:40 GMT"/> <signal name="activate" handler="on_about1_activate" last_modification_time="Thu, 15 Sep 2005 22:07:40 GMT"/>
@@ -12466,7 +12466,7 @@ MLZO</property>
<property name="urgency_hint">False</property> <property name="urgency_hint">False</property>
<property name="has_separator">False</property> <property name="has_separator">False</property>
<accessibility> <accessibility>
<atkproperty name="AtkObject::accessible_name" translatable="yes">GVeejayReloaded Launcher</atkproperty> <atkproperty name="AtkObject::accessible_name" translatable="yes">Reloaded Launcher</atkproperty>
</accessibility> </accessibility>
<signal name="close" handler="on_veejay_connection_close" last_modification_time="Sat, 23 Jul 2005 16:04:51 GMT"/> <signal name="close" handler="on_veejay_connection_close" last_modification_time="Sat, 23 Jul 2005 16:04:51 GMT"/>
<signal name="delete_event" handler="on_veejay_connection_close" last_modification_time="Sat, 23 Jul 2005 18:53:55 GMT"/> <signal name="delete_event" handler="on_veejay_connection_close" last_modification_time="Sat, 23 Jul 2005 18:53:55 GMT"/>

6
veejay-1.0/veejay-client/src/Makefile.am
View File

@@ -5,10 +5,10 @@ AM_CFLAGS=$(OP_CFLAGS)
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src $(VEEJAY_CFLAGS ) $(GTK_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)"\" $(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) 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 $(GLADE_LIBS) $(GTKCAIRO_LIBS) $(FFMPEG_AVCODEC_LIBS) $(FFMPEG_SWSCALER_LIBS) $(ALSA_LIBS) -lgthread-2.0 -export-dynamic

2
veejay-1.0/veejay-client/src/gveejay.c
View File

@@ -179,7 +179,7 @@ int main(int argc, char *argv[]) {
if( sched_setscheduler( 0, SCHED_FIFO, &schp ) != 0 ) if( sched_setscheduler( 0, SCHED_FIFO, &schp ) != 0 )
veejay_msg(0, "Error setting RR"); veejay_msg(0, "Error setting RR");
else else
veejay_msg(VEEJAY_MSG_INFO, "GVeejayReloaded running with low priority"); veejay_msg(VEEJAY_MSG_INFO, "Reloaded running with low priority");
if( preview ) if( preview )
{ {

11
veejay-1.0/veejay-client/src/vj-api.c
View File

@@ -258,7 +258,6 @@ typedef struct
static int user_preview = 0; static int user_preview = 0;
static int NUM_BANKS = 35; static int NUM_BANKS = 35;
static int NUM_PAGES = 10;
static int NUM_SAMPLES_PER_PAGE = 12; static int NUM_SAMPLES_PER_PAGE = 12;
static int NUM_SAMPLES_PER_COL = 2; static int NUM_SAMPLES_PER_COL = 2;
static int NUM_SAMPLES_PER_ROW = 6; static int NUM_SAMPLES_PER_ROW = 6;
@@ -1502,7 +1501,7 @@ void about_dialog()
( path, NULL ); ( path, NULL );
GtkWidget *about = g_object_new( GtkWidget *about = g_object_new(
GTK_TYPE_ABOUT_DIALOG, GTK_TYPE_ABOUT_DIALOG,
"name", "GVeejay Reloaded", "name", "Reloaded",
"version", VERSION, "version", VERSION,
"copyright", "(C) 2004 - 2007 N. Elburg et all.", "copyright", "(C) 2004 - 2007 N. Elburg et all.",
"comments", "The graphical interface for Veejay", "comments", "The graphical interface for Veejay",
@@ -6345,7 +6344,7 @@ void default_bank_values(int *col, int *row )
{ {
if( *col == 0 && *row == 0 ) if( *col == 0 && *row == 0 )
{ {
NUM_SAMPLES_PER_COL = 3; NUM_SAMPLES_PER_COL = 5;
NUM_SAMPLES_PER_ROW = 4; NUM_SAMPLES_PER_ROW = 4;
} }
else 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 ); setup_samplebank( NUM_SAMPLES_PER_COL, NUM_SAMPLES_PER_ROW );
//@ FIXME: to setup_defaults //@ FIXME: to setup_defaults
create_ref_slots( 16 ); create_ref_slots( 12 );
create_sequencer_slots( 10 ); create_sequencer_slots( 10 );
@@ -6994,6 +6993,10 @@ gboolean is_alive( void )
veejay_stop_connecting(gui); veejay_stop_connecting(gui);
multrack_audoadd( info->mt, remote, port ); multrack_audoadd( info->mt, remote, port );
info->watch.p_state = 0; info->watch.p_state = 0;
if(!user_preview)
multitrack_set_quality( info->mt, 2 );
if( user_preview ) if( user_preview )
{ {
multitrack_set_quality( info->mt, user_preview ); multitrack_set_quality( info->mt, user_preview );