Changeset 193

Timestamp:

12/27/06 22:52:50 (18 years ago)

Author:

r2d

Message:

• corrected tag reading bug for utf8 strings
• tag writing works but need the windows port of TagLib

Location:

winamp-musepack/trunk/winamp-musepack

Files:

• mpc_info.cpp (modified) (1 diff)
• mpc_info.h (modified) (1 diff)
• mpc_player.cpp (modified) (1 diff)

winamp-musepack/trunk/winamp-musepack/mpc_info.cpp

@@ -37 +37 @@
 System::Void mpc_info::btnUpdate_Click(System::Object^  sender, System::EventArgs^  e)
 {
+        Hide();
         player->writeTags(this);
         Close();

winamp-musepack/trunk/winamp-musepack/mpc_info.h

@@ -330 +330 @@
                         this->Controls->Add(this->groupBox2);
                         this->Controls->Add(this->groupBox1);
+                        this->FormBorderStyle = System::Windows::Forms::FormBorderStyle::FixedSingle;
+                        this->MaximizeBox = false;
+                        this->MinimizeBox = false;
                         this->Name = L"mpc_info";
                         this->Text = L"Musepack file information";

winamp-musepack/trunk/winamp-musepack/mpc_player.cpp

@@ -278 +278 @@
         if (!tag_file->isNull() && tag_file->tag()) {
                 TagLib::Tag *tag = tag_file->tag();
-                infoBox->txtTitle->Text = gcnew String(tag->title().toCString(true));
-                infoBox->txtArtist->Text = gcnew String(tag->artist().toCString(true));
-                infoBox->txtAlbum->Text = gcnew String(tag->album().toCString(true));
+                infoBox->txtTitle->Text = gcnew String(tag->title().toCString(true), 0, strlen(tag->title().toCString(true)), System::Text::Encoding::UTF8);
+                infoBox->txtArtist->Text = gcnew String(tag->artist().toCString(true), 0, strlen(tag->artist().toCString(true)), System::Text::Encoding::UTF8);
+                infoBox->txtAlbum->Text = gcnew String(tag->album().toCString(true), 0, strlen(tag->album().toCString(true)), System::Text::Encoding::UTF8);
                 infoBox->txtYear->Text = "";
                 infoBox->txtYear->Text += tag->year();
                 infoBox->txtTrack->Text = "";
                 infoBox->txtTrack->Text += tag->track();
-                infoBox->comboGenre->Text = gcnew String(tag->genre().toCString(true));
-                infoBox->txtComment->Text = gcnew String(tag->comment().toCString(true));
+                infoBox->comboGenre->Text = gcnew String(tag->genre().toCString(true), 0, strlen(tag->genre().toCString(true)), System::Text::Encoding::UTF8);
+                infoBox->txtComment->Text = gcnew String(tag->comment().toCString(true), 0, strlen(tag->comment().toCString(true)), System::Text::Encoding::UTF8);
         }
 }