Attachment #307 for bug #3201

View | Details | Raw Unified | Return to bug 3201
Collapse All | Expand All

Lines 189-194 Link Here

(-)grip-3.1.2.orig/src/cdplay.c (-2 / +8 lines)
189	gboolean success=FALSE;	189	gboolean success=FALSE;
190	DiscInfo *disc;	190	DiscInfo *disc;
191	DiscData *ddata;	191	DiscData *ddata;
		192	char utf8_lartist, utf8_ltitle;
192		193
193	disc=&(ginfo->disc);	194	disc=&(ginfo->disc);
194	ddata=&(ginfo->ddata);	195	ddata=&(ginfo->ddata);
Lines 211-219 Link Here
211	switch(query.query_match) {	212	switch(query.query_match) {
212	case MATCH_INEXACT:	213	case MATCH_INEXACT:
213	case MATCH_EXACT:	214	case MATCH_EXACT:
		215	utf8_lartist=g_convert(query.query_list[0].list_artist,-1,
		216	"utf-8",ginfo->discdb_encoding,NULL,NULL,NULL);
		217	utf8_ltitle=g_convert(query.query_list[0].list_title,-1,
		218	"utf-8",ginfo->discdb_encoding,NULL,NULL,NULL);
214	LogStatus(ginfo,_("Match for \"%s / %s\"\nDownloading data...\n"),	219	LogStatus(ginfo,_("Match for \"%s / %s\"\nDownloading data...\n"),
215	query.query_list[0].list_artist,	220	utf8_lartist, utf8_ltitle);
216	query.query_list[0].list_title);	221	g_free(utf8_lartist);
		222	g_free(utf8_ltitle);
217	entry.entry_genre = query.query_list[0].list_genre;	223	entry.entry_genre = query.query_list[0].list_genre;
218	entry.entry_id = query.query_list[0].list_id;	224	entry.entry_id = query.query_list[0].list_id;
219	DiscDBRead(disc,server,&hello,&entry,ddata);	225	DiscDBRead(disc,server,&hello,&entry,ddata);

Lines 787-792 Link Here

(-)grip-3.1.2.orig/src/rip.c (-6 / +16 lines)
787	gfloat elapsed=0;	787	gfloat elapsed=0;
788	gfloat speed;	788	gfloat speed;
789	gboolean result=FALSE;	789	gboolean result=FALSE;
		790	char *conv_str;
790		791
791	uinfo=&(ginfo->gui_info);	792	uinfo=&(ginfo->gui_info);
792		793
Lines 977-984 Link Here
977		978
978	if(!ginfo->stop_encode) {	979	if(!ginfo->stop_encode) {
979	if(ginfo->delete_wavs) {	980	if(ginfo->delete_wavs) {
980	LogStatus(ginfo,_("Deleting [%s]\n"),	981	conv_str=g_convert(ginfo->rip_delete_file[mycpu],-1,
981	ginfo->rip_delete_file[mycpu]);	982	"utf-8",ginfo->fs_encoding,NULL,NULL,NULL);
		983	LogStatus(ginfo,_("Deleting [%s]\n"),conv_str);
		984	g_free(conv_str);
982	unlink(ginfo->rip_delete_file[mycpu]);	985	unlink(ginfo->rip_delete_file[mycpu]);
983	}	986	}
984		987
Lines 1345-1351 Link Here
1345	struct stat mystat;	1348	struct stat mystat;
1346	GString *str;	1349	GString *str;
1347	EncodeTrack enc_track;	1350	EncodeTrack enc_track;
1348	char *conv_str;	1351	char conv_str, utf8_ripfile;
1349	gsize rb,wb;	1352	gsize rb,wb;
1350		1353
1351	uinfo=&(ginfo->gui_info);	1354	uinfo=&(ginfo->gui_info);
Lines 1415-1422 Link Here
1415	sleep(5);	1418	sleep(5);
1416	}	1419	}
1417		1420
		1421	utf8_ripfile=g_convert(ginfo->ripfile,-1,"utf-8",ginfo->discdb_encoding,
		1422	NULL,NULL,NULL);
1418	LogStatus(ginfo,_("Ripping track %d to %s\n"),	1423	LogStatus(ginfo,_("Ripping track %d to %s\n"),
1419	ginfo->rip_track+1,ginfo->ripfile);	1424	ginfo->rip_track+1,utf8_ripfile);
1420		1425
1421	ginfo->rip_started = time(NULL);	1426	ginfo->rip_started = time(NULL);
1422	sprintf(tmp,_("Rip: Trk %d (0.0x)"),ginfo->rip_track+1);	1427	sprintf(tmp,_("Rip: Trk %d (0.0x)"),ginfo->rip_track+1);
Lines 1425-1431 Link Here
1425	if(stat(ginfo->ripfile,&mystat)>=0) {	1430	if(stat(ginfo->ripfile,&mystat)>=0) {
1426	if(mystat.st_size == ginfo->ripsize) {	1431	if(mystat.st_size == ginfo->ripsize) {
1427	LogStatus(ginfo,_("File %s has already been ripped. Skipping...\n"),\	1432	LogStatus(ginfo,_("File %s has already been ripped. Skipping...\n"),\
1428	ginfo->ripfile);	1433	utf8_ripfile);
		1434	g_free(utf8_ripfile);
1429	if(ginfo->doencode) ginfo->num_wavs++;	1435	if(ginfo->doencode) ginfo->num_wavs++;
1430	ginfo->ripping=TRUE;	1436	ginfo->ripping=TRUE;
1431	ginfo->ripping_a_disc=TRUE;	1437	ginfo->ripping_a_disc=TRUE;
Lines 1435-1440 Link Here
1435	}	1441	}
1436	else unlink(ginfo->ripfile);	1442	else unlink(ginfo->ripfile);
1437	}	1443	}
		1444	g_free(utf8_ripfile);
1438		1445
1439	bytesleft=BytesLeftInFS(ginfo->ripfile);	1446	bytesleft=BytesLeftInFS(ginfo->ripfile);
1440		1447
Lines 1662-1668 Link Here
1662		1669
1663	bytesleft=BytesLeftInFS(ginfo->mp3file[cpu]);	1670	bytesleft=BytesLeftInFS(ginfo->mp3file[cpu]);
1664		1671
1665	LogStatus(ginfo,_("%i: Encoding to %s\n"),cpu+1,ginfo->mp3file[cpu]);	1672	conv_str=g_convert(ginfo->mp3file[cpu],-1,"utf-8",ginfo->discdb_encoding,
		1673	NULL,NULL,NULL);
		1674	LogStatus(ginfo,_("%i: Encoding to %s\n"),cpu+1,conv_str);
		1675	g_free(conv_str);
1666		1676
1667	sprintf(tmp,_("Enc: Trk %d (0.0x)"),encode_track+1);	1677	sprintf(tmp,_("Enc: Trk %d (0.0x)"),encode_track+1);
1668	gtk_label_set(GTK_LABEL(uinfo->mp3_prog_label[cpu]),tmp);	1678	gtk_label_set(GTK_LABEL(uinfo->mp3_prog_label[cpu]),tmp);




/* Write a line of output to a status window */
void StatusWindowWrite(StatusWindow *sw,char *msg)
{
  char *buf, *locale_msg;
  int len;
  int pos=0;

  /*  gtk_widget_queue_resize(sw->term_widget);*/

  if(g_utf8_validate(msg,-1,NULL)) {
    locale_msg=g_locale_from_utf8(msg,-1,NULL,&len,NULL);
    msg=locale_msg;
  }
  else {
    len=strlen(msg);
  }

  buf=(char *)malloc((len*2)+1);


  }
  
  buf[pos]='\0';
  g_free(locale_msg);

  /*  zvt_term_feed((ZvtTerm *)sw->term_widget,buf,strlen(buf));*/


Return to bug 3201

Lines 82-94 Link Here

(-)grip-3.1.2.orig/src/status_window.c (-2 / +9 lines)
82	/* Write a line of output to a status window */	82	/* Write a line of output to a status window */
83	void StatusWindowWrite(StatusWindow sw,char msg)	83	void StatusWindowWrite(StatusWindow sw,char msg)
84	{	84	{
85	char *buf;	85	char buf, locale_msg;
86	int len;	86	int len;
87	int pos=0;	87	int pos=0;
88		88
89	/* gtk_widget_queue_resize(sw->term_widget);*/	89	/* gtk_widget_queue_resize(sw->term_widget);*/
90		90
91	len=strlen(msg);	91	if(g_utf8_validate(msg,-1,NULL)) {
		92	locale_msg=g_locale_from_utf8(msg,-1,NULL,&len,NULL);
		93	msg=locale_msg;
		94	}
		95	else {
		96	len=strlen(msg);
		97	}
92		98
93	buf=(char )malloc((len2)+1);	99	buf=(char )malloc((len2)+1);
94		100
Lines 107-112 Link Here
107	}	113	}
108		114
109	buf[pos]='\0';	115	buf[pos]='\0';
		116	g_free(locale_msg);
110		117
111	/* zvt_term_feed((ZvtTerm )sw->term_widget,buf,strlen(buf));/	118	/* zvt_term_feed((ZvtTerm )sw->term_widget,buf,strlen(buf));/
112		119