Fix several typos - patch by Kunda Ki

Differential Revision: https://phabricator.kde.org/D11742
parent 39a4d418
......@@ -89,7 +89,7 @@
* fix crash on audiofiles
* fix crash on opening project file with images
* fix warnings from static analyzers (cppcheck, krazy)
* sort source files, easier to understand (for new developpers)
* sort source files, easier to understand (for new developers)
0.9.8
Changes:
......@@ -103,7 +103,7 @@
Bug fix:
* Code cleanup (use const ref, fix includes, mem leaks, optimize...)
* Fix warnings from gcc, cppcheck, clang, scan-build: fixes many crashs & leaks
* Fix warnings from gcc, cppcheck, clang, scan-build: fixes many crashes & leaks
* Fix keyframing messed up for some effects
* Fix timeline corruption when trying to move clip before 0
* Fix crash when closing title widget
......@@ -278,7 +278,7 @@
* Remove the "avformat-novalidate" trick for faster loading, caused crash. (#2205)
* Allow to assign a shortcut to usage of proxies in project.
* Use separate thread for generation of timeline thumbnails when zoom is at frame level to keep UI responsive.
* Allow to use JScript in render profile parameter values. Values that need evalutation need to be indicated by '%'.
* Allow to use JScript in render profile parameter values. Values that need evaluation need to be indicated by '%'.
* Check for missing proxies on document opening.
* Check document for invalid (overlapping) transitions.
* Check for duration mismatch in clip producers when opening a document (can cause corruption).
......
......@@ -51,7 +51,7 @@ The rest:
- attribute "name": MLT filter parameter name
- attribute "paramprefix": a string to be prepended to the parameter value before passing it to MLT
- attribute "default": initial value, format depends on parameter type
- attribue "optional": if it is set, it means that this parameter can have an empty value. So then loading a project, don't set its value to default
- attribute "optional": if it is set, it means that this parameter can have an empty value. So then loading a project, don't set its value to default
- attribute "type": widget (GUI) to use
- "fixed":
- sets a (MLT filter) parameter, but does not expose it to the user (no GUI)
......@@ -66,7 +66,7 @@ The rest:
- "suffix": (optional) displayed unit of the values
- "double":
- synonym for "constant"
- "bool":
- "bool":
- true/false
- represented by a checkbox
- "switch":
......@@ -77,7 +77,7 @@ The rest:
- represented by a drop-down menu
- additional parameter attribute:
- "paramlist": list of possible values separated by semicolon (no whitespaces!)
- addtional tag:
- additional tag:
- "paramlistdisplay": (optional) list of names to use for the values separated by comma
- "position":
- time stored as frame number
......@@ -89,7 +89,7 @@ The rest:
- "alpha": (default = "0") use to enable alpha support
- "keyframe":
- keyframable number
- keyframes are opt-in (only one keyframe by default -> should be prefered over "constant" whenever possible)
- keyframes are opt-in (only one keyframe by default -> should be preferred over "constant" whenever possible)
- works with MLT filters that utilize start/end values
- same attributes as "constant"
- additional attributes:
......
......@@ -18,7 +18,7 @@ Document to open
.SS Options:
.TP
.B \-\-mlt\-path <path>
Set the path for MLT environnement
Set the path for MLT environment
.TP
.B \-\-mlt\-log <verbose/debug>
Set MLT log level
......
......@@ -48,7 +48,7 @@ export LD_LIBRARY_PATH=/usr/lib64/:/usr/lib:/app/usr/lib:$QTDIR/lib/:/opt/python
#export LD_LIBRARY_PATH=/usr/lib64/:/usr/lib:/app/usr/lib:$QTDIR/lib/:$LD_LIBRARY_PATH
# Workaround for: On CentOS 6, .pc files in /usr/lib/pkgconfig are not recognized
# However, this is where .pc files get installed when bulding libraries... (FIXME)
# However, this is where .pc files get installed when building libraries... (FIXME)
# I found this by comparing the output of librevenge's "make install" command
# between Ubuntu and CentOS 6
......
......@@ -50,7 +50,7 @@ export LD_LIBRARY_PATH=/usr/lib64/:/usr/lib:/app/usr/lib:$QTDIR/lib/:/opt/python
#export LD_LIBRARY_PATH=/usr/lib64/:/usr/lib:/app/usr/lib:$QTDIR/lib/:$LD_LIBRARY_PATH
# Workaround for: On CentOS 6, .pc files in /usr/lib/pkgconfig are not recognized
# However, this is where .pc files get installed when bulding libraries... (FIXME)
# However, this is where .pc files get installed when building libraries... (FIXME)
# I found this by comparing the output of librevenge's "make install" command
# between Ubuntu and CentOS 6
......
......@@ -150,7 +150,7 @@ protected:
void deregisterSelf();
/* @brief Reflect update of the parent ptr (for example set the correct depth)
This is meant to be overriden in derived classes
This is meant to be overridden in derived classes
@param ptr is the pointer to the new parent
*/
virtual void updateParent(std::shared_ptr<TreeItem> parent);
......
......@@ -310,7 +310,7 @@ bool KeyframeModel::updateKeyframe(GenTime pos, QVariant value, Fun &undo, Fun &
Q_ASSERT(m_keyframeList.count(pos) > 0);
KeyframeType type = m_keyframeList[pos].first;
QVariant oldValue = m_keyframeList[pos].second;
// Chek if keyframe is different
// Check if keyframe is different
if (m_paramType == ParamType::KeyframeParam) {
if (qFuzzyCompare(oldValue.toDouble(), value.toDouble())) return true;
}
......@@ -399,7 +399,7 @@ Fun KeyframeModel::updateKeyframe_lambda(GenTime pos, KeyframeType type, QVarian
{
QWriteLocker locker(&m_lock);
return [this, pos, type, value, notify]() {
qDebug() << "udpate lambda" << pos.frames(pCore->getCurrentFps()) << value << notify;
qDebug() << "update lambda" << pos.frames(pCore->getCurrentFps()) << value << notify;
Q_ASSERT(m_keyframeList.count(pos) > 0);
int row = static_cast<int>(std::distance(m_keyframeList.begin(), m_keyframeList.find(pos)));
m_keyframeList[pos].first = type;
......
......@@ -32,7 +32,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
class Monitor;
class AssetParameterModel;
/** @brief This class helps manage effects that recieve data from the monitor's qml overlay to translate
/** @brief This class helps manage effects that receive data from the monitor's qml overlay to translate
the data and pass it to the model
*/
......
......@@ -196,7 +196,7 @@ protected:
signals:
void modelChanged();
/** @brief inform child effects (in case of bin effect with timeline producers)
* that a change occured and a param update is needed **/
* that a change occurred and a param update is needed **/
void updateChildren(const QString &name);
void compositionTrackChanged();
void replugEffect(std::shared_ptr<AssetParameterModel> asset);
......
......@@ -63,7 +63,7 @@ void AssetParameterView::setModel(const std::shared_ptr<AssetParameterModel> &mo
auto type = model->data(index, AssetParameterModel::TypeRole).value<ParamType>();
if (m_mainKeyframeWidget &&
(type == ParamType::Geometry || type == ParamType::Animated || type == ParamType::RestrictedAnim || type == ParamType::KeyframeParam)) {
// Keyframe widget can have some extra params that should'nt build a new widget
// Keyframe widget can have some extra params that shouldn't build a new widget
qDebug() << "// FOUND ADDED PARAM";
m_mainKeyframeWidget->addParameter(index);
} else {
......@@ -98,7 +98,7 @@ void AssetParameterView::resetValues()
}
m_model->setParameter(name, defaultValue);
if (m_mainKeyframeWidget) {
// Handles additionnal params like rotation so only refresh initial param at the end
// Handles additional params like rotation so only refresh initial param at the end
} else if (type == ParamType::ColorWheel) {
if (i == m_model->rowCount() - 1) {
// Special case, the ColorWheel widget handles several params, so only refresh once when all parameters were set.
......
......@@ -65,13 +65,13 @@ signals:
public slots:
/** @brief Toggle the comments on or off
*/
virtual void slotShowComment(bool) { qDebug() << "DEBUG: show_comment not correctly overriden"; }
virtual void slotShowComment(bool) { qDebug() << "DEBUG: show_comment not correctly overridden"; }
/** @brief refresh the properties to reflect changes in the model
*/
virtual void slotRefresh() = 0;
/** @brief intialize qml keyframe view after creating it
/** @brief initialize qml keyframe view after creating it
*/
virtual void slotInitMonitor(bool /*active*/) {}
......
......@@ -49,7 +49,7 @@ public slots:
*/
void slotRefresh() override;
/** @brief intialize qml overlay
/** @brief initialize qml overlay
*/
void slotInitMonitor(bool active) override;
......
......@@ -64,7 +64,7 @@ public:
public slots:
void slotRefresh() override;
/** @brief intialize qml overlay
/** @brief initialize qml overlay
*/
void slotInitMonitor(bool active) override;
......
......@@ -36,7 +36,7 @@ public:
/** @brief Constructor for the widgetComment
@param name String containing the name of the parameter
@param comment Optional string containing the comment associated to the parameter
@param checked Boolean indicating wether the checkbox should initially be checked
@param checked Boolean indicating whether the checkbox should initially be checked
@param parent Parent widget
*/
SwitchParamWidget(std::shared_ptr<AssetParameterModel> model, QModelIndex index, QWidget *parent);
......
......@@ -36,7 +36,7 @@ public:
/** @brief Constructor for the widgetComment
@param name String containing the name of the parameter
@param comment Optional string containing the comment associated to the parameter
@param checked Boolean indicating wether the checkbox should initially be checked
@param checked Boolean indicating whether the checkbox should initially be checked
@param parent Parent widget
*/
UrlParamWidget(std::shared_ptr<AssetParameterModel> model, QModelIndex index, QWidget *parent);
......
......@@ -2228,7 +2228,7 @@ void Bin::slotItemDropped(const QList<QUrl> &urls, const QModelIndex &parent)
{
QString parentFolder = m_itemModel->getRootFolder()->clipId();
if (parent.isValid()) {
// Check if drop occured on a folder
// Check if drop occurred on a folder
std::shared_ptr<AbstractProjectItem> parentItem = m_itemModel->getBinItemByIndex(parent);
while (parentItem->itemType() != AbstractProjectItem::FolderItem) {
parentItem = parentItem->parent();
......
......@@ -58,7 +58,7 @@ public:
enum { CommentRole = Qt::UserRole + 1, PosRole, FrameRole, ColorRole, TypeRole };
/* @brief Adds a marker at the given position. If there is already one, the comment will be overriden
/* @brief Adds a marker at the given position. If there is already one, the comment will be overridden
@param pos defines the position of the marker, relative to the clip
@param comment is the text associated with the marker
@param type is the type (color) associated with the marker. If -1 is passed, then the value is pulled from kdenlive's defaults
......@@ -129,9 +129,9 @@ public:
public slots:
/* @brief Imports a list of markers from json data
The data should be formated as follows:
The data should be formatted as follows:
[{"pos":0.2, "comment":"marker 1", "type":1}, {...}, ...]
return true on succes and logs undo object
return true on success and logs undo object
@param ignoreConflicts: if set to false, it aborts if the data contains a marker with same position but different comment and/or type. If set to true,
such markers are overridden silently
@param pushUndo: if true, create an undo object
......
......@@ -737,7 +737,7 @@ bool ProjectItemModel::loadFolders(Mlt::Properties &folders)
std::unordered_map<int, std::vector<int>> downLinks; // key are parents, value are children
std::unordered_map<int, int> upLinks; // key are children, value are parent
std::unordered_map<int, QString> newIds; // we store the correspondance to the new ids
std::unordered_map<int, QString> newIds; // we store the correspondence to the new ids
std::unordered_map<int, QString> folderNames;
newIds[-1] = getRootFolder()->clipId();
......
......@@ -106,7 +106,7 @@ void Core::build(const QString &MltPath)
ClipController::mediaUnavailable->set("length", 99999999);
m_self->m_projectItemModel = ProjectItemModel::construct();
// Job manger must be created before bin to correctly connect
// Job manager must be created before bin to correctly connect
m_self->m_jobManager.reset(new JobManager(m_self.get()));
}
......
......@@ -70,7 +70,7 @@ public:
/**
* @brief Init the GUI part of the app and show the main window
* @param Url (optional) file to open
* If Url is present, it will be opened, otherwhise, if openlastproject is
* If Url is present, it will be opened, otherwise, if openlastproject is
* set, latest project will be opened. If no file is open after trying this,
* a default new file will be created. */
void initGUI(const QUrl &Url);
......
......@@ -78,7 +78,7 @@ private:
void fixClipItem(QTreeWidgetItem *child, const QDomNodeList &producers, const QDomNodeList &trans);
void fixSourceClipItem(QTreeWidgetItem *child, const QDomNodeList &producers);
void fixProxyClip(const QString &id, const QString &oldUrl, const QString &newUrl, const QDomNodeList &producers);
/** @brief Returns list of transitions containg luma files */
/** @brief Returns list of transitions containing luma files */
QMap <QString, QString> getLumaPairs() const;
};
......
......@@ -156,7 +156,7 @@ public:
const QString documentRoot() const;
/** @brief Returns true if timeline preview settings changed*/
bool updatePreviewSettings(const QString &profile);
/** @brief Returns the recommanded proxy profile parameters */
/** @brief Returns the recommended proxy profile parameters */
QString getAutoProxyProfile();
private:
......@@ -171,10 +171,10 @@ private:
/** @brief Tells whether the current document has been changed after being saved. */
bool m_modified;
/** @brief The default recommanded proxy extension */
/** @brief The default recommended proxy extension */
QString m_proxyExtension;
/** @brief The default recommanded proxy params */
/** @brief The default recommended proxy params */
QString m_proxyParams;
/** @brief Tells whether the current document was modified by Kdenlive on opening, and a backup should be created on save. */
......@@ -210,7 +210,7 @@ public slots:
/** @brief Sets the document as modified or up to date.
* @description If crash recovery is turned on, a timer calls KdenliveDoc::slotAutoSave() \n
* Emits docModified conected to MainWindow::slotUpdateDocumentState \n
* Emits docModified connected to MainWindow::slotUpdateDocumentState \n
* @param mod (optional) true if the document has to be saved */
void setModified(bool mod = true);
void slotProxyCurrentItem(bool doProxy, QList<std::shared_ptr<ProjectClip>> clipList = QList<std::shared_ptr<ProjectClip>>(), bool force = false,
......
......@@ -48,7 +48,7 @@ class EffectStackModel : public AbstractTreeModel
Q_OBJECT
public:
/* @brief Constructs an effect stack and returns a shared ptr to the constucted object
/* @brief Constructs an effect stack and returns a shared ptr to the constructed object
@param service is the mlt object on which we will plant the effects
@param ownerId is some information about the actual object to which the effects are applied
*/
......
......@@ -43,7 +43,7 @@ void DraggableLabel::mousePressEvent(QMouseEvent *ev)
void DraggableLabel::mouseReleaseEvent(QMouseEvent *ev)
{
// Don't call mouserelease in cas of drag because label might be deleted by a drop
// Don't call mouserelease in case of drag because label might be deleted by a drop
if (!m_dragStarted)
QLabel::mouseReleaseEvent(ev);
else
......
......@@ -57,7 +57,7 @@ struct Job_t
QString m_undoString;
int m_id;
bool m_processed = false; // flag that we set to true when we are done with this job
bool m_failed = false; // flag that we set to true when a problem occured
bool m_failed = false; // flag that we set to true when a problem occurred
};
class AudioThumbJob;
......
......@@ -138,7 +138,7 @@ bool ProxyJob::startJob()
mltParameters.append(QStringLiteral("real_time=-%1").arg(threadCount));
mltParameters.append(QStringLiteral("threads=%1").arg(threadCount));
// TODO: currently, when rendering an xml file through melt, the display ration is lost, so we enforce it manualy
// TODO: currently, when rendering an xml file through melt, the display ration is lost, so we enforce it manually
mltParameters << QStringLiteral("aspect=") + QLocale().toString(display_ratio);
// Ask for progress reporting
......
......@@ -85,7 +85,7 @@ int SpeedJob::prepareJob(std::shared_ptr<JobManager> ptr, const std::vector<QStr
QString mltfile = QFileInfo(binClip->url()).absoluteFilePath() + QStringLiteral(".mlt");
destinations[binId] = mltfile;
}
// Now we have to create the jobs objects. This is trickier than usual, since the parameters are differents for each job (each clip has its own
// Now we have to create the jobs objects. This is trickier than usual, since the parameters are different for each job (each clip has its own
// destination). We have to construct a lambda that does that.
auto createFn = [ dest = std::move(destinations), fSpeed = speed / 100.0 ](const QString &id)
......
......@@ -101,7 +101,7 @@ int StabilizeJob::prepareJob(std::shared_ptr<JobManager> ptr, const std::vector<
destinations[binId] = mltfile;
}
}
// Now we have to create the jobs objects. This is trickier than usual, since the parameters are differents for each job (each clip has its own
// Now we have to create the jobs objects. This is trickier than usual, since the parameters are different for each job (each clip has its own
// destination). We have to construct a lambda that does that.
auto createFn = [ dest = std::move(destinations), fName = std::move(filterName), fParams = std::move(filterParams) ](const QString &id)
......
......@@ -70,7 +70,7 @@ void JogShuttleAction::slotShuttlePos(int shuttle_pos)
void JogShuttleAction::slotButton(int button_id)
{
if (button_id >= m_actionMap.size() || m_actionMap[button_id].isEmpty()) {
// TODO(fleury): Shoudl this go to the status bar to inform the user ?
// TODO(fleury): Should this go to the status bar to inform the user ?
// qCDebug(KDENLIVE_LOG) << "No action applied for button: " << button_id;
return;
}
......
......@@ -30,11 +30,11 @@ public:
/**
@param mainTrackEnvelope Envelope of the reference track. Its
actual computation will be started in
this contructor
this constructor
(i.e. mainTrackEnvelope->StartComputeEnvelope()
will be called). The computation of the
envelop must not be started when passed
to this contructor
to this constructor
(i.e. mainTrackEnvelope->HasComputationStarted()
must return false).
*/
......
......@@ -117,7 +117,7 @@ void FFTCorrelation::convolve(const float *left, const int leftSize, const float
correlatedFFT[i].i = leftFFT[i].r * rightFFT[i].i + leftFFT[i].i * rightFFT[i].r;
}
// Inverse fourier tranformation to get the convolved data.
// Inverse fourier transformation to get the convolved data.
// Insert one element at the beginning to obtain the same result
// that we also get with the nested for loop correlation.
*out_convolved = 0;
......
......@@ -45,8 +45,8 @@ public:
used as a hash in the cache */
static const QString cfgSignature(const int size);
/** Calculates the Fourier Tranformation of the input audio frame.
The resulting values will be given in relative dezibel: The maximum power is 0 dB, lower powers have
/** Calculates the Fourier Transformation of the input audio frame.
The resulting values will be given in relative decibel: The maximum power is 0 dB, lower powers have
negative dB values.
* audioFrame: Interleaved format with #numChannels channels
* freqSpectrum: Array pointer to write the data into
......
......@@ -1674,7 +1674,7 @@ void MainWindow::slotEditProjectSettings()
project->projectTempFolder(), newProjectFolder));
}
if (answer == KMessageBox::Continue) {
// Proceeed with move
// Proceed with move
QString documentId = QDir::cleanPath(project->getDocumentProperty(QStringLiteral("documentid")));
bool ok;
documentId.toLongLong(&ok, 10);
......@@ -2246,7 +2246,7 @@ void MainWindow::slotDeleteAllClipMarkers()
}
bool ok = clip->getMarkerModel()->removeAllMarkers();
if (!ok) {
m_messageLabel->setMessage(i18n("An error occured while deleting markers"), ErrorMessage);
m_messageLabel->setMessage(i18n("An error occurred while deleting markers"), ErrorMessage);
return;
}
}
......
......@@ -430,7 +430,7 @@ private slots:
/** @brief Process keyframe data sent from a clip to effect / transition stack. */
void slotProcessImportKeyframes(GraphicsRectItem type, const QString &tag, const QString &keyframes);
/** @brief Move playhead to mouse curser position if defined key is pressed */
/** @brief Move playhead to mouse cursor position if defined key is pressed */
void slotAlignPlayheadToMousePos();
void slotThemeChanged(const QString &name);
......
......@@ -319,7 +319,7 @@ void ClipController::updateProducer(const std::shared_ptr<Mlt::Producer> &produc
} else {
m_effectStack->resetService(m_masterProducer);
emitProducerChanged(m_controllerBinId, producer);
// URL and name shoule not be updated otherwise when proxying a clip we cannot find back the original url
// URL and name should not be updated otherwise when proxying a clip we cannot find back the original url
/*m_url = QUrl::fromLocalFile(m_masterProducer->get("resource"));
if (m_url.isValid()) {
m_name = m_url.fileName();
......
......@@ -179,7 +179,7 @@ public:
const std::unique_ptr<AudioStreamInfo> &audioInfo() const;
/** @brief Returns true if audio thumbnails for this clip are cached */
bool m_audioThumbCreated;
/** @brief When replacing a producer, it is important that we keep some properties, for exemple force_ stuff and url for proxies
/** @brief When replacing a producer, it is important that we keep some properties, for example force_ stuff and url for proxies
* this method returns a list of properties that we want to keep when replacing a producer . */
static const char *getPassPropertiesList(bool passLength = true);
/** @brief Disable all Kdenlive effects on this clip */
......
......@@ -1105,7 +1105,7 @@ int GLWidget::reconfigureMulti(const QString &params, const QString &path, Mlt::
}
}
if (m_consumer->is_valid()) {
// buid sub consumers
// build sub consumers
// m_consumer->set("mlt_image_format", "yuv422");
reloadProfile();
int volume = KdenliveSettings::volume();
......
......@@ -1197,7 +1197,7 @@ void Monitor::slotForwardOneFrame(int diff)
void Monitor::seekCursor(int pos)
{
Q_UNUSED(pos)
// Deprecated shoud not be used, instead requestSeek
// Deprecated should not be used, instead requestSeek
/*if (m_ruler->slotNewValue(pos)) {
m_timePos->setValue(pos);
checkOverlay(pos);
......
......@@ -73,7 +73,7 @@ ClipStabilize::ClipStabilize(const std::vector<QString> &binIds, const QString &
<< QStringLiteral("maxangle,type,double,value,-1,min,-1,max,3.14,decimals,2,tooltip,max angle to rotate (in rad)")
<< QStringLiteral("crop,type,bool,value,0,min,0,max,1,tooltip,0 = keep border 1 = black background")
<< QStringLiteral("zoom,type,int,value,0,min,-500,max,500,tooltip,additional zoom during transform")
<< QStringLiteral("optzoom,type,bool,value,1,min,0,max,1,tooltip,use optimal zoom (calulated from transforms)")
<< QStringLiteral("optzoom,type,bool,value,1,min,0,max,1,tooltip,use optimal zoom (calculated from transforms)")
<< QStringLiteral("sharpen,type,double,value,0.8,min,0,max,1,decimals,1,tooltip,sharpen transformed image")
<< QStringLiteral("tripod,type,position,value,0,min,0,max,100000,tooltip,reference frame"));
......@@ -91,7 +91,7 @@ ClipStabilize::ClipStabilize(const std::vector<QString> &binIds, const QString &
QHash<QString, QString> val = hi.value();
if (val[QStringLiteral("type")] == QLatin1String("int") || val[QStringLiteral("type")] == QLatin1String("double")) {
DoubleWidget *dbl = new DoubleWidget(hi.key() /*name*/, val[QStringLiteral("value")].toDouble(), val[QStringLiteral("min")].toDouble(),
val[QStringLiteral("max")].toDouble(), val[QStringLiteral("value")].toDouble(),
val[QStringLiteral("max")].toDouble(), val[QStringLiteral("value")].toDouble(),
1,
/*default*/
QString(), /*comment*/
......
......@@ -51,7 +51,7 @@ class LoginDialog;
for this purpose but it responds to the URL that is used to connect with
"No document for
https://www.freesound.org/apiv2/oauth2/authorize/?client_id=3duhagdr874c&redirect_uri=https://www.freesound.org/home/app_permissions/permission_granted/&response_type=code"
The use of QWebView adds a dependancy on the KF5WebKit to kdenlive. Need install libkf5webkit5-dev package on ubuntu
The use of QWebView adds a dependency on the KF5WebKit to kdenlive. Need install libkf5webkit5-dev package on ubuntu
*/
class LoginDialog : public QDialog
{
......
......@@ -86,7 +86,7 @@ OAuth2::OAuth2(QWidget *parent)
/**
* @brief OAuth2::getClientID - returns QString of the "clientID"
* @return QString of the "clientID" which is a string that identifies the Kdenlive
* applicaiton to the freesound website when the request for authentication is made
* application to the freesound website when the request for authentication is made
*/
QString OAuth2::getClientID() const
{
......@@ -95,7 +95,7 @@ QString OAuth2::getClientID() const
/**
* @brief OAuth2::getClientSecret - returns QString of the "client secret"
* @return - QString of the "client secret" which is another string that identifies the Kdenlive
* applicaiton to the freesound website when the application asks for an access token
* application to the freesound website when the application asks for an access token
*/
QString OAuth2::getClientSecret() const
{
......
......@@ -44,7 +44,7 @@
#ifndef DOXYGEN_SHOULD_SKIP_THIS
static QString OAuth2_strClientSecret =
QStringLiteral("441d88374716e7a3503997151e4780566f007313"); // obtained when ttguy registered the kdenlive application with freesound
#endif /* DOXYGEN_SHOULD_SKIP_THIS ^^^ don't make this any more public than it is. This preprocessing directive makes the Doxygen documention ignore this line \
#endif /* DOXYGEN_SHOULD_SKIP_THIS ^^^ don't make this any more public than it is. This preprocessing directive makes the Doxygen documentation ignore this line \
*/
#ifdef QT5_USE_WEBKIT
......
......@@ -329,7 +329,7 @@ QImage Spectrogram::renderAudioScope(uint, const audioShortVector &audioFrame, c
FFTTools::WindowType windowType = (FFTTools::WindowType)ui->windowFunction->itemData(ui->windowFunction->currentIndex()).toInt();
m_fftTools.fftNormalized(audioFrame, 0, num_channels, freqSpectrum, windowType, fftWindow, 0);
// This methid might be called also when a simple refresh is required.
// This method might be called also when a simple refresh is required.
// In this case there is no data to append to the history. Only append new data.
QVector<float> spectrumVector(fftWindow / 2);
memcpy(spectrumVector.data(), &freqSpectrum[0], fftWindow / 2 * sizeof(float));
......
......@@ -72,7 +72,7 @@ int timeBase = round(framerate); //We don’t need the exact framerate anymore,
int hourFrames = timeBase*60*60; //Number of frames per hour (non-drop)
int minuteFrames = timeBase*60; //Number of frames per minute (non-drop)
int totalMinutes = (60*hours) + minutes; //Total number of minuts
int totalMinutes = (60*hours) + minutes; //Total number of minutes
int frameNumber = ((hourFrames * hours) + (minuteFrames * minutes) + (timeBase * seconds) + frames) - (dropFrames * (totalMinutes - (totalMinutes \ 10)));
return frameNumber;
......
......@@ -70,7 +70,7 @@ public:
/** @brief Returns the current input as a GenTime object. */
GenTime gentime() const;
/** @brief Returs the widget's timecode object. */
/** @brief Returns the widget's timecode object. */
Timecode timecode() const;
/** @brief Sets value's format to frames or HH:MM:SS:FF according to @param frametimecode.
......
......@@ -104,7 +104,7 @@ public:
QDomElement toXml(QDomDocument &document);
protected:
// helper fuctions that creates the lambda
// helper functions that creates the lambda
Fun setClipState_lambda(PlaylistState::ClipState state);
public:
......
......@@ -63,7 +63,7 @@ public:
*/
int getPlaytime() const override;
/* @brief Returns the id of the second track involved in the composition (a_track in mlt's vocabulary, the b_track beeing the track where the composition is
/* @brief Returns the id of the second track involved in the composition (a_track in mlt's vocabulary, the b_track being the track where the composition is
inserted)
*/
int getATrack() const;
......
......@@ -31,7 +31,7 @@
class TimelineItemModel;
/* @brief This class represents the group hiearchy. This is basically a tree structure
/* @brief This class represents the group hierarchy. This is basically a tree structure
In this class, we consider that a groupItem is either a clip or a group
*/
......
......@@ -98,12 +98,12 @@ protected:
/* Updates the stored position of the item
This function is meant to be called by the trackmodel, not directly by the user.
If you whish to actually move the item, use the requestMove slot.
If you wish to actually move the item, use the requestMove slot.
*/
void setPosition(int position);
/* Updates the stored track id of the item
This function is meant to be called by the timeline, not directly by the user.
If you whish to actually change the track the item, use the slot in the timeline
If you wish to actually change the track the item, use the slot in the timeline
slot.
*/
virtual void setCurrentTrackId(int tid);
......
......@@ -160,7 +160,7 @@ bool TimelineFunctions::requestClipCut(std::shared_ptr<TimelineItemModel> timeli
}
}
if (count > 0 && timeline->m_groups->isInGroup(clipId)) {
// we now split the group hiearchy.
// we now split the group hierarchy.
// As a splitting criterion, we compare start point with split position
auto criterion = [timeline, position](int cid) { return timeline->getClipPosition(cid) < position; };
bool res = true;
......@@ -410,7 +410,7 @@ bool TimelineFunctions::requestItemCopy(std::shared_ptr<TimelineItemModel> timel
}
mapping[id] = newId;
}
qDebug() << "Sucessful copy, coping groups...";
qDebug() << "Successful copy, coping groups...";
res = timeline->m_groups->copyGroups(mapping, undo, redo);
if (!res) {
bool undone = undo();
......
......@@ -34,7 +34,7 @@
Here the order of these sub-rows is unrelated to the chronological order of the clips,
but correspond to their Id order. For example, if you have three clips, with ids 12, 45 and 150, they will receive row index 0,1 and 2.
This is because the order actually doesn't matter since the clips are rendered based on their positions rather than their row order.
The id order has been choosed because it is consistant with a valid ordering of the clips.
The id order has been chosen because it is consistent with a valid ordering of the clips.
The columns are never used, so the data is always in column 0
An ModelIndex in the ItemModel consists of a row number, a column number, and a parent index. In our case, tracks have always an empty parent, and the clip
......@@ -110,7 +110,7 @@ public:
virtual void _resetView() override;
protected:
// This is an helper function that finishes a constuction of a freshly created TimelineItemModel
// This is an helper function that finishes a construction of a freshly created TimelineItemModel
static void finishConstruct(std::shared_ptr<TimelineItemModel> ptr, std::shared_ptr<MarkerListModel> guideModel);
};
#endif
......@@ -2056,10 +2056,10 @@ bool TimelineModel::requestCompositionInsertion(const QString &transitionId, int
return true;
};
bool res = requestCompositionMove(compositionId, trackId, compositionTrack, position, true, finalMove, local_undo, local_redo);
qDebug() << "trying to move" << trackId << "pos" << position << "succes " << res;
qDebug() << "trying to move" << trackId << "pos" << position << "success " << res;
if (res) {
res = requestItemResize(compositionId, length, true, true, local_undo, local_redo, true);
qDebug() << "trying to resize" << compositionId << "length" << length << "succes " << res;
qDebug() << "trying to resize" << compositionId << "length" << length << "success " << res;
}
if (!res) {
bool undone = local_undo();
......@@ -2386,7 +2386,7 @@ bool TimelineModel::checkConsistency()
}
// check consistency of track
if (!track->checkConsistency()) {
qDebug() << "Constistency check failed for track" << tck.first;
qDebug() << "Consistency check failed for track" << tck.first;
return false;
}
}
......
......@@ -89,7 +89,7 @@ class TrackModel;
Here the order of these sub-rows is unrelated to the chronological order of the clips,
but correspond to their Id order. For example, if you have three clips, with ids 12, 45 and 150, they will receive row index 0,1 and 2.
This is because the order actually doesn't matter since the clips are rendered based on their positions rather than their row order.
The id order has been choosed because it is consistant with a valid ordering of the clips.
The id order has been chosen because it is consistent with a valid ordering of the clips.
The columns are never used, so the data is always in column 0
An ModelIndex in the ItemModel consists of a row number, a column number, and a parent index. In our case, tracks have always an empty parent, and the clip
......@@ -318,7 +318,7 @@ public:
*/
int getPreviousVideoTrackIndex(int trackId) const;
/* @brief Retuns the Id of the corresponding audio track. If trackId corresponds to video1, this will return audio 1 and so on */
/* @brief Returns the Id of the corresponding audio track. If trackId corresponds to video1, this will return audio 1 and so on */
int getMirrorAudioTrackId(int trackId) const;
int getMirrorVideoTrackId(int trackId) const;
int getMirrorTrackId(int trackId) const;
......@@ -588,7 +588,7 @@ public:
@param clipId id of the target clip
@param speed: speed in percentage. 100 corresponds to original speed, 50 to half the speed
This functions create an undo object and also apply the effect to the corresponding audio if there is any.
Returns true on success, false otherwise (and nothing is modifed)
Returns true on success, false otherwise (and nothing is modified)
*/
bool requestClipTimeWarp(int clipId, double speed);
/* @brief Same function as above, but doesn't check for paired audio and accumulate undo/redo
......
......@@ -907,7 +907,7 @@ Fun TrackModel::requestCompositionResize_lambda(int compoId, int in, int out, bo
if (in == compo_position && (out == -1 || out == old_out)) {
return []() {
qDebug()<<"//// NO MOVE PERFORMES\n!!!!!!!!!!!!!!!!!!!!!!!!!!";
qDebug()<<"//// NO MOVE PERFORMED\n!!!!!!!!!!!!!!!!!!!!!!!!!!";