Merge branch 'master' of https://github.com/olive-editor/olive
This commit is contained in:
@@ -8,12 +8,26 @@ Olive is a free non-linear video editor for Windows, macOS, and Linux.
|
|||||||
|
|
||||||
**NOTE: The issue tracker is temporarily closed while Olive's core is getting rewritten. We apologize for any inconvenience. Please check back soon for the next release, as well as the [Patreon page](https://www.patreon.com/olivevideoeditor) for news and updates.**
|
**NOTE: The issue tracker is temporarily closed while Olive's core is getting rewritten. We apologize for any inconvenience. Please check back soon for the next release, as well as the [Patreon page](https://www.patreon.com/olivevideoeditor) for news and updates.**
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## Getting Started with Olive:
|
||||||
|
|
||||||
|
Installation of Olive is available at: https://olivevideoeditor.org/download.php
|
||||||
|
|
||||||
|
Instructions on how to use Olive are available on our wiki: https://github.com/olive-editor/olive/wiki/Overview-Guide
|
||||||
|
|
||||||
|
**NOTE: Olive is Alpha Software, and it should be treated as highly unstable. Work at your own risk.**
|
||||||
|
|
||||||
|
## Support Olive:
|
||||||
|
|
||||||
Please consider supporting Olive:
|
Please consider supporting Olive:
|
||||||
|
|
||||||
[](https://www.patreon.com/olivevideoeditor)
|
[](https://www.patreon.com/olivevideoeditor)
|
||||||
|
|
||||||
**NOTE: It is strongly discouraged to use or compile the `master` branch in its current state as it's under heavy restructuring. Please use the 0.1.x code from the "Releases" tab instead.**
|
**NOTE: It is strongly discouraged to use or compile the `master` branch in its current state as it's under heavy restructuring. Please use the 0.1.x code from the "Releases" tab instead.**
|
||||||
|
|
||||||
|
## Compiling from Source:
|
||||||
|
|
||||||
Compiling instructions for Windows, macOS, and Linux can be found [on the main site](https://olivevideoeditor.org/compile.php).
|
Compiling instructions for Windows, macOS, and Linux can be found [on the main site](https://olivevideoeditor.org/compile.php).
|
||||||
|
|
||||||
Olive has Doxygen-compatible documentation hosted at http://olivevideoeditor.org/doxygen/. You can also run `doxygen` in the source root directory to generate a local copy.
|
Olive has Doxygen-compatible documentation hosted at http://olivevideoeditor.org/doxygen/. You can also run `doxygen` in the source root directory to generate a local copy.
|
||||||
|
|||||||
@@ -51,10 +51,7 @@ public:
|
|||||||
numer = intType(0);
|
numer = intType(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
rational(const rational &rhs)
|
rational(const rational &rhs) = default;
|
||||||
:numer(rhs.numer), denom(rhs.denom)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
rational(const AVRational& r);
|
rational(const AVRational& r);
|
||||||
|
|
||||||
|
|||||||
@@ -1,9 +1,5 @@
|
|||||||
#include "threadedobject.h"
|
#include "threadedobject.h"
|
||||||
|
|
||||||
ThreadedObject::ThreadedObject()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void ThreadedObject::LockDeletes()
|
void ThreadedObject::LockDeletes()
|
||||||
{
|
{
|
||||||
threadobj_delete_lock_++;
|
threadobj_delete_lock_++;
|
||||||
|
|||||||
@@ -6,7 +6,6 @@
|
|||||||
class ThreadedObject
|
class ThreadedObject
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ThreadedObject();
|
|
||||||
|
|
||||||
void LockMutex();
|
void LockMutex();
|
||||||
void UnlockMutex();
|
void UnlockMutex();
|
||||||
|
|||||||
@@ -1,9 +1,5 @@
|
|||||||
#include "timerange.h"
|
#include "timerange.h"
|
||||||
|
|
||||||
TimeRange::TimeRange()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
TimeRange::TimeRange(const rational &in, const rational &out) :
|
TimeRange::TimeRange(const rational &in, const rational &out) :
|
||||||
in_(in),
|
in_(in),
|
||||||
out_(out)
|
out_(out)
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
class TimeRange {
|
class TimeRange {
|
||||||
public:
|
public:
|
||||||
TimeRange();
|
TimeRange() = default;
|
||||||
TimeRange(const rational& in, const rational& out);
|
TimeRange(const rational& in, const rational& out);
|
||||||
|
|
||||||
const rational& in() const;
|
const rational& in() const;
|
||||||
|
|||||||
Reference in New Issue
Block a user