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

check if video exist when render

Browse source
This commit is contained in:
sirius 2019-09-27 14:51:08 +08:00
parent 562dffe800
commit 14ed79972b
2 changed files with 54 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
src/game/client/components/menus.cpp
View file

@ -1120,6 +1120,12 @@ int CMenus::Render()
pExtraText = ""; pExtraText = "";
ExtraAlign = -1; ExtraAlign = -1;
} }
else if(m_Popup == POPUP_REPLACE_VIDEO)
{
pTitle = Localize("Replace video");
pExtraText = Localize("Destination file exists, Do you want to replace it?");
ExtraAlign = -1;
}
else if(m_Popup == POPUP_REMOVE_FRIEND) else if(m_Popup == POPUP_REMOVE_FRIEND)
{ {
pTitle = Localize("Remove friend"); pTitle = Localize("Remove friend");
@ -1567,9 +1573,21 @@ int CMenus::Render()
str_format(aBufNew, sizeof(aBufNew), "%s.mp4", m_aCurrentDemoFile); str_format(aBufNew, sizeof(aBufNew), "%s.mp4", m_aCurrentDemoFile);
else else
str_format(aBufNew, sizeof(aBufNew), "%s", m_aCurrentDemoFile); str_format(aBufNew, sizeof(aBufNew), "%s", m_aCurrentDemoFile);
const char *pError = Client()->DemoPlayer_Render(aBufOld, m_lDemos[m_DemolistSelectedIndex].m_StorageType, aBufNew); char aWholePath[1024];
if(pError) // store new video filename to origin buffer
PopupMessage(Localize("Error"), str_comp(pError, "error loading demo") ? pError : Localize("Error loading demo"), Localize("Ok")); str_copy(m_aCurrentDemoFile, aBufNew, sizeof(m_aCurrentDemoFile));
if(Storage()->FindFile(m_aCurrentDemoFile, "videos", IStorage::TYPE_ALL, aWholePath, sizeof(aWholePath)))
{
PopupMessage(Localize("Error"), Localize("Destination file already exist"), Localize("Ok"));
m_Popup = POPUP_REPLACE_VIDEO;
}
else
{
const char *pError = Client()->DemoPlayer_Render(aBufOld, m_lDemos[m_DemolistSelectedIndex].m_StorageType, m_aCurrentDemoFile);
//Console()->Print(IConsole::OUTPUT_LEVEL_DEBUG, "demo_render_path", aWholePath);
if(pError)
PopupMessage(Localize("Error"), str_comp(pError, "error loading demo") ? pError : Localize("Error loading demo"), Localize("Ok"));
}
} }
} }
@ -1588,6 +1606,38 @@ int CMenus::Render()
static float Offset = 0.0f; static float Offset = 0.0f;
DoEditBox(&Offset, &TextBox, m_aCurrentDemoFile, sizeof(m_aCurrentDemoFile), 12.0f, &Offset); DoEditBox(&Offset, &TextBox, m_aCurrentDemoFile, sizeof(m_aCurrentDemoFile), 12.0f, &Offset);
} }
else if(m_Popup == POPUP_REPLACE_VIDEO)
{
CUIRect Yes, No;
Box.HSplitBottom(20.f, &Box, &Part);
#if defined(__ANDROID__)
Box.HSplitBottom(60.f, &Box, &Part);
#else
Box.HSplitBottom(24.f, &Box, &Part);
#endif
Part.VMargin(80.0f, &Part);
Part.VSplitMid(&No, &Yes);
Yes.VMargin(20.0f, &Yes);
No.VMargin(20.0f, &No);
static int s_ButtonAbort = 0;
if(DoButton_Menu(&s_ButtonAbort, Localize("No"), 0, &No) || m_EscapePressed)
m_Popup = POPUP_RENDER_DEMO;
static int s_ButtonTryAgain = 0;
if(DoButton_Menu(&s_ButtonTryAgain, Localize("Yes"), 0, &Yes) || m_EnterPressed)
{
m_Popup = POPUP_NONE;
// render video
char aBuf[512];
str_format(aBuf, sizeof(aBuf), "%s/%s", m_aCurrentDemoFolder, m_lDemos[m_DemolistSelectedIndex].m_aFilename);
const char *pError = Client()->DemoPlayer_Render(aBuf, m_lDemos[m_DemolistSelectedIndex].m_StorageType, m_aCurrentDemoFile);
if(pError)
PopupMessage(Localize("Error"), str_comp(pError, "error loading demo") ? pError : Localize("Error loading demo"), Localize("Ok"));
}
}
else if(m_Popup == POPUP_REMOVE_FRIEND) else if(m_Popup == POPUP_REMOVE_FRIEND)
{ {
CUIRect Yes, No; CUIRect Yes, No;

1
src/game/client/components/menus.h
View file

@ -398,6 +398,7 @@ public:
POPUP_DELETE_DEMO, POPUP_DELETE_DEMO,
POPUP_RENAME_DEMO, POPUP_RENAME_DEMO,
POPUP_RENDER_DEMO, POPUP_RENDER_DEMO,
POPUP_REPLACE_VIDEO,
POPUP_REMOVE_FRIEND, POPUP_REMOVE_FRIEND,
POPUP_SOUNDERROR, POPUP_SOUNDERROR,
POPUP_PASSWORD, POPUP_PASSWORD,