Mercurial > audlegacy
comparison audacious/input.c @ 2206:ab4c7ad1857c trunk
[svn] - file_path should be dirname.
author | yaz |
---|---|
date | Sat, 23 Dec 2006 06:04:14 -0800 |
parents | 5dc1bfb0ac99 |
children | 894f7aa46f83 |
comparison
equal
deleted
inserted
replaced
2205:cc6a05baa156 | 2206:ab4c7ad1857c |
---|---|
536 if ((ext = strrchr(tmp, '.'))) | 536 if ((ext = strrchr(tmp, '.'))) |
537 *ext = '\0'; | 537 *ext = '\0'; |
538 | 538 |
539 input->file_name = g_path_get_basename(tmp); | 539 input->file_name = g_path_get_basename(tmp); |
540 input->file_ext = ext ? ext + 1 : NULL; | 540 input->file_ext = ext ? ext + 1 : NULL; |
541 input->file_path = tmp; | 541 input->file_path = g_path_get_dirname(tmp); |
542 | 542 |
543 if ((tmp = xmms_get_titlestring(xmms_get_gentitle_format(), input))) { | 543 if ((tmp = xmms_get_titlestring(xmms_get_gentitle_format(), input))) { |
544 (*title) = str_to_utf8(tmp); | 544 (*title) = str_to_utf8(tmp); |
545 g_free(tmp); | 545 g_free(tmp); |
546 } | 546 } |
585 input->track_name = NULL; | 585 input->track_name = NULL; |
586 input->length = -1; | 586 input->length = -1; |
587 input_get_song_info(filename, &input->track_name, &input->length); | 587 input_get_song_info(filename, &input->track_name, &input->length); |
588 input->file_name = g_path_get_basename(tmp); | 588 input->file_name = g_path_get_basename(tmp); |
589 input->file_ext = ext ? ext + 1 : NULL; | 589 input->file_ext = ext ? ext + 1 : NULL; |
590 input->file_path = tmp; | 590 input->file_path = g_path_get_dirname(tmp); |
591 } | 591 } |
592 | 592 |
593 return input; | 593 return input; |
594 } | 594 } |
595 | 595 |