Skip to content

Commit

Permalink
- minor changes
Browse files Browse the repository at this point in the history
  • Loading branch information
TimGroeneboom committed Aug 27, 2024
1 parent 7c3fd05 commit 536aa50
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion system_modules/napsequence/src/sequenceplayer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ namespace nap
}


bool SequencePlayer::loadBinary(const std::vector<uint8>& buffer, utility::ErrorState& errorState)
bool SequencePlayer::loadBinary(const std::vector<nap::uint8>& buffer, utility::ErrorState& errorState)
{
std::lock_guard<std::mutex> lock(mMutex);
rtti::DeserializeResult result;
Expand Down
2 changes: 1 addition & 1 deletion system_modules/napsequence/src/sequenceplayer.h
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ namespace nap
* @param errorState contains error upon failure
* @return true on success
*/
bool loadBinary(const std::vector<glm::uint8>& buffer, utility::ErrorState& errorState);
bool loadBinary(const std::vector<nap::uint8>& buffer, utility::ErrorState& errorState);

/**
* Play or stop the player. Note that player can still be paused, so adapters will be called but time will not advance
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */

#include "sequencetracksegmentduration.h"

RTTI_BEGIN_CLASS_NO_DEFAULT_CONSTRUCTOR(nap::SequenceTrackSegmentDuration, "Part of a track")
Expand Down
2 changes: 0 additions & 2 deletions system_modules/napsequencegui/src/sequenceeditorguiactions.h
Original file line number Diff line number Diff line change
Expand Up @@ -542,7 +542,6 @@ namespace nap
class NAPAPI OpenHistoryPopup : public Action
{
RTTI_ENABLE(Action)
public:
};

/**
Expand All @@ -551,7 +550,6 @@ namespace nap
class NAPAPI SelectHistoryPopup : public Action
{
RTTI_ENABLE(Action)
public:
};

/**
Expand Down

6 comments on commit 536aa50

@cklosters
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TeamCity Public / Package NAP Linux Build 250 is now running

@cklosters
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TeamCity Public / Package NAP Linux Build 250 outcome was FAILURE
Summary: Exit code 1 (Step: Package NAP Linux (Command Line)) (new) Build time: 00:10:43

@cklosters
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TeamCity Public / Package NAP Win64 Build 253 is now running

@cklosters
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TeamCity Public / Package NAP Win64 Build 253 outcome was FAILURE
Summary: Exit code 1 (Step: Package NAP Win64 (Command Line)) (new) Build time: 00:08:52

@cklosters
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TeamCity Public / Package NAP Raspberry Pi Build 1725 is now running

@cklosters
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TeamCity Public / Package NAP Raspberry Pi Build 1725 outcome was FAILURE
Summary: Exit code 1 (Step: Package NAP Linux (Command Line)) (new) Build time: 00:40:44

Please sign in to comment.