From: APTX Date: Sat, 2 Mar 2013 15:06:48 +0000 (+0100) Subject: Rename to aniplayer X-Git-Url: https://gitweb.tyo.aptx.org/?a=commitdiff_plain;h=374ddbdddd6b5ccaff379bf931aa94258ee7b227;p=aniplayer2.git Rename to aniplayer --- diff --git a/aniplayer.pro b/aniplayer.pro index 83c1f96..7bff573 100644 --- a/aniplayer.pro +++ b/aniplayer.pro @@ -3,6 +3,6 @@ CONFIG += ordered include(config.pri) -SUBDIRS += aniplayer2 -win32: SUBDIRS += aniplayer2_dshow +SUBDIRS += aniplayer +win32: SUBDIRS += aniplayer_dshow SUBDIRS += player diff --git a/aniplayer/aniplayer.h b/aniplayer/aniplayer.h index 3ba45e2..31d4676 100644 --- a/aniplayer/aniplayer.h +++ b/aniplayer/aniplayer.h @@ -1,7 +1,7 @@ #ifndef ANIPLAYER_H #define ANIPLAYER_H -#include "aniplayer2_global.h" +#include "aniplayer_global.h" #include #include @@ -11,7 +11,7 @@ class VideoWidget; class QTimerEvent; -struct ANIPLAYER2SHARED_EXPORT Chapter +struct ANIPLAYERSHARED_EXPORT Chapter { QString name; qint64 time; @@ -26,7 +26,7 @@ enum StreamType OtherStream }; -struct ANIPLAYER2SHARED_EXPORT Stream +struct ANIPLAYERSHARED_EXPORT Stream { QString name; StreamType type; @@ -34,7 +34,7 @@ struct ANIPLAYER2SHARED_EXPORT Stream }; typedef QList StreamList; -class ANIPLAYER2SHARED_EXPORT AniPlayer : public QObject +class ANIPLAYERSHARED_EXPORT AniPlayer : public QObject { Q_OBJECT Q_PROPERTY(State state READ state NOTIFY stateChanged) diff --git a/aniplayer/aniplayer.pro b/aniplayer/aniplayer.pro index 9caf300..73438e1 100644 --- a/aniplayer/aniplayer.pro +++ b/aniplayer/aniplayer.pro @@ -2,14 +2,14 @@ QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets -TARGET = aniplayer2 +TARGET = aniplayer DESTDIR = ../build TEMPLATE = lib -DEFINES += ANIPLAYER2_LIBRARY +DEFINES += ANIPLAYER_LIBRARY -HEADERS += aniplayer2_global.h \ +HEADERS += aniplayer_global.h \ constants.h \ aniplayerapplication.h \ aniplayer.h \ diff --git a/aniplayer/aniplayer_global.h b/aniplayer/aniplayer_global.h index c26d14c..fbf7237 100644 --- a/aniplayer/aniplayer_global.h +++ b/aniplayer/aniplayer_global.h @@ -1,12 +1,12 @@ -#ifndef ANIPLAYER2_GLOBAL_H -#define ANIPLAYER2_GLOBAL_H +#ifndef ANIPLAYER_GLOBAL_H +#define ANIPLAYER_GLOBAL_H #include -#if defined(ANIPLAYER2_LIBRARY) -# define ANIPLAYER2SHARED_EXPORT Q_DECL_EXPORT +#if defined(ANIPLAYER_LIBRARY) +# define ANIPLAYERSHARED_EXPORT Q_DECL_EXPORT #else -# define ANIPLAYER2SHARED_EXPORT Q_DECL_IMPORT +# define ANIPLAYERSHARED_EXPORT Q_DECL_IMPORT #endif #endif // LIBANIPLAYER2_GLOBAL_H diff --git a/aniplayer/aniplayerapplication.h b/aniplayer/aniplayerapplication.h index 6682941..e49a6e6 100644 --- a/aniplayer/aniplayerapplication.h +++ b/aniplayer/aniplayerapplication.h @@ -1,7 +1,7 @@ #ifndef ANIPLAYERAPPLICATION_H #define ANIPLAYERAPPLICATION_H -#include "aniplayer2_global.h" +#include "aniplayer_global.h" #include class AniPlayer; @@ -11,7 +11,7 @@ class AniPlayer; #endif #define qApp (AniPlayerApplication::instance()) -class ANIPLAYER2SHARED_EXPORT AniPlayerApplication : public QtSingleApplication +class ANIPLAYERSHARED_EXPORT AniPlayerApplication : public QtSingleApplication { Q_OBJECT public: diff --git a/aniplayer/videowidget.h b/aniplayer/videowidget.h index 64b0075..cd9b702 100644 --- a/aniplayer/videowidget.h +++ b/aniplayer/videowidget.h @@ -1,12 +1,12 @@ #ifndef VIDEOWIDGET_H #define VIDEOWIDGET_H -#include "aniplayer2_global.h" +#include "aniplayer_global.h" #include class AniPlayer; -class ANIPLAYER2SHARED_EXPORT VideoWidget : public QWidget +class ANIPLAYERSHARED_EXPORT VideoWidget : public QWidget { Q_OBJECT Q_PROPERTY(bool fullScreen READ isFullScreen WRITE setFullScreen NOTIFY fullScreenChanged) diff --git a/aniplayer/volumeslider.h b/aniplayer/volumeslider.h index 25e8fc5..cc3b532 100644 --- a/aniplayer/volumeslider.h +++ b/aniplayer/volumeslider.h @@ -1,13 +1,13 @@ #ifndef VOLUMESLIDER_H #define VOLUMESLIDER_H -#include "aniplayer2_global.h" +#include "aniplayer_global.h" #include class QSlider; class QPushButton; -class ANIPLAYER2SHARED_EXPORT VolumeSlider : public QWidget +class ANIPLAYERSHARED_EXPORT VolumeSlider : public QWidget { Q_OBJECT Q_PROPERTY(double volume READ volume WRITE setVolume NOTIFY volumeChanged USER true) diff --git a/aniplayer_dshow/aniplayer_dshow.pri b/aniplayer_dshow/aniplayer_dshow.pri index 6a0e8e5..a5f86da 100644 --- a/aniplayer_dshow/aniplayer_dshow.pri +++ b/aniplayer_dshow/aniplayer_dshow.pri @@ -1,5 +1,5 @@ INCLUDEPATH += $$PWD INCLUDEPATH += $$PWD DEPENDPATH += $$PWD -LIBS += -laniplayer2_dshow +LIBS += -laniplayer_dshow LIBS += -L$$PWD/../build diff --git a/aniplayer_dshow/aniplayer_dshow.pro b/aniplayer_dshow/aniplayer_dshow.pro index 43f1047..9c19b1b 100644 --- a/aniplayer_dshow/aniplayer_dshow.pro +++ b/aniplayer_dshow/aniplayer_dshow.pro @@ -2,15 +2,15 @@ QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets -TARGET = aniplayer2_dshow +TARGET = aniplayer_dshow DESTDIR = ../build TEMPLATE = lib -DEFINES += ANIPLAYER2_DSHOW_LIBRARY +DEFINES += ANIPLAYER_DSHOW_LIBRARY -HEADERS += aniplayer2_dshow_global.h +HEADERS += aniplayer_dshow_global.h HEADERS += \ aniplayerdshow.h \ @@ -24,6 +24,6 @@ SOURCES += \ videowidgetdshow.cpp include(../config.pri) -include(../aniplayer2/aniplayer2.pri) +include(../aniplayer/aniplayer.pri) LIBS += -lstrmiids -lole32 -lOleAut32 -lUser32 diff --git a/aniplayer_dshow/aniplayer_dshow_global.h b/aniplayer_dshow/aniplayer_dshow_global.h index b5d8367..14ccc79 100644 --- a/aniplayer_dshow/aniplayer_dshow_global.h +++ b/aniplayer_dshow/aniplayer_dshow_global.h @@ -1,12 +1,12 @@ -#ifndef ANIPLAYER2_DSHOW_GLOBAL_H -#define ANIPLAYER2_DSHOW_GLOBAL_H +#ifndef ANIPLAYER_DSHOW_GLOBAL_H +#define ANIPLAYER_DSHOW_GLOBAL_H #include -#if defined(ANIPLAYER2_DSHOW_LIBRARY) -# define ANIPLAYER2_DSHOWSHARED_EXPORT Q_DECL_EXPORT +#if defined(ANIPLAYER_DSHOW_LIBRARY) +# define ANIPLAYER_DSHOWSHARED_EXPORT Q_DECL_EXPORT #else -# define ANIPLAYER2_DSHOWSHARED_EXPORT Q_DECL_IMPORT +# define ANIPLAYER_DSHOWSHARED_EXPORT Q_DECL_IMPORT #endif -#endif // ANIPLAYER2_DSHOW_GLOBAL_H +#endif // ANIPLAYER_DSHOW_GLOBAL_H diff --git a/aniplayer_dshow/aniplayerdshow.h b/aniplayer_dshow/aniplayerdshow.h index 603dbab..6d55837 100644 --- a/aniplayer_dshow/aniplayerdshow.h +++ b/aniplayer_dshow/aniplayerdshow.h @@ -1,14 +1,14 @@ #ifndef ANIPLAYERDSHOW_H #define ANIPLAYERDSHOW_H -#include "aniplayer2_dshow_global.h" +#include "aniplayer_dshow_global.h" #include class VideoWidgetDShow; struct AniPlayerDShowInternal; -class ANIPLAYER2_DSHOWSHARED_EXPORT AniPlayerDShow : public AniPlayer +class ANIPLAYER_DSHOWSHARED_EXPORT AniPlayerDShow : public AniPlayer { friend struct AniPlayerDShowInternal; Q_OBJECT diff --git a/aniplayer_dshow/videowidgetdshow.h b/aniplayer_dshow/videowidgetdshow.h index 399349a..afa7724 100644 --- a/aniplayer_dshow/videowidgetdshow.h +++ b/aniplayer_dshow/videowidgetdshow.h @@ -1,12 +1,12 @@ #ifndef VIDEOWIDGETDSHOW_H #define VIDEOWIDGETDSHOW_H -#include "aniplayer2_dshow_global.h" +#include "aniplayer_dshow_global.h" #include class AniPlayerDShow; -class ANIPLAYER2_DSHOWSHARED_EXPORT VideoWidgetDShow : public VideoWidget +class ANIPLAYER_DSHOWSHARED_EXPORT VideoWidgetDShow : public VideoWidget { Q_OBJECT public: diff --git a/player/player.pro b/player/player.pro index b62b119..dbbcc5a 100644 --- a/player/player.pro +++ b/player/player.pro @@ -22,8 +22,8 @@ FORMS += mainwindow.ui \ menu.ui include(../config.pri) -include(../aniplayer2/aniplayer2.pri) -win32:include(../aniplayer2_dshow/aniplayer2_dshow.pri) +include(../aniplayer/aniplayer.pri) +win32:include(../aniplayer_dshow/aniplayer_dshow.pri) win32 { CONFIG -= embed_manifest_exe