Mercurial > audlegacy-plugins
changeset 1295:d2e508857ded
"Don't touch debug stuff !" commit. ;-)
| author | Stany HENRY <StrassBoy@gmail.com> |
|---|---|
| date | Thu, 19 Jul 2007 03:16:44 +0200 |
| parents | ea7c0a4fe793 |
| children | 052f9d36aede |
| files | src/amidi-plug/amidi-plug.c src/amidi-plug/backend-alsa/b-alsa.c src/amidi-plug/backend-fluidsynth/b-fluidsynth.c src/amidi-plug/i_backend.c src/amidi-plug/i_configure-fluidsynth.c src/amidi-plug/i_configure.c |
| diffstat | 6 files changed, 84 insertions(+), 84 deletions(-) [+] |
line wrap: on
line diff
--- a/src/amidi-plug/amidi-plug.c Thu Jul 19 00:51:28 2007 +0000 +++ b/src/amidi-plug/amidi-plug.c Thu Jul 19 03:16:44 2007 +0200 @@ -37,7 +37,7 @@ if ( !strncmp( magic_bytes , "MThd" , 4 ) ) { - DEBUGMSG( _("MIDI found, %s is a standard midi file\n") , filename_uri ); + DEBUGMSG( "MIDI found, %s is a standard midi file\n" , filename_uri ); return TRUE; } @@ -53,7 +53,7 @@ if ( !strncmp( magic_bytes , "RMID" , 4 ) ) { - DEBUGMSG( _("MIDI found, %s is a riff midi file\n") , filename_uri ); + DEBUGMSG( "MIDI found, %s is a riff midi file\n" , filename_uri ); return TRUE; } } @@ -88,7 +88,7 @@ static void amidiplug_init( void ) { g_log_set_handler(NULL , G_LOG_LEVEL_WARNING , g_log_default_handler , NULL); - DEBUGMSG( _("init, read configuration\n") ); + DEBUGMSG( "init, read configuration\n" ); /* read configuration for amidi-plug */ i_configure_cfg_ap_read(); amidiplug_playing_status = AMIDIPLUG_STOP; @@ -107,7 +107,7 @@ static void amidiplug_configure( void ) { /* display the nice config dialog */ - DEBUGMSG( _("opening config system\n") ); + DEBUGMSG( "opening config system\n" ); i_configure_gui(); } @@ -126,7 +126,7 @@ static void amidiplug_stop( InputPlayback * playback ) { - DEBUGMSG( _("STOP request at tick: %i\n") , midifile.playing_tick ); + DEBUGMSG( "STOP request at tick: %i\n" , midifile.playing_tick ); pthread_mutex_lock( &amidiplug_playing_mutex ); if (( amidiplug_playing_status == AMIDIPLUG_PLAY ) || ( amidiplug_playing_status == AMIDIPLUG_STOP )) @@ -136,17 +136,17 @@ pthread_join( amidiplug_play_thread , NULL ); if ( backend.autonomous_audio == FALSE ) pthread_join( amidiplug_audio_thread , NULL ); - DEBUGMSG( _("STOP activated (play thread joined)\n") ); + DEBUGMSG( "STOP activated (play thread joined)\n" ); } else if ( amidiplug_playing_status == AMIDIPLUG_PAUSE ) { amidiplug_playing_status = AMIDIPLUG_STOP; - DEBUGMSG( _("STOP activated (from PAUSE to STOP)\n") ); + DEBUGMSG( "STOP activated (from PAUSE to STOP)\n" ); pthread_mutex_unlock( &amidiplug_playing_mutex ); } else /* AMIDIPLUG_ERR */ { - DEBUGMSG( _("STOP activated (in error handling, ok)\n") ); + DEBUGMSG( "STOP activated (in error handling, ok)\n" ); pthread_mutex_unlock( &amidiplug_playing_mutex ); } @@ -162,7 +162,7 @@ /* close audio if current backend works with output plugin */ if (( backend.gmodule != NULL ) && ( backend.autonomous_audio == FALSE )) { - DEBUGMSG( _("STOP activated, closing audio output plugin\n") ); + DEBUGMSG( "STOP activated, closing audio output plugin\n" ); playback->output->buffer_free(); playback->output->buffer_free(); playback->output->close_audio(); @@ -176,7 +176,7 @@ { if ( paused ) { - DEBUGMSG( _("PAUSE request at tick: %i\n") , midifile.playing_tick ); + DEBUGMSG( "PAUSE request at tick: %i\n" , midifile.playing_tick ); pthread_mutex_lock( &amidiplug_playing_mutex ); /* this cond is used to avoid race conditions */ while ( amidiplug_playing_status != AMIDIPLUG_PLAY ) @@ -187,7 +187,7 @@ pthread_join( amidiplug_play_thread , NULL ); if ( backend.autonomous_audio == FALSE ) pthread_join( amidiplug_audio_thread , NULL ); - DEBUGMSG( _("PAUSE activated (play thread joined)\n") , midifile.playing_tick ); + DEBUGMSG( "PAUSE activated (play thread joined)\n" , midifile.playing_tick ); if ( backend.autonomous_audio == FALSE ) playback->output->pause(paused); @@ -197,7 +197,7 @@ } else { - DEBUGMSG( _("PAUSE deactivated, returning to tick %i\n") , midifile.playing_tick ); + DEBUGMSG( "PAUSE deactivated, returning to tick %i\n" , midifile.playing_tick ); /* revive the sequencer */ backend.seq_on(); /* re-set initial tempo */ @@ -211,7 +211,7 @@ pthread_mutex_lock( &amidiplug_playing_mutex ); /* play play play! */ - DEBUGMSG( _("PAUSE deactivated, starting play thread again\n") ); + DEBUGMSG( "PAUSE deactivated, starting play thread again\n" ); pthread_create(&amidiplug_play_thread, NULL, amidiplug_play_loop, playback); /* this cond is used to avoid race conditions */ while ( amidiplug_playing_status != AMIDIPLUG_PLAY ) @@ -223,7 +223,7 @@ static void amidiplug_seek( InputPlayback * playback, gint time ) { - DEBUGMSG( _("SEEK requested (time %i), pausing song...\n") , time ); + DEBUGMSG( "SEEK requested (time %i), pausing song...\n" , time ); pthread_mutex_lock( &amidiplug_playing_mutex ); /* this cond is used to avoid race conditions */ while ( amidiplug_playing_status != AMIDIPLUG_PLAY ) @@ -234,7 +234,7 @@ pthread_join( amidiplug_play_thread , NULL ); if ( backend.autonomous_audio == FALSE ) pthread_join( amidiplug_audio_thread , NULL ); - DEBUGMSG( _("SEEK requested (time %i), song paused\n") , time ); + DEBUGMSG( "SEEK requested (time %i), song paused\n" , time ); /* kill the sequencer */ backend.seq_off(); /* revive the sequencer */ @@ -243,7 +243,7 @@ i_midi_setget_tempo( &midifile ); backend.seq_queue_tempo( midifile.current_tempo , midifile.ppq ); /* get back to the previous state */ - DEBUGMSG( _("SEEK requested (time %i), moving to tick %i of %i\n") , + DEBUGMSG( "SEEK requested (time %i), moving to tick %i of %i\n" , time , (gint)((time * 1000000) / midifile.avg_microsec_per_tick) , midifile.max_tick ); midifile.playing_tick = (gint)((time * 1000000) / midifile.avg_microsec_per_tick); amidiplug_skipto( midifile.playing_tick ); @@ -252,7 +252,7 @@ playback->output->flush(time * 1000); /* play play play! */ - DEBUGMSG( _("SEEK done, starting play thread again\n") ); + DEBUGMSG( "SEEK done, starting play thread again\n" ); pthread_create(&amidiplug_play_thread, NULL, amidiplug_play_loop, playback); } @@ -272,13 +272,13 @@ else if ( amidiplug_playing_status == AMIDIPLUG_STOP ) { pthread_mutex_unlock( &amidiplug_playing_mutex ); - DEBUGMSG( _("GETTIME on stopped song, returning -1\n") , time ); + DEBUGMSG( "GETTIME on stopped song, returning -1\n" , time ); return -1; } else /* AMIDIPLUG_ERR */ { pthread_mutex_unlock( &amidiplug_playing_mutex ); - DEBUGMSG( _("GETTIME on halted song (an error occurred?), returning -1 and stopping the player\n") ); + DEBUGMSG( "GETTIME on halted song (an error occurred?), returning -1 and stopping the player\n" ); audacious_drct_stop(); return -1; } @@ -299,13 +299,13 @@ else if ( amidiplug_playing_status == AMIDIPLUG_STOP ) { pthread_mutex_unlock( &amidiplug_playing_mutex ); - DEBUGMSG( _("GETTIME on stopped song, returning -1\n") , time ); + DEBUGMSG( "GETTIME on stopped song, returning -1\n" , time ); return -1; } else /* AMIDIPLUG_ERR */ { pthread_mutex_unlock( &amidiplug_playing_mutex ); - DEBUGMSG( _("GETTIME on halted song (an error occurred?), returning -1 and stopping the player\n") , time ); + DEBUGMSG( "GETTIME on halted song (an error occurred?), returning -1 and stopping the player\n" , time ); audacious_drct_stop(); return -1; } @@ -375,7 +375,7 @@ if ( backend.gmodule == NULL ) { - g_warning( _("No sequencer backend selected\n") ); + g_warning( "No sequencer backend selected\n" ); i_message_gui( _("AMIDI-Plug - warning") , _("No sequencer backend has been selected!\nPlease configure AMIDI-Plug before playing.") , AMIDIPLUG_MESSAGE_WARN , NULL , TRUE ); @@ -385,16 +385,16 @@ /* get information about audio from backend, if available */ backend.audio_info_get( &au_channels , &au_bitdepth , &au_samplerate ); - DEBUGMSG( _("PLAY requested, audio details: channels -> %i , bitdepth -> %i , samplerate -> %i\n") , + DEBUGMSG( "PLAY requested, audio details: channels -> %i , bitdepth -> %i , samplerate -> %i\n" , au_channels , au_bitdepth , au_samplerate ); if ( backend.autonomous_audio == FALSE ) { - DEBUGMSG( _("PLAY requested, opening audio output plugin\n") ); + DEBUGMSG( "PLAY requested, opening audio output plugin\n" ); playback->output->open_audio( FMT_S16_NE , au_samplerate , au_channels ); } - DEBUGMSG( _("PLAY requested, midifile init\n") ); + DEBUGMSG( "PLAY requested, midifile init\n" ); /* midifile init */ i_midi_init( &midifile ); @@ -402,16 +402,16 @@ port_count = backend.seq_get_port_count(); if ( port_count < 1 ) { - g_warning( _("No ports selected\n") ); + g_warning( "No ports selected\n" ); amidiplug_playing_status = AMIDIPLUG_ERR; return; } - DEBUGMSG( _("PLAY requested, opening file: %s\n") , filename_uri ); + DEBUGMSG( "PLAY requested, opening file: %s\n" , filename_uri ); midifile.file_pointer = VFS_FOPEN( filename_uri , "rb" ); if (!midifile.file_pointer) { - g_warning( _("Cannot open %s\n") , filename_uri ); + g_warning( "Cannot open %s\n" , filename_uri ); amidiplug_playing_status = AMIDIPLUG_ERR; return; } @@ -421,49 +421,49 @@ { case MAKE_ID('R', 'I', 'F', 'F'): { - DEBUGMSG( _("PLAY requested, RIFF chunk found, processing...\n") ); + DEBUGMSG( "PLAY requested, RIFF chunk found, processing...\n" ); /* read riff chunk */ if ( !i_midi_file_parse_riff( &midifile ) ) - WARNANDBREAKANDPLAYERR( _("%s: invalid file format (riff parser)\n") , filename_uri ); + WARNANDBREAKANDPLAYERR( "%s: invalid file format (riff parser)\n" , filename_uri ); /* if that was read correctly, go ahead and read smf data */ } case MAKE_ID('M', 'T', 'h', 'd'): { - DEBUGMSG( _("PLAY requested, MThd chunk found, processing...\n") ); + DEBUGMSG( "PLAY requested, MThd chunk found, processing...\n" ); if ( !i_midi_file_parse_smf( &midifile , port_count ) ) - WARNANDBREAKANDPLAYERR( _("%s: invalid file format (smf parser)\n") , filename_uri ); + WARNANDBREAKANDPLAYERR( "%s: invalid file format (smf parser)\n" , filename_uri ); if ( midifile.time_division < 1 ) - WARNANDBREAKANDPLAYERR( _("%s: invalid time division (%i)\n") , filename_uri , midifile.time_division ); + WARNANDBREAKANDPLAYERR( "%s: invalid time division (%i)\n" , filename_uri , midifile.time_division ); - DEBUGMSG( _("PLAY requested, setting ppq and tempo...\n") ); + DEBUGMSG( "PLAY requested, setting ppq and tempo...\n" ); /* fill midifile.ppq and midifile.tempo using time_division */ if ( !i_midi_setget_tempo( &midifile ) ) - WARNANDBREAKANDPLAYERR( _("%s: invalid values while setting ppq and tempo\n") , filename_uri ); + WARNANDBREAKANDPLAYERR( "%s: invalid values while setting ppq and tempo\n" , filename_uri ); - DEBUGMSG( _("PLAY requested, sequencer start\n") ); + DEBUGMSG( "PLAY requested, sequencer start\n" ); /* sequencer start */ if ( !backend.seq_start( filename_uri ) ) - WARNANDBREAKANDPLAYERR( _("%s: problem with seq_start, play aborted\n") , filename_uri ); + WARNANDBREAKANDPLAYERR( "%s: problem with seq_start, play aborted\n" , filename_uri ); - DEBUGMSG( _("PLAY requested, sequencer on\n") ); + DEBUGMSG( "PLAY requested, sequencer on\n" ); /* sequencer on */ if ( !backend.seq_on() ) - WARNANDBREAKANDPLAYERR( _("%s: problem with seq_on, play aborted\n") , filename_uri ); + WARNANDBREAKANDPLAYERR( "%s: problem with seq_on, play aborted\n" , filename_uri ); - DEBUGMSG( _("PLAY requested, setting sequencer queue tempo...\n") ); + DEBUGMSG( "PLAY requested, setting sequencer queue tempo...\n" ); /* set sequencer queue tempo using ppq and tempo (call only after i_midi_setget_tempo) */ if ( !backend.seq_queue_tempo( midifile.current_tempo , midifile.ppq ) ) { backend.seq_off(); /* kill the sequencer */ - WARNANDBREAKANDPLAYERR( _("%s: ALSA queue problem, play aborted\n") , filename_uri ); + WARNANDBREAKANDPLAYERR( "%s: ALSA queue problem, play aborted\n" , filename_uri ); } /* fill midifile.length, keeping in count tempo-changes */ i_midi_setget_length( &midifile ); - DEBUGMSG( _("PLAY requested, song length calculated: %i msec\n") , (gint)(midifile.length / 1000) ); + DEBUGMSG( "PLAY requested, song length calculated: %i msec\n" , (gint)(midifile.length / 1000) ); /* our length is in microseconds, but the player wants milliseconds */ @@ -476,7 +476,7 @@ g_free( filename ); /* play play play! */ - DEBUGMSG( _("PLAY requested, starting play thread\n") ); + DEBUGMSG( "PLAY requested, starting play thread\n" ); amidiplug_playing_status = AMIDIPLUG_PLAY; pthread_create(&amidiplug_play_thread, NULL, amidiplug_play_loop, playback); break; @@ -485,7 +485,7 @@ default: { amidiplug_playing_status = AMIDIPLUG_ERR; - g_warning( _("%s is not a Standard MIDI File\n") , filename_uri ); + g_warning( "%s is not a Standard MIDI File\n" , filename_uri ); break; } } @@ -504,12 +504,12 @@ pthread_mutex_lock( &amidiplug_playing_mutex ); if ( amidiplug_playing_status != AMIDIPLUG_PAUSE ) { - DEBUGMSG( _("PLAY thread, rewind tracks to their first event\n") ); + DEBUGMSG( "PLAY thread, rewind tracks to their first event\n" ); rewind = TRUE; } else { - DEBUGMSG( _("PLAY thread, do not rewind tracks to their first event (coming from a PAUSE status)\n") ); + DEBUGMSG( "PLAY thread, do not rewind tracks to their first event (coming from a PAUSE status)\n" ); amidiplug_playing_status = AMIDIPLUG_PLAY; pthread_cond_signal( &amidiplug_playing_cond ); } @@ -531,7 +531,7 @@ /* common settings for all our events */ backend.seq_event_init(); - DEBUGMSG( _("PLAY thread, start the play loop\n") ); + DEBUGMSG( "PLAY thread, start the play loop\n" ); for (;;) { midievent_t * event = NULL; @@ -555,7 +555,7 @@ pthread_mutex_lock( &amidiplug_playing_mutex ); if ( amidiplug_playing_status != AMIDIPLUG_PLAY ) { - DEBUGMSG( _("PLAY thread, PAUSE or STOP requested, exiting from play loop\n") ); + DEBUGMSG( "PLAY thread, PAUSE or STOP requested, exiting from play loop\n" ); event = NULL; } pthread_mutex_unlock( &amidiplug_playing_mutex ); @@ -597,7 +597,7 @@ break; case SND_SEQ_EVENT_TEMPO: backend.seq_event_tempo( event ); - DEBUGMSG( _("PLAY thread, processing tempo event with value %i on tick %i\n") , + DEBUGMSG( "PLAY thread, processing tempo event with value %i on tick %i\n" , event->data.tempo , event->tick ); pthread_mutex_lock(&amidiplug_gettime_mutex); midifile.current_tempo = event->data.tempo; @@ -610,7 +610,7 @@ /* do nothing */ break; default: - DEBUGMSG( _("PLAY thread, encountered invalid event type %i\n") , event->type ); + DEBUGMSG( "PLAY thread, encountered invalid event type %i\n" , event->type ); break; } @@ -631,7 +631,7 @@ if ( amidiplug_playing_status != AMIDIPLUG_PAUSE ) { amidiplug_playing_status = AMIDIPLUG_STOP; - DEBUGMSG( _("PLAY thread, song stopped/ended\n") ); + DEBUGMSG( "PLAY thread, song stopped/ended\n" ); } pthread_mutex_unlock( &amidiplug_playing_mutex ); @@ -659,7 +659,7 @@ backend.seq_event_init(); backend.seq_queue_start(); - DEBUGMSG( _("SKIPTO request, starting skipto loop\n") ); + DEBUGMSG( "SKIPTO request, starting skipto loop\n" ); for (;;) { midievent_t * event = NULL; @@ -682,14 +682,14 @@ /* unlikely here... unless very strange MIDI files are played :) */ if (!event) { - DEBUGMSG( _("SKIPTO request, reached the last event but not the requested tick (!)\n") ); + DEBUGMSG( "SKIPTO request, reached the last event but not the requested tick (!)\n" ); break; /* end of song reached */ } /* reached the requested tick, job done */ if ( event->tick >= playing_tick ) { - DEBUGMSG( _("SKIPTO request, reached the requested tick, exiting from skipto loop\n") ); + DEBUGMSG( "SKIPTO request, reached the requested tick, exiting from skipto loop\n" ); break; }
--- a/src/amidi-plug/backend-alsa/b-alsa.c Thu Jul 19 00:51:28 2007 +0000 +++ b/src/amidi-plug/backend-alsa/b-alsa.c Thu Jul 19 03:16:44 2007 +0200 @@ -164,7 +164,7 @@ if ( snd_seq_set_queue_tempo( sc.seq , sc.queue , sc.queue_tempo ) < 0 ) { - g_warning( _("Cannot set queue tempo (%u/%i)\n"), + g_warning( "Cannot set queue tempo (%u/%i)\n", snd_seq_queue_tempo_get_tempo(sc.queue_tempo), snd_seq_queue_tempo_get_ppq(sc.queue_tempo) ); return 0; @@ -373,14 +373,14 @@ snd_mixer_selem_get_playback_volume( mixer_elem , SND_MIXER_SCHN_FRONT_LEFT , &lc ); /* convert the range to 0-100 (for the case that pv_range is not 0-100 already) */ *left_volume = (gint)(((lc - pv_min) * 100) / pv_range); - DEBUGMSG( _("GET VOLUME requested, get left channel (%i)\n") , *left_volume ); + DEBUGMSG( "GET VOLUME requested, get left channel (%i)\n" , *left_volume ); } if ( snd_mixer_selem_has_playback_channel( mixer_elem , SND_MIXER_SCHN_FRONT_RIGHT ) ) { snd_mixer_selem_get_playback_volume( mixer_elem , SND_MIXER_SCHN_FRONT_RIGHT , &rc ); /* convert the range to 0-100 (for the case that pv_range is not 0-100 already) */ *right_volume = (gint)(((rc - pv_min) * 100) / pv_range); - DEBUGMSG( _("GET VOLUME requested, get right channel (%i)\n") , *right_volume ); + DEBUGMSG( "GET VOLUME requested, get right channel (%i)\n" , *right_volume ); } } } @@ -418,13 +418,13 @@ { if ( snd_mixer_selem_has_playback_channel( mixer_elem , SND_MIXER_SCHN_FRONT_LEFT ) ) { - DEBUGMSG( _("SET VOLUME requested, setting left channel to %i%%\n") , left_volume ); + DEBUGMSG( "SET VOLUME requested, setting left channel to %i%%\n" , left_volume ); snd_mixer_selem_set_playback_volume( mixer_elem , SND_MIXER_SCHN_FRONT_LEFT , (gint)((gdouble)(0.01 * (gdouble)(left_volume * pv_range)) + pv_min) ); } if ( snd_mixer_selem_has_playback_channel( mixer_elem , SND_MIXER_SCHN_FRONT_RIGHT ) ) { - DEBUGMSG( _("SET VOLUME requested, setting right channel to %i%%\n") , right_volume ); + DEBUGMSG( "SET VOLUME requested, setting right channel to %i%%\n" , right_volume ); snd_mixer_selem_set_playback_volume( mixer_elem , SND_MIXER_SCHN_FRONT_RIGHT , (gint)((gdouble)(0.01 * (gdouble)(right_volume * pv_range)) + pv_min) ); } @@ -803,7 +803,7 @@ /* remove lf and cr from the end of the string */ g_strdelimit( &buffer[11] , "\r\n" , '\0' ); /* ready to go */ - DEBUGMSG( _("init, default values for seq ports detected: %s\n") , &buffer[11] ); + DEBUGMSG( "init, default values for seq ports detected: %s\n" , &buffer[11] ); fclose( fp ); return g_strdup( &buffer[11] ); }
--- a/src/amidi-plug/backend-fluidsynth/b-fluidsynth.c Thu Jul 19 00:51:28 2007 +0000 +++ b/src/amidi-plug/backend-fluidsynth/b-fluidsynth.c Thu Jul 19 03:16:44 2007 +0200 @@ -360,15 +360,15 @@ while ( sffiles[i] != NULL ) { gint sf_id = 0; - DEBUGMSG( _("loading soundfont %s\n") , sffiles[i] ); + DEBUGMSG( "loading soundfont %s\n" , sffiles[i] ); sf_id = fluid_synth_sfload( sc.synth , sffiles[i] , 0 ); if ( sf_id == -1 ) { - g_warning( _("unable to load SoundFont file %s\n") , sffiles[i] ); + g_warning( "unable to load SoundFont file %s\n" , sffiles[i] ); } else { - DEBUGMSG( _("soundfont %s successfully loaded\n") , sffiles[i] ); + DEBUGMSG( "soundfont %s successfully loaded\n" , sffiles[i] ); g_array_append_val( sc.soundfont_ids , sf_id ); } i++; @@ -377,7 +377,7 @@ } else { - g_warning( _("FluidSynth backend was selected, but no SoundFont has been specified\n") ); + g_warning( "FluidSynth backend was selected, but no SoundFont has been specified\n" ); } }
--- a/src/amidi-plug/i_backend.c Thu Jul 19 00:51:28 2007 +0000 +++ b/src/amidi-plug/i_backend.c Thu Jul 19 03:16:44 2007 +0200 @@ -51,7 +51,7 @@ /* seems to be a backend for amidi-plug , try to load it */ module = g_module_open( module_pathfilename , G_MODULE_BIND_LOCAL ); if ( module == NULL ) - g_warning( _("Error loading module %s - %s\n") , module_pathfilename , g_module_error() ); + g_warning( "Error loading module %s - %s\n" , module_pathfilename , g_module_error() ); else { /* try to get the module name */ @@ -62,14 +62,14 @@ /* name and desc dinamically allocated */ getapmoduleinfo( &mn->name , &mn->longname , &mn->desc , &mn->ppos ); mn->filename = g_strdup(module_pathfilename); /* dinamically allocated */ - DEBUGMSG( _("Backend found and added in list, filename: %s and lname: %s\n") , + DEBUGMSG( "Backend found and added in list, filename: %s and lname: %s\n" , mn->filename, mn->longname ); backend_list = g_slist_append( backend_list , mn ); } else { /* module name not found, this is not a backend for amidi-plug */ - g_warning( _("File %s is not a backend for amidi-plug!\n") , module_pathfilename ); + g_warning( "File %s is not a backend for amidi-plug!\n" , module_pathfilename ); } g_module_close( module ); } @@ -79,7 +79,7 @@ g_dir_close( backend_directory ); } else - g_warning( _("Unable to open the backend directory %s\n") , AMIDIPLUGBACKENDDIR ); + g_warning( "Unable to open the backend directory %s\n" , AMIDIPLUGBACKENDDIR ); return backend_list; } @@ -104,7 +104,7 @@ gint i_backend_load( gchar * module_name ) { gchar * module_pathfilename = g_strjoin( "" , AMIDIPLUGBACKENDDIR , "/ap-" , module_name , ".so" , NULL ); - DEBUGMSG( _("loading backend '%s'\n") , module_pathfilename ); + DEBUGMSG( "loading backend '%s'\n" , module_pathfilename ); backend.gmodule = g_module_open( module_pathfilename , 0 ); if ( backend.gmodule != NULL ) @@ -140,7 +140,7 @@ g_module_symbol( backend.gmodule , "audio_check_autonomous" , (gpointer*)&checkautonomousaudio ); getapmoduleinfo( &backend.name , NULL , NULL , NULL ); backend.autonomous_audio = checkautonomousaudio(); - DEBUGMSG( _("backend %s (name '%s') successfully loaded\n") , module_pathfilename , backend.name ); + DEBUGMSG( "backend %s (name '%s') successfully loaded\n" , module_pathfilename , backend.name ); backend.init( i_configure_cfg_get_file ); g_free( module_pathfilename ); return 1; @@ -148,7 +148,7 @@ else { backend.name = NULL; - g_warning( _("unable to load backend '%s'\n") , module_pathfilename ); + g_warning( "unable to load backend '%s'\n" , module_pathfilename ); g_free( module_pathfilename ); return 0; } @@ -159,17 +159,17 @@ { if ( backend.gmodule != NULL ) { - DEBUGMSG( _("unloading backend '%s'\n") , backend.name ); + DEBUGMSG( "unloading backend '%s'\n" , backend.name ); backend.cleanup(); g_module_close( backend.gmodule ); - DEBUGMSG( _("backend '%s' unloaded\n") , backend.name ); + DEBUGMSG( "backend '%s' unloaded\n" , backend.name ); g_free( backend.name ); backend.gmodule = NULL; return 1; } else { - g_warning( _("attempting to unload backend, but no backend is loaded\n") ); + g_warning( "attempting to unload backend, but no backend is loaded\n" ); return 0; } }
--- a/src/amidi-plug/i_configure-fluidsynth.c Thu Jul 19 00:51:28 2007 +0000 +++ b/src/amidi-plug/i_configure-fluidsynth.c Thu Jul 19 03:16:44 2007 +0200 @@ -650,13 +650,13 @@ gtk_container_set_border_width( GTK_CONTAINER(synth_samplerate_vbox), 6 ); gtk_container_add( GTK_CONTAINER(synth_samplerate_frame) , synth_samplerate_vbox ); gtk_box_pack_start( GTK_BOX(synth_rightcol_vbox) , synth_samplerate_frame , FALSE , FALSE , 0 ); - synth_samplerate_option[0] = gtk_radio_button_new_with_label( NULL , "22050 Hz " ); + synth_samplerate_option[0] = gtk_radio_button_new_with_label( NULL , _("22050 Hz ") ); g_object_set_data( G_OBJECT(synth_samplerate_option[0]) , "val" , GINT_TO_POINTER(22050) ); synth_samplerate_option[1] = gtk_radio_button_new_with_label_from_widget( - GTK_RADIO_BUTTON(synth_samplerate_option[0]) , "44100 Hz " ); + GTK_RADIO_BUTTON(synth_samplerate_option[0]) , _("44100 Hz ") ); g_object_set_data( G_OBJECT(synth_samplerate_option[1]) , "val" , GINT_TO_POINTER(44100) ); synth_samplerate_option[2] = gtk_radio_button_new_with_label_from_widget( - GTK_RADIO_BUTTON(synth_samplerate_option[0]) , "96000 Hz " ); + GTK_RADIO_BUTTON(synth_samplerate_option[0]) , _("96000 Hz ") ); g_object_set_data( G_OBJECT(synth_samplerate_option[2]) , "val" , GINT_TO_POINTER(96000) ); synth_samplerate_option[3] = gtk_radio_button_new_with_label_from_widget( GTK_RADIO_BUTTON(synth_samplerate_option[0]) , _("custom ") ); @@ -668,7 +668,7 @@ g_object_set_data( G_OBJECT(synth_samplerate_option[3]) , "customentry" , synth_samplerate_optionentry ); g_signal_connect( G_OBJECT(synth_samplerate_option[3]) , "toggled" , G_CALLBACK(i_configure_ev_sysamplerate_togglecustom) , synth_samplerate_optionentry ); - synth_samplerate_optionlabel = gtk_label_new( "Hz " ); + synth_samplerate_optionlabel = gtk_label_new( _("Hz ") ); gtk_box_pack_start( GTK_BOX(synth_samplerate_optionhbox) , synth_samplerate_optionentry , TRUE , TRUE , 0 ); gtk_box_pack_start( GTK_BOX(synth_samplerate_optionhbox) , synth_samplerate_optionlabel , FALSE , FALSE , 0 ); switch ( fsyncfg->fsyn_synth_samplerate )
--- a/src/amidi-plug/i_configure.c Thu Jul 19 00:51:28 2007 +0000 +++ b/src/amidi-plug/i_configure.c Thu Jul 19 03:16:44 2007 +0200 @@ -83,7 +83,7 @@ { gchar *filename = gtk_file_chooser_get_filename( GTK_FILE_CHOOSER(browse_dialog) ); gtk_entry_set_text( GTK_ENTRY(target_entry) , filename ); - DEBUGMSG( _("selected file: %s\n") , filename ); + DEBUGMSG( "selected file: %s\n" , filename ); g_free( filename ); } gtk_widget_destroy( browse_dialog ); @@ -109,7 +109,7 @@ if ( configwin != NULL ) { - DEBUGMSG( _("config window is already open!\n") ); + DEBUGMSG( "config window is already open!\n" ); return; } @@ -255,15 +255,15 @@ void i_configure_ev_bok( GtkWidget * button_ok , gpointer configwin ) { - DEBUGMSG( _("saving configuration...\n") ); + DEBUGMSG( "saving configuration...\n" ); i_configure_cfg_ap_save(); /* save amidiplug settings */ i_configure_cfg_backend_save(); /* save backend settings */ - DEBUGMSG( _("configuration saved\n") ); + DEBUGMSG( "configuration saved\n" ); /* check if a different backend has been selected */ if (( backend.name == NULL ) || ( strcmp( amidiplug_cfg_ap.ap_seq_backend , backend.name ) )) { - DEBUGMSG( _("a new backend has been selected, unloading previous and loading the new one\n") ); + DEBUGMSG( "a new backend has been selected, unloading previous and loading the new one\n" ); i_backend_unload(); /* unload previous backend */ i_backend_load( amidiplug_cfg_ap.ap_seq_backend ); /* load new backend */ } @@ -271,7 +271,7 @@ { if ( backend.gmodule != NULL ) { - DEBUGMSG( _("the selected backend is already loaded, so just perform backend cleanup and reinit\n") ); + DEBUGMSG( "the selected backend is already loaded, so just perform backend cleanup and reinit\n" ); backend.cleanup(); backend.init( i_configure_cfg_get_file ); }