comparison src/modplug/modplugbmp.cxx @ 1601:be8babbd772c

Convert strings to UTF-8 using str_to_utf8(). This solution is not "Correct(tm)", but since the encoding used in module files cannot be known, it's the best bet.

1600:49fe2225d236

#include "audacious/configdb.h"
#include "audacious/output.h"
#include "audacious/tuple.h"
#include "audacious/tuple_formatter.h"
#include "audacious/vfs.h"
}

static char* format_and_free_ti( Tuple* ti, int* length )
{
        char* result = tuple_formatter_make_title_string(ti, get_gentitle_format());

Tuple* ModplugXMMS::GetSongTuple(const string& aFilename)
{
	CSoundFile* lSoundFile;
	Archive* lArchive;
	char* tmps;
	
	//open and mmap the file
        lArchive = OpenArchive(aFilename);
        if(lArchive->Size() == 0)
        {

	case MOD_TYPE_PSM:	tmps = "Protracker Studio Module"; break;
	default:		tmps = "ModPlug unknown"; break;
	}
	tuple_associate_string(ti, "codec", tmps);
	tuple_associate_string(ti, "quality", "sequenced");
	tuple_associate_string(ti, "title", lSoundFile->GetTitle());
	tuple_associate_int(ti, "length", lSoundFile->GetSongTime() * 1000);
	
	//unload the file
	lSoundFile->Destroy();
	delete lSoundFile;
	delete lArchive;

1601:be8babbd772c

#include "audacious/configdb.h"
#include "audacious/output.h"
#include "audacious/tuple.h"
#include "audacious/tuple_formatter.h"
#include "audacious/vfs.h"
#include "audacious/strings.h"
}

static char* format_and_free_ti( Tuple* ti, int* length )
{
        char* result = tuple_formatter_make_title_string(ti, get_gentitle_format());

Tuple* ModplugXMMS::GetSongTuple(const string& aFilename)
{
	CSoundFile* lSoundFile;
	Archive* lArchive;
	gchar* tmps;
	
	//open and mmap the file
        lArchive = OpenArchive(aFilename);
        if(lArchive->Size() == 0)
        {

	case MOD_TYPE_PSM:	tmps = "Protracker Studio Module"; break;
	default:		tmps = "ModPlug unknown"; break;
	}
	tuple_associate_string(ti, "codec", tmps);
	tuple_associate_string(ti, "quality", "sequenced");
	tuple_associate_int(ti, "length", lSoundFile->GetSongTime() * 1000);

	/* NOTICE! FIXME? This is actually incorrect. We _cannot_ know what charset
	 * an arbitrary module file uses .. typically it is some DOS CP-variant,
	 * except for true Amiga modules.
	 */
	tmps = str_to_utf8(lSoundFile->GetTitle());
	tuple_associate_string(ti, "title", tmps);
	g_free(tmps);
	
	
	//unload the file
	lSoundFile->Destroy();
	delete lSoundFile;
	delete lArchive;