minor code cleanups
This commit is contained in:
@@ -93,6 +93,8 @@ bool Decoder::ProbeMedia(Footage *f)
|
||||
|
||||
if (decoder->Probe(f)) {
|
||||
|
||||
|
||||
|
||||
// We found a Decoder, so we can set this media as valid
|
||||
f->set_status(Footage::kReady);
|
||||
|
||||
|
||||
@@ -390,10 +390,7 @@ bool FFmpegDecoder::Probe(Footage *f)
|
||||
break;
|
||||
|
||||
// We should never realistically get here, but we make an "invalid" stream just in case
|
||||
// We don't use a "default:" in case more AVMEDIA_TYPEs get introduced in later APIs that need handling
|
||||
case AVMEDIA_TYPE_NB:
|
||||
case AVMEDIA_TYPE_VIDEO:
|
||||
case AVMEDIA_TYPE_AUDIO:
|
||||
default:
|
||||
str->set_type(Stream::kUnknown);
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -58,6 +58,7 @@ bool ImportTask::Action()
|
||||
return true;
|
||||
}
|
||||
|
||||
// FIXME: This should be run in the main thread somehow
|
||||
olive::undo_stack.push(command);
|
||||
|
||||
return true;
|
||||
|
||||
@@ -93,11 +93,6 @@ void Task::AddDependency(Task *dependency)
|
||||
dependencies_.append(dependency);
|
||||
}
|
||||
|
||||
void Task::EmitRemovedSignal()
|
||||
{
|
||||
emit Removed();
|
||||
}
|
||||
|
||||
void Task::ResetState()
|
||||
{
|
||||
if (status_ == kWaiting) {
|
||||
|
||||
@@ -140,11 +140,6 @@ public:
|
||||
*/
|
||||
void AddDependency(Task* dependency);
|
||||
|
||||
/**
|
||||
* @brief Emit the Removed() signal when this Task is about to get removed
|
||||
*/
|
||||
void EmitRemovedSignal();
|
||||
|
||||
/**
|
||||
* @brief Reset this Task back to the waiting state
|
||||
*/
|
||||
|
||||
@@ -97,7 +97,7 @@ void TaskManager::DeleteTask(Task *t)
|
||||
// Remove instances of Task from queue
|
||||
for (int i=0;i<tasks_.size();i++) {
|
||||
if (tasks_.at(i).get() == t) {
|
||||
t->EmitRemovedSignal();
|
||||
emit t->Removed();
|
||||
tasks_.removeAt(i);
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -27,6 +27,7 @@
|
||||
#include "panel/node/node.h"
|
||||
#include "panel/param/param.h"
|
||||
#include "panel/project/project.h"
|
||||
#include "panel/taskmanager/taskmanager.h"
|
||||
#include "panel/timeline/timeline.h"
|
||||
#include "panel/tool/tool.h"
|
||||
#include "panel/viewer/viewer.h"
|
||||
|
||||
Reference in New Issue
Block a user