diff --git a/configure b/configure index 7b6a177..a2f6aa0 100755 --- a/configure +++ b/configure @@ -11284,7 +11284,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - . conftest.id3 + . ./conftest.id3 echo "${ID3LIB_MAJOR}.${ID3LIB_MINOR}.${ID3LIB_PATCH}" else echo "$as_me: program exited with status $ac_status" >&5 diff --git a/configure.in b/configure.in index 39c4d8c..b2dc32b 100644 --- a/configure.in +++ b/configure.in @@ -110,7 +110,7 @@ main () fclose(output); exit(0); } -], . conftest.id3 +], . ./conftest.id3 echo "${ID3LIB_MAJOR}.${ID3LIB_MINOR}.${ID3LIB_PATCH}", AC_MSG_WARN(could not determine id3lib version),[echo $ac_n "cross compiling; assuming ${ID3LIB_MAJOR}.${ID3LIB_MINOR}.${ID3LIB_PATCH} $ac_c"]) AC_DEFINE_UNQUOTED(ID3LIB_MAJOR, $ID3LIB_MAJOR, [Description]) diff --git a/po/grip-2.2.pot b/po/grip-2.2.pot index f86bada..75dd0f6 100644 --- a/po/grip-2.2.pot +++ b/po/grip-2.2.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-03 22:20-0800\n" +"POT-Creation-Date: 2015-08-31 20:10-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/src/cddev.c b/src/cddev.c index 266f863..f79d159 100644 --- a/src/cddev.c +++ b/src/cddev.c @@ -854,7 +854,7 @@ GVolume *GripGetVolumeByPath(gchar *device_name) // Cleanup list = g_list_first(list); - g_list_foreach(list, g_object_unref, NULL); + g_list_foreach(list, (GFunc)g_object_unref, NULL); g_list_free(list); } diff --git a/src/cdpar.c b/src/cdpar.c index a9647b0..0a1b550 100644 --- a/src/cdpar.c +++ b/src/cdpar.c @@ -107,12 +107,10 @@ static void WriteWav(int f,long bytes) static void CDPCallback(long inpos,int function) { - static long c_sector=0,v_sector=0; - static int last=0; + static long c_sector=0; static long lasttime=0; long sector,osector=0; struct timeval thistime; - static char heartbeat=' '; static int overlap=0; static int slevel=0; static int slast=0; @@ -123,15 +121,11 @@ static void CDPCallback(long inpos,int function) sector=inpos/CD_FRAMEWORDS; if(function==-2){ - v_sector=sector; return; } if(function==-1){ - last=8; - heartbeat='*'; slevel=0; - v_sector=sector; } else switch(function){ case PARANOIA_CB_VERIFY: @@ -184,30 +178,8 @@ static void CDPCallback(long inpos,int function) if(lasttime!=test || function==-1 || slast!=slevel){ if(lasttime!=test || function==-1){ - last++; lasttime=test; - if(last>7)last=0; stimeout++; - switch(last){ - case 0: - heartbeat=' '; - break; - case 1:case 7: - heartbeat='.'; - break; - case 2:case 6: - heartbeat='o'; - break; - case 3:case 5: - heartbeat='0'; - break; - case 4: - heartbeat='O'; - break; - } - - if(function==-1) - heartbeat='*'; } if(slast!=slevel){ diff --git a/src/cdplay.c b/src/cdplay.c index 65c40a4..c8f65ad 100644 --- a/src/cdplay.c +++ b/src/cdplay.c @@ -29,6 +29,7 @@ #include "discedit.h" #include "dialog.h" #include "rip.h" +#include "tray.h" #include "grip_id3.h" static void ShutDownCB(GtkWidget *widget,gpointer data); @@ -145,21 +146,16 @@ void LookupDisc(GripInfo *ginfo,gboolean manual) static void DoLookup(void *data) { GripInfo *ginfo; - gboolean discdb_found=FALSE; ginfo=(GripInfo *)data; if(!DiscDBLookupDisc(ginfo,&(ginfo->dbserver))) { if(*(ginfo->dbserver2.name)) { if(DiscDBLookupDisc(ginfo,&(ginfo->dbserver2))) { - discdb_found=TRUE; ginfo->ask_submit=TRUE; } } } - else { - discdb_found=TRUE; - } if(ginfo->ddata.data_id3genre==-1) ginfo->ddata.data_id3genre=DiscDB2ID3(ginfo->ddata.data_genre); @@ -597,10 +593,8 @@ static void SelectionChanged(GtkTreeSelection *selection,gpointer data) GtkTreeModel *model; int row=-1; GripInfo *ginfo; - GripGUI *uinfo; ginfo=(GripInfo *)data; - uinfo=&(ginfo->gui_info); if(gtk_tree_selection_get_selected(selection,&model,&iter)) { gtk_tree_model_get(model,&iter,TRACKLIST_NUM_COL,&row,-1); diff --git a/src/discdb.c b/src/discdb.c index 2be0d6f..1fe5250 100644 --- a/src/discdb.c +++ b/src/discdb.c @@ -45,10 +45,10 @@ #include "config.h" extern char *Program; -static char *StrConvertEncoding(char *str,char *from,char *to,int max_len); +static char *StrConvertEncoding(char *str,const char *from,const char *to,int max_len); gboolean DiscDBUTF8Validate(const DiscInfo *disc,const DiscData *data); static void DiscDBConvertEncoding(DiscInfo *disc,DiscData *data, - char *from,char *to); + const char *from,const char *to); static int DiscDBSum(int val); static char *DiscDBReadLine(char **dataptr); static GString *DiscDBMakeURI(DiscDBServer *server,DiscDBHello *hello, @@ -496,7 +496,7 @@ static void DiscDBProcessLine(char *inbuffer,DiscData *data, } } -static char *StrConvertEncoding(char *str,char *from,char *to,int max_len) +static char *StrConvertEncoding(char *str,const char *from,const char *to,int max_len) { char *conv_str; gsize rb,wb; @@ -541,7 +541,7 @@ gboolean DiscDBUTF8Validate(const DiscInfo *disc,const DiscData *data) static void DiscDBConvertEncoding(DiscInfo *disc,DiscData *data, - char *from,char *to) + const char *from,const char *to) { int track; diff --git a/src/grip.c b/src/grip.c index 629bb1f..8d6fe51 100644 --- a/src/grip.c +++ b/src/grip.c @@ -638,7 +638,7 @@ static void Homepage(void) // Open link in browser. // Plug link into '%s'. cmd = (gchar *)malloc(sizeof(gchar)*(strlen(browser)+strlen(link))); - int x = sprintf(cmd, browser, link); + sprintf(cmd, browser, link); system(cmd); } diff --git a/src/gripcfg.c b/src/gripcfg.c index ee75104..da9fb6b 100644 --- a/src/gripcfg.c +++ b/src/gripcfg.c @@ -63,13 +63,6 @@ static MP3Encoder encoder_defaults[]={{"bladeenc","-%b -QUIT %w %m","mp3"}, {"",""} }; -static CFGEntry encoder_cfg_entries[]={ - {"name",CFG_ENTRY_STRING,256,NULL}, - {"cmdline",CFG_ENTRY_STRING,256,NULL}, - {"exe",CFG_ENTRY_STRING,256,NULL}, - {"extension",CFG_ENTRY_STRING,10,NULL} -}; - static void UseProxyChanged(GtkWidget *widget,gpointer data) { GripInfo *ginfo; @@ -804,7 +797,7 @@ gboolean LoadRipperConfig(GripInfo *ginfo,int ripcfg) }; #ifdef CDPAR - if(ripcfg==0) return; + if(ripcfg==0) return 0; #endif sprintf(buf,"%s/%s-%s",getenv("HOME"),ginfo->config_filename, diff --git a/src/launch.c b/src/launch.c index b60d394..eb497b3 100644 --- a/src/launch.c +++ b/src/launch.c @@ -204,7 +204,7 @@ char *MungeString(char *str,StrTransPrefs *prefs) utf8_char[utf8_char_len]='\0'; filename_char=g_filename_from_utf8(utf8_char,-1,&rb,&wb,NULL); g_free(filename_char); - if (!filename_char || !prefs->allow_high_bits && *c >> 7) { + if (!filename_char || (!prefs->allow_high_bits && *c >> 7)) { if (prefs->escape) { g_snprintf(escape,11,"(%x)",*c); dst=ReallocStrcat(dst,escape); @@ -283,14 +283,11 @@ void TranslateAndLaunch(char *cmd,char *(*trans_func)(char,void *,gboolean *), StrTransPrefs *prefs,void (*close_func)(void *), void *close_user_data) { - GString *str; GString *args[100]; char *char_args[21]; int pid; int arg; - str=g_string_new(NULL); - MakeTranslatedArgs(cmd,args,100,trans_func,user_data,do_munge_default,prefs); /* diff --git a/src/main.c b/src/main.c index 3629b07..6fe3a25 100644 --- a/src/main.c +++ b/src/main.c @@ -140,7 +140,7 @@ void Debug(char *fmt,...) msg=g_strdup_vprintf(fmt,args); if(msg) { - g_printerr(msg); + g_printerr("%s", msg); g_free(msg); } } diff --git a/src/tray.c b/src/tray.c index 49e802d..521bd73 100644 --- a/src/tray.c +++ b/src/tray.c @@ -22,6 +22,8 @@ #include "tray.h" #include "common.h" +#include "cdplay.h" +#include "rip.h" #include "../pixmaps/rip1.xpm" #include "../pixmaps/menuplay.xpm" #include "../pixmaps/menupause.xpm" @@ -82,8 +84,8 @@ void UpdateTray(GripInfo *ginfo) } else if (!ginfo->playing) { if (ginfo->ripping || ginfo->encoding) { TrayGrayMenu(ginfo); - riptext = (ginfo->ripping) ? g_strdup_printf(_("Ripping Track %02d:\t%6.2f%% (%6.2f%% )"), ginfo->rip_track + 1, ginfo->rip_percent * 100, ginfo->rip_tot_percent * 100) : g_strdup_printf(""); - enctext = (ginfo->encoding) ? g_strdup_printf(_("Encoding Track %02d:\t%6.2f%% (%6.2f%% )"), ginfo->mp3_enc_track[0] + 1, ginfo->enc_percent * 100, ginfo->enc_tot_percent * 100) : g_strdup_printf(""); + riptext = (ginfo->ripping) ? g_strdup_printf(_("Ripping Track %02d:\t%6.2f%% (%6.2f%% )"), ginfo->rip_track + 1, ginfo->rip_percent * 100, ginfo->rip_tot_percent * 100) : g_strdup(""); + enctext = (ginfo->encoding) ? g_strdup_printf(_("Encoding Track %02d:\t%6.2f%% (%6.2f%% )"), ginfo->mp3_enc_track[0] + 1, ginfo->enc_percent * 100, ginfo->enc_tot_percent * 100) : g_strdup(""); text = g_strdup_printf(_("%s - %s\n%s%s%s"), artist, title, riptext, (ginfo->ripping && ginfo->encoding) ? "\n" : "", enctext); } else { TrayUnGrayMenu(ginfo); @@ -129,7 +131,7 @@ void TrayMenuShowPause(GripInfo *ginfo) static void ToggleMenuItemSensitive(GtkWidget *widget, gpointer data) { - gtk_widget_set_sensitive(GTK_WIDGET(widget), (gboolean)data); + gtk_widget_set_sensitive(GTK_WIDGET(widget), (data != NULL)); } void TrayGrayMenu(GripInfo *ginfo)