Skip to content

Commit

Permalink
Use regular ints
Browse files Browse the repository at this point in the history
  • Loading branch information
darbyjohnston committed Mar 31, 2024
1 parent 52de5dd commit 9a1a615
Show file tree
Hide file tree
Showing 7 changed files with 1,124 additions and 12 deletions.
4 changes: 2 additions & 2 deletions lib/tlQtWidget/TimelineWidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ namespace tl
return _p->timelineWidget->getItemOptions();
}

const std::vector<int64_t>& TimelineWidget::frameMarkers() const
const std::vector<int>& TimelineWidget::frameMarkers() const
{
return _p->timelineWidget->getFrameMarkers();
}
Expand Down Expand Up @@ -307,7 +307,7 @@ namespace tl
_p->timelineWidget->setItemOptions(value);
}

void TimelineWidget::setFrameMarkers(const std::vector<int64_t>& value)
void TimelineWidget::setFrameMarkers(const std::vector<int>& value)
{
_p->timelineWidget->setFrameMarkers(value);
}
Expand Down
4 changes: 2 additions & 2 deletions lib/tlQtWidget/TimelineWidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ namespace tl
const timelineui::ItemOptions& itemOptions() const;

//! Get the frame markers.
const std::vector<int64_t>& frameMarkers() const;
const std::vector<int>& frameMarkers() const;

QSize minimumSizeHint() const override;

Expand All @@ -86,7 +86,7 @@ namespace tl
void setItemOptions(const timelineui::ItemOptions&);

//! Set the frame markers.
void setFrameMarkers(const std::vector<int64_t>&);
void setFrameMarkers(const std::vector<int>&);

Q_SIGNALS:
//! This signal is emitted when the editable timeline is changed.
Expand Down
4 changes: 2 additions & 2 deletions lib/tlTimelineUI/TimelineItem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ namespace tl
timeline::PlayerCacheInfo cacheInfo;
bool editable = false;
bool stopOnScrub = true;
std::vector<int64_t> frameMarkers;
std::vector<int> frameMarkers;
std::shared_ptr<ui::ThumbnailGenerator> thumbnailGenerator;

struct Track
Expand Down Expand Up @@ -289,7 +289,7 @@ namespace tl
_p->stopOnScrub = value;
}

void TimelineItem::setFrameMarkers(const std::vector<int64_t>& value)
void TimelineItem::setFrameMarkers(const std::vector<int>& value)
{
TLRENDER_P();
if (value == p.frameMarkers)
Expand Down
Loading

0 comments on commit 9a1a615

Please sign in to comment.