edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 09:34:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

stop sound preview in more places

Browse source
This commit is contained in:
dobrykafe 2023-10-18 14:47:47 +02:00
parent aafee689ca
commit 697bd8980d
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/game/editor/editor.cpp
View file

@ -884,6 +884,11 @@ bool CEditor::CallbackSaveSound(const char *pFileName, int StorageType, void *pU
{ {
io_write(File, pSound->m_pData, pSound->m_DataSize); io_write(File, pSound->m_pData, pSound->m_DataSize);
io_close(File); io_close(File);
if(pEditor->m_FilePreviewSound)
{
pEditor->Sound()->UnloadSample(pEditor->m_FilePreviewSound);
pEditor->m_FilePreviewSound = -1;
}
pEditor->m_Dialog = DIALOG_NONE; pEditor->m_Dialog = DIALOG_NONE;
return true; return true;
} }
@ -1347,15 +1352,18 @@ void CEditor::DoToolbarSounds(CUIRect ToolBar)
CUIRect ToolBarTop, ToolBarBottom; CUIRect ToolBarTop, ToolBarBottom;
ToolBar.HSplitMid(&ToolBarTop, &ToolBarBottom, 5.0f); ToolBar.HSplitMid(&ToolBarTop, &ToolBarBottom, 5.0f);
m_ToolbarPreviewSound = -1;
if(m_SelectedSound >= 0 && (size_t)m_SelectedSound < m_Map.m_vpSounds.size()) if(m_SelectedSound >= 0 && (size_t)m_SelectedSound < m_Map.m_vpSounds.size())
{ {
const std::shared_ptr<CEditorSound> pSelectedSound = m_Map.m_vpSounds[m_SelectedSound]; const std::shared_ptr<CEditorSound> pSelectedSound = m_Map.m_vpSounds[m_SelectedSound];
if(pSelectedSound->m_SoundID != m_ToolbarPreviewSound && m_ToolbarPreviewSound && Sound()->IsPlaying(m_ToolbarPreviewSound))
Sound()->Stop(m_ToolbarPreviewSound);
m_ToolbarPreviewSound = pSelectedSound->m_SoundID; m_ToolbarPreviewSound = pSelectedSound->m_SoundID;
static int s_PlayPauseButton, s_StopButton, s_SeekBar = 0; static int s_PlayPauseButton, s_StopButton, s_SeekBar = 0;
DoAudioPreview(ToolBarBottom, &s_PlayPauseButton, &s_StopButton, &s_SeekBar, m_ToolbarPreviewSound); DoAudioPreview(ToolBarBottom, &s_PlayPauseButton, &s_StopButton, &s_SeekBar, m_ToolbarPreviewSound);
} }
else
m_ToolbarPreviewSound = -1;
} }
static void Rotate(const CPoint *pCenter, CPoint *pPoint, float Rotation) static void Rotate(const CPoint *pCenter, CPoint *pPoint, float Rotation)