comparison src/adplug/adplug-xmms.cc @ 1976:5fa26178eaef

s/tuple_/aud_tuple_/g
author William Pitcock <nenolod@atheme.org>
date Sun, 07 Oct 2007 00:22:59 -0500
parents 17a6441c71b6
children fa9f85cebade
comparison
equal deleted inserted replaced
1973:f86cb7fc1d4f 1976:5fa26178eaef
688 688
689 CPlayer *p = factory (fd, &tmpopl); 689 CPlayer *p = factory (fd, &tmpopl);
690 690
691 if (p) 691 if (p)
692 { 692 {
693 Tuple *ti = tuple_new_from_filename(filename); 693 Tuple *ti = aud_tuple_new_from_filename(filename);
694 if (! p->getauthor().empty()) 694 if (! p->getauthor().empty())
695 tuple_associate_string(ti, FIELD_ARTIST, NULL, p->getauthor().c_str()); 695 aud_tuple_associate_string(ti, FIELD_ARTIST, NULL, p->getauthor().c_str());
696 if (! p->gettitle().empty()) 696 if (! p->gettitle().empty())
697 tuple_associate_string(ti, FIELD_TITLE, NULL, p->gettitle().c_str()); 697 aud_tuple_associate_string(ti, FIELD_TITLE, NULL, p->gettitle().c_str());
698 else if (! p->getdesc().empty()) 698 else if (! p->getdesc().empty())
699 tuple_associate_string(ti, FIELD_TITLE, NULL, p->getdesc().c_str()); 699 aud_tuple_associate_string(ti, FIELD_TITLE, NULL, p->getdesc().c_str());
700 else 700 else
701 tuple_associate_string(ti, FIELD_TITLE, NULL, g_path_get_basename(filename)); 701 aud_tuple_associate_string(ti, FIELD_TITLE, NULL, g_path_get_basename(filename));
702 tuple_associate_string(ti, FIELD_CODEC, NULL, p->gettype().c_str()); 702 aud_tuple_associate_string(ti, FIELD_CODEC, NULL, p->gettype().c_str());
703 tuple_associate_string(ti, FIELD_QUALITY, NULL, "sequenced"); 703 aud_tuple_associate_string(ti, FIELD_QUALITY, NULL, "sequenced");
704 tuple_associate_int(ti, FIELD_LENGTH, NULL, p->songlength (plr.subsong)); 704 aud_tuple_associate_int(ti, FIELD_LENGTH, NULL, p->songlength (plr.subsong));
705 delete p; 705 delete p;
706 return ti; 706 return ti;
707 } 707 }
708 708
709 return NULL; 709 return NULL;
710 } 710 }
711 711
712 static char* format_and_free_ti( Tuple* ti, int* length ) 712 static char* format_and_free_ti( Tuple* ti, int* length )
713 { 713 {
714 char* result = tuple_formatter_make_title_string(ti, get_gentitle_format()); 714 char* result = aud_tuple_formatter_make_title_string(ti, get_gentitle_format());
715 if ( result ) 715 if ( result )
716 *length = tuple_get_int(ti, FIELD_LENGTH, NULL); 716 *length = aud_tuple_get_int(ti, FIELD_LENGTH, NULL);
717 tuple_free((void *) ti); 717 aud_tuple_free((void *) ti);
718 718
719 return result; 719 return result;
720 } 720 }
721 721
722 static void 722 static void