Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 23:54:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Comments - still crashing...

Browse source
This commit is contained in:
Zach Fox 2016-11-09 12:33:37 -08:00
parent 1912ab1467
commit e656a4413f
1 changed files with 31 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
interface/src/Application.cpp
View file

@ -5444,51 +5444,65 @@ void Application::takeSnapshot(bool notify, const QString& format, float aspectR
player->setMedia(QUrl::fromLocalFile(inf.absoluteFilePath())); player->setMedia(QUrl::fromLocalFile(inf.absoluteFilePath()));
player->play(); player->play();
GifWriter _animatedSnapshotGifWriter;
uint8_t _currentAnimatedSnapshotFrame = 0;
QString path;
// If this is a still snapshot... // If this is a still snapshot...
if (!format.compare("still")) if (!format.compare("still"))
{ {
// Get a screenshot and save it. and - this part of the code has been around for a while // Get a screenshot and save it
path = Snapshot::saveSnapshot(getActiveDisplayPlugin()->getScreenshot(aspectRatio)); QString path = Snapshot::saveSnapshot(getActiveDisplayPlugin()->getScreenshot(aspectRatio));
// Notify the window scripting interface that we've taken a Snapshot
emit DependencyManager::get<WindowScriptingInterface>()->snapshotTaken(path, notify);
} }
// If this is an animated snapshot (GIF)... // If this is an animated snapshot (GIF)...
else if (!format.compare("animated")) else if (!format.compare("animated"))
{ {
GifWriter _animatedSnapshotGifWriter;
uint8_t _currentAnimatedSnapshotFrame = 0;
// File path stuff -- lots of this is temporary
// until I figure out how to save the .GIF to the same location as the still .JPG
char* cstr; char* cstr;
// File path stuff QString path = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation); // Get the desktop
path = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation); path.append(QDir::separator()); // Add the dir separator to the desktop location
path.append(QDir::separator()); path.append("test.gif"); // Add "test.gif" to the path
path.append("test.gif"); string fname = path.toStdString(); // Turn the QString into a regular string
string fname = path.toStdString(); cstr = new char[fname.size() + 1]; // Create a new character array to hold the .GIF file location
cstr = new char[fname.size() + 1]; strcpy(cstr, fname.c_str()); // Copy the string into a character array
strcpy(cstr, fname.c_str());
connect(&animatedSnapshotTimer, &QTimer::timeout, [&] { // Connect the animatedSnapshotTimer QTimer to the lambda slot function
connect(&animatedSnapshotTimer, &QTimer::timeout, [&]() {
// If this is the last frame...
if (_currentAnimatedSnapshotFrame == SNAPSNOT_ANIMATED_NUM_FRAMES) if (_currentAnimatedSnapshotFrame == SNAPSNOT_ANIMATED_NUM_FRAMES)
{ {
// Stop the snapshot QTimer
animatedSnapshotTimer.stop(); animatedSnapshotTimer.stop();
// Write out the end of the GIF
GifEnd(&_animatedSnapshotGifWriter); GifEnd(&_animatedSnapshotGifWriter);
// Notify the Window Scripting Interface that the snapshot was taken
emit DependencyManager::get<WindowScriptingInterface>()->snapshotTaken(path, false); emit DependencyManager::get<WindowScriptingInterface>()->snapshotTaken(path, false);
return; return;
} }
QImage frame = (getActiveDisplayPlugin()->getScreenshot(aspectRatio)).scaledToWidth(SNAPSNOT_ANIMATED_WIDTH).convertToFormat(QImage::Format_RGBA8888); // Get a screenshot from the display, then scale the screenshot down,
// then convert it to the image format the GIF library needs,
// then save all that to the QImage named "frame"
QImage frame = (qApp->getActiveDisplayPlugin()->getScreenshot(aspectRatio)).scaledToWidth(SNAPSNOT_ANIMATED_WIDTH).convertToFormat(QImage::Format_RGBA8888);
// If this is the first frame...
if (_currentAnimatedSnapshotFrame == 0) if (_currentAnimatedSnapshotFrame == 0)
{ {
// Write out the header and beginning of the GIF file
GifBegin(&_animatedSnapshotGifWriter, cstr, frame.width(), frame.height(), SNAPSNOT_ANIMATED_FRAME_DELAY); GifBegin(&_animatedSnapshotGifWriter, cstr, frame.width(), frame.height(), SNAPSNOT_ANIMATED_FRAME_DELAY);
} }
// Write the frame to the gif
GifWriteFrame(&_animatedSnapshotGifWriter, (uint8_t*)frame.bits(), frame.width(), frame.height(), SNAPSNOT_ANIMATED_FRAME_DELAY); GifWriteFrame(&_animatedSnapshotGifWriter, (uint8_t*)frame.bits(), frame.width(), frame.height(), SNAPSNOT_ANIMATED_FRAME_DELAY);
// Increment the current snapshot frame count
_currentAnimatedSnapshotFrame++; _currentAnimatedSnapshotFrame++;
}); });
// Start the animatedSnapshotTimer QTimer
animatedSnapshotTimer.start(SNAPSNOT_ANIMATED_FRAME_DELAY * 10); animatedSnapshotTimer.start(SNAPSNOT_ANIMATED_FRAME_DELAY * 10);
} }
// Notify the window scripting interface that we've taken a Snapshot
emit DependencyManager::get<WindowScriptingInterface>()->snapshotTaken(path, notify);
}); });
} }
void Application::shareSnapshot(const QString& path) { void Application::shareSnapshot(const QString& path) {