From 424193706985c4968033cd2bb047a037643df08c Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Sun, 30 Jun 2019 12:13:00 -0700 Subject: [PATCH] license and documentation for task --- app/task/import/import.cpp | 20 +++++++ app/task/import/import.h | 20 +++++++ app/task/probe/probe.cpp | 20 +++++++ app/task/probe/probe.h | 20 +++++++ app/task/task.cpp | 7 +++ app/task/task.h | 119 +++++++++++++++++++++++++++++++++++++ app/task/taskthread.cpp | 20 +++++++ app/task/taskthread.h | 20 +++++++ 8 files changed, 246 insertions(+) diff --git a/app/task/import/import.cpp b/app/task/import/import.cpp index 0c10d91de..efb4b5cbc 100644 --- a/app/task/import/import.cpp +++ b/app/task/import/import.cpp @@ -1,3 +1,23 @@ +/*** + + Olive - Non-Linear Video Editor + Copyright (C) 2019 Olive Team + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +***/ + #include "import.h" #include diff --git a/app/task/import/import.h b/app/task/import/import.h index ddfcc63a2..4ed22f9d9 100644 --- a/app/task/import/import.h +++ b/app/task/import/import.h @@ -1,3 +1,23 @@ +/*** + + Olive - Non-Linear Video Editor + Copyright (C) 2019 Olive Team + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +***/ + #ifndef IMPORT_H #define IMPORT_H diff --git a/app/task/probe/probe.cpp b/app/task/probe/probe.cpp index 28f325c0b..06e644e8f 100644 --- a/app/task/probe/probe.cpp +++ b/app/task/probe/probe.cpp @@ -1,3 +1,23 @@ +/*** + + Olive - Non-Linear Video Editor + Copyright (C) 2019 Olive Team + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +***/ + #include "probe.h" #include diff --git a/app/task/probe/probe.h b/app/task/probe/probe.h index 0c4a5069e..c0244aceb 100644 --- a/app/task/probe/probe.h +++ b/app/task/probe/probe.h @@ -1,3 +1,23 @@ +/*** + + Olive - Non-Linear Video Editor + Copyright (C) 2019 Olive Team + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +***/ + #ifndef PROBE_H #define PROBE_H diff --git a/app/task/task.cpp b/app/task/task.cpp index 62adf3742..34e3f17f6 100644 --- a/app/task/task.cpp +++ b/app/task/task.cpp @@ -30,6 +30,11 @@ Task::Task() : bool Task::Start() { + // Tasks can only start if they're waiting + if (status_ != kWaiting) { + return false; + } + // Check if this task has any dependencies (tasks that should complete before this one starts) for (int i=0;i dependencies_; private slots: + /** + * @brief A slot when the inner thread completes either successfully or unsuccessfully + */ void ThreadComplete(); }; diff --git a/app/task/taskthread.cpp b/app/task/taskthread.cpp index 399f35dbb..234fbf8ef 100644 --- a/app/task/taskthread.cpp +++ b/app/task/taskthread.cpp @@ -1,3 +1,23 @@ +/*** + + Olive - Non-Linear Video Editor + Copyright (C) 2019 Olive Team + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +***/ + #include "taskthread.h" #include "task/task.h" diff --git a/app/task/taskthread.h b/app/task/taskthread.h index 983b6dcac..7fff196fd 100644 --- a/app/task/taskthread.h +++ b/app/task/taskthread.h @@ -1,3 +1,23 @@ +/*** + + Olive - Non-Linear Video Editor + Copyright (C) 2019 Olive Team + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +***/ + #ifndef TASKTHREAD_H #define TASKTHREAD_H