diff --git a/.gitattributes b/.gitattributes index 9051f73..b90754f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -139,6 +139,7 @@ thp_player/libpng/include/jconfig.h -text thp_player/libpng/include/jerror.h -text thp_player/libpng/include/jmorecfg.h -text thp_player/libpng/include/jpeglib.h -text +thp_player/libpng/lib/libjpeg.dll.a -text thp_player/main.cpp -text thp_player/next.png -text thp_player/pause.png -text diff --git a/thp_player/libpng/lib/libjpeg.dll.a b/thp_player/libpng/lib/libjpeg.dll.a new file mode 100644 index 0000000..d5dfc6c Binary files /dev/null and b/thp_player/libpng/lib/libjpeg.dll.a differ diff --git a/thp_player/thp_player.pro b/thp_player/thp_player.pro index f403ef6..6a2efdc 100644 --- a/thp_player/thp_player.pro +++ b/thp_player/thp_player.pro @@ -23,6 +23,7 @@ CONFIG += static win32 { message("win32 build") INCLUDEPATH += . ./libpng/include + LIBS += -L./libpng/lib -ljpeg } else { LIBS += -ljpeg diff --git a/thp_player/thpwindow.cpp b/thp_player/thpwindow.cpp index db383c2..9b022b7 100644 --- a/thp_player/thpwindow.cpp +++ b/thp_player/thpwindow.cpp @@ -163,7 +163,9 @@ void ThpWindow::LoadVideo( const QString &path ) ui->horizontalSlider_pos->setMaximum( frameCnt ); //set timer for animation + qDebug() << "fps" << QString( "%1" ).arg( videoFile->getFps(), 0, 'f', 3 ); qreal delay = 1000.0f/videoFile->getFps(); + qDebug() << "delay" << QString( "%1" ).arg( delay, 0, 'f', 3 ); ui->label_timeFull->setText( TimeTxt( delay * videoFile->getFrameCount() )); timer.setInterval( delay );