ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow keeping target name after changing resolution

Browse Source
This commit is contained in:
Benau 2017-03-22 12:44:32 +08:00
parent 9a69859c8f
commit 41e66bef37
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/graphics/irr_driver.cpp
View File

@ -1912,8 +1912,8 @@ void IrrDriver::setRecording(bool val)
{ {
std::string track_name = World::getWorld() != NULL ? std::string track_name = World::getWorld() != NULL ?
race_manager->getTrackName() : "menu"; race_manager->getTrackName() : "menu";
AVIWriter::getInstance()->setRecordingTarget(file_manager AVIWriter::setRecordingTarget(file_manager->getScreenshotDir() +
->getScreenshotDir() + track_name); track_name);
AVIWriter::getInstance()->resetFrameBufferImage(); AVIWriter::getInstance()->resetFrameBufferImage();
MessageQueue::add(MessageQueue::MT_GENERIC, MessageQueue::add(MessageQueue::MT_GENERIC,
_("Video recording started.")); _("Video recording started."));

1
src/utils/avi_writer.cpp
View File

@ -28,6 +28,7 @@
#include <jpeglib.h> #include <jpeglib.h>
#include <cstring> #include <cstring>
Synchronised<std::string> AVIWriter::m_recording_target("");
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
AVIWriter::AVIWriter() : m_idle(true) AVIWriter::AVIWriter() : m_idle(true)
{ {

10
src/utils/avi_writer.hpp
View File

@ -167,7 +167,7 @@ class AVIWriter : public CanBeDeleted, public NoCopy,
private: private:
FILE* m_file; FILE* m_file;
Synchronised<std::string> m_recording_target; static Synchronised<std::string> m_recording_target;
std::string m_filename; std::string m_filename;
@ -241,6 +241,11 @@ public:
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
static void* startRoutine(void *obj); static void* startRoutine(void *obj);
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
static void setRecordingTarget(const std::string& name)
{
m_recording_target.setAtomic(name);
}
// ------------------------------------------------------------------------
void captureFrameBufferImage(float dt); void captureFrameBufferImage(float dt);
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
void resetFrameBufferImage(); void resetFrameBufferImage();
@ -248,9 +253,6 @@ public:
void resetCaptureFormat(); void resetCaptureFormat();
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
void stopRecording() { addFrameBufferImage(NULL, -1); } void stopRecording() { addFrameBufferImage(NULL, -1); }
// ------------------------------------------------------------------------
void setRecordingTarget(const std::string& name)
{ m_recording_target.setAtomic(name); }
}; };