Files
Goober5000andClaude Opus 4.8 1c079a79c1 Fix FRED play/media button transparency and disabled state (#7524)
CButton::SetBitmap blits a bitmap verbatim and does not perform the
magic-color substitution MFC applies when loading toolbar bitmaps. So a
button bitmap's background -- the legacy C0C0C0 gray baked into play.bmp
et al., or a magenta transparency key -- was drawn literally, reading as
a dark/colored rectangle instead of matching the real button face
(~F0F0F0 on modern Windows), and a disabled bitmap button embossed its
whole opaque rectangle into a solid gray square.

Add load_button_icon() to management.{cpp,h}, which builds an icon from
a button bitmap by keying out a background color into a transparency
mask. Driven through BS_ICON/SetIcon, the OS blends it with the button
face and grays it correctly when disabled. Route every play/media button
through it (event editor, briefing, debriefing, command brief, music
player, sound environment). Also add load_btnface_mapped() -- a
toolbar-style color remap -- kept as a lighter alternative for
always-enabled buttons.

Co-authored-by: Claude Opus 4.8 (1M context) <[email protected]>
2026-06-15 22:33:37 -04:00

246 lines
5.1 KiB
C++

// MusicPlayerDlg.cpp : implementation file
//
#include "stdafx.h"
#include "FRED.h"
#include "MainFrm.h"
#include "management.h"
#include "musicplayerdlg.h"
#include "TextViewDlg.h"
#include "mod_table/mod_table.h"
#include "sound/audiostr.h"
#ifdef _DEBUG
#undef THIS_FILE
static char THIS_FILE[] = __FILE__;
#endif
music_player_dlg::music_player_dlg(CWnd* pParent /*=nullptr*/)
: CDialog(music_player_dlg::IDD, pParent)
{
m_music_item = "";
m_music_id = -1;
m_cursor_pos = -1;
m_autoplay = FALSE;
m_play_icon = nullptr;
m_stop_icon = nullptr;
m_next_icon = nullptr;
m_prev_icon = nullptr;
}
void music_player_dlg::DoDataExchange(CDataExchange* pDX)
{
CDialog::DoDataExchange(pDX);
DDX_Control(pDX, IDC_MUSIC_LIST, m_music_list);
DDX_Check(pDX, IDC_MUSIC_AUTOPLAY, m_autoplay);
}
BEGIN_MESSAGE_MAP(music_player_dlg, CDialog)
ON_LBN_SELCHANGE(IDC_MUSIC_LIST, OnSelMusicList)
ON_BN_CLICKED(IDC_BUTTON_PLAY_MUSIC, OnPlay)
ON_BN_CLICKED(IDC_BUTTON_STOP_MUSIC, OnStop)
ON_BN_CLICKED(IDC_BUTTON_NEXT_MUSIC, OnNextTrack)
ON_BN_CLICKED(IDC_BUTTON_PREV_MUSIC, OnPreviousTrack)
ON_BN_CLICKED(IDC_BUTTON_MUSIC_TBL, OnMusicTbl)
ON_BN_CLICKED(IDC_MUSIC_AUTOPLAY, OnAutoplay)
ON_WM_CLOSE()
END_MESSAGE_MAP()
BOOL music_player_dlg::Create()
{
BOOL r;
r = CDialog::Create(IDD, Fred_main_wnd);
m_play_icon = load_button_icon(IDB_PLAY, RGB(192, 192, 192));
((CButton*)GetDlgItem(IDC_BUTTON_PLAY_MUSIC))->SetIcon(m_play_icon);
m_stop_icon = load_button_icon(IDB_STOP, RGB(192, 192, 192));
((CButton*)GetDlgItem(IDC_BUTTON_STOP_MUSIC))->SetIcon(m_stop_icon);
m_next_icon = load_button_icon(IDB_NEXT, RGB(192, 192, 192));
((CButton*)GetDlgItem(IDC_BUTTON_NEXT_MUSIC))->SetIcon(m_next_icon);
m_prev_icon = load_button_icon(IDB_PREV, RGB(192, 192, 192));
((CButton*)GetDlgItem(IDC_BUTTON_PREV_MUSIC))->SetIcon(m_prev_icon);
return r;
}
BOOL music_player_dlg::OnInitDialog()
{
CDialog::OnInitDialog();
m_music_list.ResetContent();
SCP_vector<SCP_string> files;
cf_get_file_list(files, CF_TYPE_MUSIC, "*", CF_SORT_NAME);
for (auto& file : files) {
bool addItem = true;
// check if the file was asked to be ignored in game_settings
for (auto& thisFile : Ignored_music_player_files) {
if (lcase_equal(thisFile, file)) {
addItem = false;
break;
}
}
//add item if not ignored
if (addItem) {
m_music_list.AddString(file.c_str());
}
}
return TRUE;
}
void music_player_dlg::PlayMusic()
{
StopMusic();
// cfile strips the extension so first let's try .wav
SCP_string thisMusic = m_music_item + ".wav";
m_music_id = audiostream_open(thisMusic.c_str(), ASF_EVENTMUSIC);
// if no file was loaded then it must be .ogg
if (m_music_id < 0) {
thisMusic = m_music_item + ".ogg";
m_music_id = audiostream_open(thisMusic.c_str(), ASF_EVENTMUSIC);
}
if (m_music_id >= 0) {
audiostream_play(m_music_id, 1.0f, 0);
} else {
thisMusic = m_music_item;
Warning(LOCATION, "FRED failed to open music file %s in the music player\n", thisMusic.c_str());
}
}
void music_player_dlg::StopMusic()
{
if (m_music_id >= 0) {
audiostream_close_file(m_music_id, 0);
m_music_id = -1;
}
}
bool music_player_dlg::SelectNextTrack()
{
if ((m_cursor_pos >= 0) && (m_cursor_pos < (m_music_list.GetCount() - 1))) {
m_cursor_pos++;
m_music_list.SetCurSel(m_cursor_pos);
UpdateSelection();
return true;
}
return false;
}
bool music_player_dlg::SelectPrevTrack()
{
if ((m_cursor_pos > 0) && (m_cursor_pos < m_music_list.GetCount())) {
m_cursor_pos--;
m_music_list.SetCurSel(m_cursor_pos);
UpdateSelection();
return true;
}
return false;
}
bool music_player_dlg::IsPlayerActive()
{
return m_music_id >= 0;
}
void music_player_dlg::DoFrame()
{
//If the music has finished playing
if (!audiostream_is_playing(m_music_id)) {
//if autoplay is on and we just finished a track then select the next music track and play it
if (m_autoplay && SelectNextTrack()) {
PlayMusic();
} else {
StopMusic();
}
}
}
void music_player_dlg::UpdateSelection()
{
m_cursor_pos = m_music_list.GetCurSel();
m_music_list.GetText(m_cursor_pos, m_music_item);
}
void music_player_dlg::OnSelMusicList()
{
UpdateSelection();
}
void music_player_dlg::OnPlay()
{
PlayMusic();
}
void music_player_dlg::OnStop()
{
StopMusic();
}
void music_player_dlg::OnNextTrack()
{
if (SelectNextTrack() && audiostream_is_playing(m_music_id)) {
PlayMusic();
}
}
void music_player_dlg::OnPreviousTrack()
{
if (SelectPrevTrack() && audiostream_is_playing(m_music_id)) {
PlayMusic();
}
}
void music_player_dlg::OnMusicTbl()
{
TextViewDlg dlg;
dlg.LoadMusicTblText();
dlg.DoModal();
}
void music_player_dlg::OnClose()
{
StopMusic();
CDialog::OnClose();
}
BOOL music_player_dlg::DestroyWindow()
{
if (m_play_icon) { DestroyIcon(m_play_icon); m_play_icon = nullptr; }
if (m_stop_icon) { DestroyIcon(m_stop_icon); m_stop_icon = nullptr; }
if (m_next_icon) { DestroyIcon(m_next_icon); m_next_icon = nullptr; }
if (m_prev_icon) { DestroyIcon(m_prev_icon); m_prev_icon = nullptr; }
return CDialog::DestroyWindow();
}
void music_player_dlg::OnAutoplay()
{
if (m_autoplay == 1)
m_autoplay = 0;
else
m_autoplay = 1;
((CButton*)GetDlgItem(IDC_MUSIC_AUTOPLAY))->SetCheck(m_autoplay);
}