From 00d35c9f98a0d12e2937de11df18b10b56aa519b Mon Sep 17 00:00:00 2001 From: giantpune Date: Sun, 16 Jan 2011 16:58:27 +0000 Subject: [PATCH] --- .gitattributes | 1 + thp_player/libpng/lib/libjpeg.dll.a | Bin 0 -> 64620 bytes thp_player/thp_player.pro | 1 + thp_player/thpwindow.cpp | 2 ++ 4 files changed, 4 insertions(+) create mode 100644 thp_player/libpng/lib/libjpeg.dll.a 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 0000000000000000000000000000000000000000..d5dfc6ce0d66cfbb06da71b77ef1d8f0fb2ab594 GIT binary patch literal 64620 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 literal 0 HcmV?d00001 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 );