indentation fix
This commit is contained in:
@@ -30,16 +30,16 @@
|
||||
#include "project/effect.h"
|
||||
|
||||
class VoidEffect : public Effect {
|
||||
Q_OBJECT
|
||||
Q_OBJECT
|
||||
public:
|
||||
VoidEffect(Clip* c, const QString& n);
|
||||
VoidEffect(Clip* c, const QString& n);
|
||||
|
||||
virtual EffectPtr copy(Clip* c) override;
|
||||
virtual void load(QXmlStreamReader &stream) override;
|
||||
virtual void save(QXmlStreamWriter &stream) override;
|
||||
virtual EffectPtr copy(Clip* c) override;
|
||||
virtual void load(QXmlStreamReader &stream) override;
|
||||
virtual void save(QXmlStreamWriter &stream) override;
|
||||
private:
|
||||
QByteArray bytes;
|
||||
EffectMeta void_meta;
|
||||
QByteArray bytes;
|
||||
EffectMeta void_meta;
|
||||
};
|
||||
|
||||
#endif // VOIDEFFECT_H
|
||||
|
||||
@@ -40,11 +40,11 @@ MediaIconService::MediaIconService() {
|
||||
void MediaIconService::SetMediaIcon(Media *media, int icon_type) {
|
||||
// if this icon is already part of the throbber animation loop, remove it
|
||||
if (throbber_items_.contains(media)) {
|
||||
// throbber_lock_.lock();
|
||||
// throbber_lock_.lock();
|
||||
|
||||
throbber_items_.removeAll(media);
|
||||
|
||||
// throbber_lock_.unlock();
|
||||
// throbber_lock_.unlock();
|
||||
|
||||
// if we aren't animating anything, no need to run the timer for now
|
||||
if (throbber_items_.empty()) {
|
||||
@@ -90,13 +90,13 @@ void MediaIconService::AnimationUpdate() {
|
||||
|
||||
QIcon throbber_ico = QIcon(throbber_pixmap_.copy(kThrobberSize*throbber_animation_frame_, 0, kThrobberSize, kThrobberSize));
|
||||
|
||||
// throbber_lock_.lock();
|
||||
// throbber_lock_.lock();
|
||||
|
||||
for (int i=0;i<throbber_items_.size();i++) {
|
||||
olive::project_model.set_icon(throbber_items_.at(i), throbber_ico);
|
||||
}
|
||||
|
||||
// throbber_lock_.unlock();
|
||||
// throbber_lock_.unlock();
|
||||
|
||||
throbber_animation_frame_++;
|
||||
}
|
||||
|
||||
+16
-16
@@ -28,33 +28,33 @@
|
||||
#include "project/media.h"
|
||||
|
||||
enum IconType {
|
||||
ICON_TYPE_VIDEO,
|
||||
ICON_TYPE_AUDIO,
|
||||
ICON_TYPE_IMAGE,
|
||||
ICON_TYPE_LOADING,
|
||||
ICON_TYPE_ERROR
|
||||
ICON_TYPE_VIDEO,
|
||||
ICON_TYPE_AUDIO,
|
||||
ICON_TYPE_IMAGE,
|
||||
ICON_TYPE_LOADING,
|
||||
ICON_TYPE_ERROR
|
||||
};
|
||||
|
||||
class MediaIconService : public QObject {
|
||||
Q_OBJECT
|
||||
Q_OBJECT
|
||||
public:
|
||||
MediaIconService();
|
||||
MediaIconService();
|
||||
public slots:
|
||||
void SetMediaIcon(Media* media, int icon_type);
|
||||
void SetMediaIcon(Media* media, int icon_type);
|
||||
signals:
|
||||
void IconChanged();
|
||||
void IconChanged();
|
||||
private slots:
|
||||
void AnimationUpdate();
|
||||
void AnimationUpdate();
|
||||
private:
|
||||
int throbber_animation_frame_;
|
||||
QVector<Media*> throbber_items_;
|
||||
QTimer throbber_animator_;
|
||||
QPixmap throbber_pixmap_;
|
||||
QMutex throbber_lock_;
|
||||
int throbber_animation_frame_;
|
||||
QVector<Media*> throbber_items_;
|
||||
QTimer throbber_animator_;
|
||||
QPixmap throbber_pixmap_;
|
||||
QMutex throbber_lock_;
|
||||
};
|
||||
|
||||
namespace olive {
|
||||
extern std::unique_ptr<MediaIconService> media_icon_service;
|
||||
extern std::unique_ptr<MediaIconService> media_icon_service;
|
||||
}
|
||||
|
||||
#endif // MEDIAICONSERVICE_H
|
||||
|
||||
Reference in New Issue
Block a user