eessppeelllloo/mapmap
1
0
Fork 0
mirror of https://github.com/mapmapteam/mapmap.git synced 2026-06-16 12:33:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflict

Browse Source
This commit is contained in:
baydam
2015-12-28 13:24:56 +00:00
parent 61528b3701 fc627b2306
commit b30d2fac05
6 changed files with 139 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MainWindow.cpp
+1
View File
@@ -2744,6 +2744,7 @@ bool MainWindow::setTextureVolume(int texture_id, double volume)
if (paint->getType() == "media")
{
Media *media = static_cast<Media*>(paint.data()); // FIXME: use sharedptr cast
//Media *media = (Media *) paint.data(); // FIXME: use sharedptr cast
videoTimer->stop();
media->setVolume(volume);
videoTimer->start();