Index: /winamp-musepack/trunk/mpc_player.cpp =================================================================== --- /winamp-musepack/trunk/mpc_player.cpp (revision 248) +++ /winamp-musepack/trunk/mpc_player.cpp (revision 249) @@ -21,11 +21,13 @@ #include +#include +#include + #include "in2.h" #include "mpc_player.h" +#include "resource.h" #include -#include "mpc_info.h" - -#include -#include + +#include @@ -271,86 +273,112 @@ } -void mpc_player::loadTags(mpc_info ^ infoBox) -{ - if(tag_file == 0) - tag_file = new TagLib::FileRef(lastfn, false); - - if (!tag_file->isNull() && tag_file->tag()) { - TagLib::Tag *tag = tag_file->tag(); - 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), 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); - } -} - -void mpc_player::writeTags(mpc_info ^ infoBox) -{ - if (!tag_file->isNull() && tag_file->tag()) { - TagLib::Tag *tag = tag_file->tag(); - - pin_ptr wch = PtrToStringChars(infoBox->txtTitle->Text); - tag->setTitle(wch); - - wch = PtrToStringChars(infoBox->txtArtist->Text); - tag->setArtist(wch); - - wch = PtrToStringChars(infoBox->txtAlbum->Text); - tag->setAlbum(wch); - - wch = PtrToStringChars(infoBox->txtYear->Text); - TagLib::String year(wch); - tag->setYear(year.toInt()); - - wch = PtrToStringChars(infoBox->txtTrack->Text); - TagLib::String track(wch); - tag->setTrack(track.toInt()); - - wch = PtrToStringChars(infoBox->comboGenre->Text); - tag->setGenre(wch); - - wch = PtrToStringChars(infoBox->txtComment->Text); - tag->setComment(wch); - - tag_file->save(); // FIXME : make all crash - } +//void mpc_player::loadTags(mpc_info ^ infoBox) +//{ +// if(tag_file == 0) +// tag_file = new TagLib::FileRef(lastfn, false); +// +// if (!tag_file->isNull() && tag_file->tag()) { +// TagLib::Tag *tag = tag_file->tag(); +// 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), 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); +// } +//} + +//void mpc_player::writeTags(mpc_info ^ infoBox) +//{ +// if (!tag_file->isNull() && tag_file->tag()) { +// TagLib::Tag *tag = tag_file->tag(); +// +// pin_ptr wch = PtrToStringChars(infoBox->txtTitle->Text); +// tag->setTitle(wch); +// +// wch = PtrToStringChars(infoBox->txtArtist->Text); +// tag->setArtist(wch); +// +// wch = PtrToStringChars(infoBox->txtAlbum->Text); +// tag->setAlbum(wch); +// +// wch = PtrToStringChars(infoBox->txtYear->Text); +// TagLib::String year(wch); +// tag->setYear(year.toInt()); +// +// wch = PtrToStringChars(infoBox->txtTrack->Text); +// TagLib::String track(wch); +// tag->setTrack(track.toInt()); +// +// wch = PtrToStringChars(infoBox->comboGenre->Text); +// tag->setGenre(wch); +// +// wch = PtrToStringChars(infoBox->txtComment->Text); +// tag->setComment(wch); +// +// tag_file->save(); // FIXME : make all crash +// } +//} + +void mpc_player::initDlg(HWND hDlg) +{ + std::ostringstream tmp; + + tmp << "Streamversion "; + tmp << si.stream_version; + tmp << "\nEncoder : "; + tmp << si.encoder; + tmp << "\nProfile : "; + tmp << si.profile_name; + tmp << "\nPNS : "; + if (si.pns) tmp << "on"; + else tmp << "off"; + tmp << "\nGapless : "; + if (si.is_true_gapless) tmp << "on"; + else tmp << "off"; + tmp << "\nAverage bitrate : "; + tmp << floor(si.average_bitrate * 1.e-3 + .5); + tmp << " Kbps \nSamplerate : "; + tmp << si.sample_freq; + tmp << "\nChannels : "; + tmp << si.channels; + tmp << "\nFile size : "; + tmp << si.total_file_length; + tmp << " Bytes"; + //// FIXME : add replay gain info + + SetDlgItemText(hDlg, IDC_STREAM_INFO, tmp.str().c_str()); +} + +// Message handler for info box. +LRESULT CALLBACK About(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) +{ + switch (message) + { + case WM_INITDIALOG: + ((mpc_player *) lParam)->initDlg(hDlg); + return TRUE; + + case WM_COMMAND: + if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) + { + EndDialog(hDlg, LOWORD(wParam)); + return TRUE; + } + break; + } + return FALSE; } int mpc_player::infoDlg(HWND hwnd) { - mpc_info infoBox(this); - System::String ^ tmp; - - tmp = "Streamversion "; - tmp += si.stream_version; - tmp += "\nEncoder : "; - tmp += gcnew String(si.encoder); - tmp += "\nProfile : "; - tmp += gcnew String(si.profile_name); - tmp += "\nPNS : "; - tmp += si.pns ? "on" : "off"; - tmp += "\nGapless : "; - tmp += si.is_true_gapless ? "on" : "off"; - tmp += "\nAverage bitrate : "; - tmp += floor(si.average_bitrate * 1.e-3 + .5); - tmp += " Kbps \nSamplerate : "; - tmp += si.sample_freq; - tmp += "\nChannels : "; - tmp += si.channels; - tmp += "\nFile size : "; - tmp += si.total_file_length; - tmp += " Bytes"; - // FIXME : add replay gain info - - infoBox.lblStreamInfo->Text = tmp; - - loadTags(% infoBox); - - infoBox.ShowDialog(); + DialogBoxParam(mod->hDllInstance, (LPCTSTR)IDD_INFO_BOX, hwnd, (DLGPROC)About, (LPARAM) this); + + //loadTags(% infoBox); + + //infoBox.ShowDialog(); return 0; } Index: /winamp-musepack/trunk/mpc_player.h =================================================================== --- /winamp-musepack/trunk/mpc_player.h (revision 248) +++ /winamp-musepack/trunk/mpc_player.h (revision 249) @@ -20,9 +20,6 @@ #pragma once -#include -#include -#include "mpc_info.h" - -using namespace winamp_musepack; +#include +#include // post this to the main window at end of file (after playback as stopped) @@ -47,6 +44,5 @@ int infoDlg(HWND hwnd); - void loadTags(mpc_info ^ infoBox); - void writeTags(mpc_info ^ infoBox); + void initDlg(HWND hDlg); int paused; // are we paused? Index: /winamp-musepack/trunk/resource.h =================================================================== --- /winamp-musepack/trunk/resource.h (revision 249) +++ /winamp-musepack/trunk/resource.h (revision 249) @@ -0,0 +1,19 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by winamp-musepack.rc +// +#define IDD_FORMVIEW 101 +#define IDD_INFO_BOX 101 +#define IDC_STREAM_INFO 1001 +#define IDC_STATIC -1 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 101 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1002 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif Index: /winamp-musepack/trunk/winamp-musepack.rc =================================================================== --- /winamp-musepack/trunk/winamp-musepack.rc (revision 249) +++ /winamp-musepack/trunk/winamp-musepack.rc (revision 249) @@ -0,0 +1,103 @@ +// Microsoft Visual C++ generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#define APSTUDIO_HIDDEN_SYMBOLS +#include "windows.h" +#undef APSTUDIO_HIDDEN_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""windows.h""\r\n" + "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_INFO_BOX DIALOGEX 0, 0, 424, 246 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Musepack file information" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "File stream informations",IDC_STATIC,264,0,156,240, + BS_FLAT + LTEXT "C'est juste un test.\nPour voir si tout va bien.", + IDC_STREAM_INFO,270,11,144,228 +END + + +///////////////////////////////////////////////////////////////////////////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO +BEGIN + IDD_INFO_BOX, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 417 + TOPMARGIN, 7 + BOTTOMMARGIN, 239 + END +END +#endif // APSTUDIO_INVOKED + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + Index: /winamp-musepack/trunk/winamp-musepack.sln =================================================================== --- /winamp-musepack/trunk/winamp-musepack.sln (revision 248) +++ /winamp-musepack/trunk/winamp-musepack.sln (revision 249) @@ -1,20 +1,21 @@ - -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual C++ Express 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winamp-musepack", "winamp-musepack\winamp-musepack.vcproj", "{EEA7D671-FB86-4E8D-8F1A-CC05174342F0}" +Microsoft Visual Studio Solution File, Format Version 8.00 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winamp-musepack", "winamp-musepack.vcproj", "{2AE878FD-322D-4628-8817-21FB3143C167}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection EndProject Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 + GlobalSection(SolutionConfiguration) = preSolution + Debug = Debug + Release = Release EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {EEA7D671-FB86-4E8D-8F1A-CC05174342F0}.Debug|Win32.ActiveCfg = Debug|Win32 - {EEA7D671-FB86-4E8D-8F1A-CC05174342F0}.Debug|Win32.Build.0 = Debug|Win32 - {EEA7D671-FB86-4E8D-8F1A-CC05174342F0}.Release|Win32.ActiveCfg = Release|Win32 - {EEA7D671-FB86-4E8D-8F1A-CC05174342F0}.Release|Win32.Build.0 = Release|Win32 + GlobalSection(ProjectConfiguration) = postSolution + {2AE878FD-322D-4628-8817-21FB3143C167}.Debug.ActiveCfg = Debug|Win32 + {2AE878FD-322D-4628-8817-21FB3143C167}.Debug.Build.0 = Debug|Win32 + {2AE878FD-322D-4628-8817-21FB3143C167}.Release.ActiveCfg = Release|Win32 + {2AE878FD-322D-4628-8817-21FB3143C167}.Release.Build.0 = Release|Win32 EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE + GlobalSection(ExtensibilityGlobals) = postSolution + EndGlobalSection + GlobalSection(ExtensibilityAddIns) = postSolution EndGlobalSection EndGlobal Index: /winamp-musepack/trunk/winamp-musepack.vcproj =================================================================== --- /winamp-musepack/trunk/winamp-musepack.vcproj (revision 248) +++ /winamp-musepack/trunk/winamp-musepack.vcproj (revision 249) @@ -2,243 +2,129 @@ + Keyword="Win32Proj"> + Name="Win32"/> - - - - - - - + CharacterSet="2"> + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="4"/> - - + Name="VCCustomBuildTool"/> + AdditionalDependencies="mpcdec_static.lib tag.lib" + OutputFile="C:\Program Files\Winamp\Plugins\in_mpc.dll" + LinkIncremental="2" + AdditionalLibraryDirectories=""C:\Program Files\taglib\lib";"$(SolutionDir)\..\libmpc\bin\libmpcdec\$(OutDir)"" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="$(OutDir)/winamp-musepack.pdb" + SubSystem="2" + ImportLibrary="$(OutDir)/winamp-musepack.lib" + TargetMachine="1"/> + Name="VCMIDLTool"/> + Name="VCPostBuildEventTool"/> + Name="VCPreBuildEventTool"/> + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebDeploymentTool"/> + + - - - - - + CharacterSet="2"> + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> - - + Name="VCCustomBuildTool"/> + AdditionalDependencies="mpcdec_static.lib tag.lib" + OutputFile="C:\Program Files\Winamp\Plugins\in_mpc.dll" + LinkIncremental="1" + AdditionalLibraryDirectories=""C:\Program Files\taglib\lib";"$(SolutionDir)\..\libmpc\bin\libmpcdec\$(OutDir)"" + GenerateDebugInformation="TRUE" + SubSystem="2" + OptimizeReferences="2" + EnableCOMDATFolding="2" + ImportLibrary="$(OutDir)/winamp-musepack.lib" + TargetMachine="1"/> + Name="VCMIDLTool"/> + Name="VCPostBuildEventTool"/> + Name="VCPreBuildEventTool"/> + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebDeploymentTool"/> + + - - - - - + Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> + RelativePath=".\in_mpc.cpp"> - - - - - - - - - - - - - - + RelativePath=".\mpc_player.cpp"> @@ -246,34 +132,28 @@ Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" - UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" - > + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"> + RelativePath=".\in2.h"> - - + RelativePath=".\mpc_player.h"> + RelativePath=".\out.h"> + RelativePath=".\resource.h"> + + + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> + +