Skip to content

Commit

Permalink
Merge branch 'beta'
Browse files Browse the repository at this point in the history
  • Loading branch information
ggarra13 committed Oct 23, 2023
2 parents 0ccb8ab + 17aaf66 commit 1a444b6
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 23 deletions.
5 changes: 0 additions & 5 deletions bin/upload_sourceforge.sh
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,6 @@ ${date}.
It may contain bugs, new untested features and more.
It should work on Ubuntu 20.04+, Windows 8.1+ and macOS 11+.
This is unlike the official releases that work on Red Hat 8.1.
Also, the Windows release does not have USD support.
Its source code is at:
https://www.github.com/ggarra13/mrv2
Expand Down
1 change: 1 addition & 0 deletions mrv2/docs/HISTORY.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ v0.8.2
loaded instead of the mrv2 shipped libraries.
- Fixed sequence detection when the sequence would reach the number of padded
digits.
- Fixed Auto Playback working only for the first clip loaded.


v0.8.1
Expand Down
25 changes: 8 additions & 17 deletions mrv2/lib/mrvApp/App.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1227,17 +1227,15 @@ namespace mrv
_log(e.what(), log::Type::Error);
}
}

panel::refreshThumbnails();
}

void App::_activeCallback(
const std::vector<std::shared_ptr<FilesModelItem> >& items)
{
TLRENDER_P();

// Flag used to determine if clip was just loaded or we just switched
// from a compare or a file list change.
bool loaded = false;

if (!p.active.empty() && !p.timelinePlayers.empty() &&
p.timelinePlayers[0])
{
Expand Down Expand Up @@ -1315,9 +1313,13 @@ namespace mrv
item->ioInfo = mrvTimelinePlayer->ioInfo();
if (!item->init)
{
loaded = true;
item->init = true;
item->speed = mrvTimelinePlayer->speed();
if (ui->uiPrefs->uiPrefsAutoPlayback->value())
{
mrvTimelinePlayer->setPlayback(
timeline::Playback::Forward);
}
item->playback = mrvTimelinePlayer->playback();
item->loop = mrvTimelinePlayer->loop();
item->currentTime = mrvTimelinePlayer->currentTime();
Expand Down Expand Up @@ -1412,18 +1414,7 @@ namespace mrv

if (p.running)
{
if (loaded)
panel::refreshThumbnails();
else
panel::redrawThumbnails();
if (ui->uiPrefs->uiPrefsAutoPlayback->value() && loaded)
{
auto player = ui->uiView->getTimelinePlayer();
if (player &&
player->timeRange().duration().value() > 1.0)
ui->uiView->playForwards();
}
ui->uiMain->fill_menu(ui->uiMenuBar);
panel::redrawThumbnails();
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion tlRender

0 comments on commit 1a444b6

Please sign in to comment.