From b9cf8dc3d2768568827e12953c51c2da7bfecff2 Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Mon, 27 Jul 2020 14:58:12 -0400 Subject: Fixed batch --- AAP.svg | 314 +++++++++++++++++++++++++-------------------------- main.cpp | 3 +- player.cpp | 3 + player.h | 2 +- player.ui | 22 +++- scripts/appveyor.bat | 2 +- 6 files changed, 180 insertions(+), 166 deletions(-) diff --git a/AAP.svg b/AAP.svg index 0662b78..bd2317a 100755 --- a/AAP.svg +++ b/AAP.svg @@ -8,104 +8,104 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - sodipodi:docname="AAP.svg" - inkscape:version="1.0 (4035a4fb49, 2020-05-01)" - id="svg1957" + width="1000mm" + height="1000mm" + viewBox="0 0 1000 1000" version="1.1" - viewBox="0 0 100 100" - height="100mm" - width="100mm"> + id="svg1957" + inkscape:version="1.0 (4035a4fb49, 2020-05-01)" + sodipodi:docname="AAP.svg"> + id="filter3581-5" + x="-0.059999999" + width="1.12" + y="-0.059999999" + height="1.12"> + id="feGaussianBlur3583-0" /> + id="linearGradient4532-0" + x1="4.1577382" + y1="58.875" + x2="199.57143" + y2="241.81548" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.562833,0,0,0.562833,120.95711,117.57609)" /> + id="linearGradient3954" + inkscape:collect="always"> + style="stop-color:#ff8807;stop-opacity:1" /> + style="stop-color:#975100;stop-opacity:1" /> + width="1.096" + x="-0.048" + id="filter3168" + style="color-interpolation-filters:sRGB" + inkscape:collect="always"> + inkscape:collect="always" /> + x2="232.47932" + y1="133.34694" + x1="120.119" + id="linearGradient2918" + xlink:href="#linearGradient2924" + inkscape:collect="always" /> + inkscape:collect="always" + id="linearGradient2924"> + id="stop2920" /> + id="stop2922" /> + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="0.12374369" + inkscape:cx="2579.6705" + inkscape:cy="799.47074" + inkscape:document-units="mm" + inkscape:current-layer="layer1" + inkscape:document-rotation="0" + showgrid="false" + inkscape:window-width="1343" + inkscape:window-height="908" + inkscape:window-x="569" + inkscape:window-y="34" + inkscape:window-maximized="0" /> @@ -119,127 +119,127 @@ + id="layer1"> + inkscape:export-ydpi="96"> - - + + + sodipodi:open="true" + sodipodi:end="6.2630301" + sodipodi:start="0" + sodipodi:ry="43.481079" + sodipodi:rx="43.481079" + sodipodi:cy="194.81694" + sodipodi:cx="174.25737" + sodipodi:type="arc" + id="path819-3" + style="fill:url(#linearGradient4532-0);fill-opacity:1;stroke-width:0.330834" /> + x="172.20232" + y="194.81694" + style="stroke-width:0.148916"> + cy="48.709526" + cx="1269.061" + id="path3766-8" + style="fill:#000000;fill-opacity:0.996078;fill-rule:nonzero;stroke:none;stroke-width:2.06667;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal;filter:url(#filter3168)" /> + transform="translate(-0.16912973,-2.7675262)" + id="g2933"> + cx="174.25737" + id="path3766" + style="fill:url(#linearGradient2918);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.26613;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" /> + cy="191.02161" + cx="164.32909" + id="path3794" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78783;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" /> + cy="190.92998" + cx="183.73766" + id="path3794-1" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78783;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" /> + transform="translate(4.4158622,31.006934)" + id="g1035"> + width="6.2427411" + height="20.71139" + x="142.70897" + y="157.49884" /> + id="path3772" + sodipodi:cx="1292.2246" + sodipodi:cy="-55.781796" + sodipodi:expansion="1" + sodipodi:revolution="3.02601" + sodipodi:radius="39.10619" + sodipodi:argument="-19.247704" + sodipodi:t0="0.85191101" + transform="matrix(0.68412502,0.09907965,-0.0858267,0.8299174,-720.64463,86.204294)" + d="m 1259.0482,-58.817824 c 0.568,-19.184701 17.5934,-34.020666 36.5069,-33.357732 16.1054,0.564507 30.1652,11.938063 34.7034,27.298741" /> + width="6.2427411" + height="20.71139" + x="191.06956" + y="156.7856" /> diff --git a/main.cpp b/main.cpp index d255601..e417938 100644 --- a/main.cpp +++ b/main.cpp @@ -30,7 +30,8 @@ int main(int argc, char *argv[]) qDebug() << "Creating files..."; - //QDir directory(QDir::homePath() + "/.alee-productions/AleePlayer"); + //Change this to appdata or .local/share in linux + //QDir directory(QDir::homePath() + "/.alee-productions/Alee Audio Player"); //File file(directory.absoluteFilePath("test.txt")); diff --git a/player.cpp b/player.cpp index 9ff8591..4991824 100644 --- a/player.cpp +++ b/player.cpp @@ -48,8 +48,11 @@ void Player::loadFile() if (fileref->tag() != nullptr) { TagLib::String title = fileref->tag()->title(); + TagLib::String artist = fileref->tag()->artist(); const char* title_ = title.to8Bit(true).c_str(); + const char* artist_ = artist.to8Bit(true).c_str(); ui->labelTitle->setText(title_); + ui->labelAuthor->setText(artist_); } return; diff --git a/player.h b/player.h index c1fbc78..a95ff16 100644 --- a/player.h +++ b/player.h @@ -37,6 +37,7 @@ public: Player(QWidget *parent = nullptr); ~Player(); QMediaPlayer* mPlayer = new QMediaPlayer(); + QString mFile; int amount = 0; @@ -66,7 +67,6 @@ private slots: private: Ui::Player *ui; - QString mFile; QStringListModel *model; }; #endif // PLAYER_H diff --git a/player.ui b/player.ui index ac85d61..22babe4 100644 --- a/player.ui +++ b/player.ui @@ -13,6 +13,10 @@ Alee Audio Player + + + AAP.svgAAP.svg + @@ -159,6 +163,18 @@ + + + + + 12 + + + + Author + + + @@ -181,11 +197,6 @@ - - - View - - Help @@ -193,7 +204,6 @@ - diff --git a/scripts/appveyor.bat b/scripts/appveyor.bat index f6a20fd..6326e9e 100644 --- a/scripts/appveyor.bat +++ b/scripts/appveyor.bat @@ -8,7 +8,7 @@ set QTDIR=C:\Qt\5.12\msvc2017_64 set PATH=%PATH%;%QTDIR%\bin call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat" -qmake Alee Audio Player.pro "CONFIG+=release" +qmake "Alee Audio Player.pro" "CONFIG+=release" nmake release mkdir deploy copy release\AleeAudioPlayer.exe deploy -- cgit v1.2.3