From 4095d2c5f4b8e4112c75152aefc34969d34c14db Mon Sep 17 00:00:00 2001 From: tmarki Date: Fri, 13 Aug 2010 01:05:20 +0200 Subject: [PATCH] reorganisation, added debian package stuff --- LICENSE | 66 +++ ampres.qrc | 15 - bugs.txt | 13 - data/26x26/Tomamp.png | Bin 0 -> 4170 bytes data/40x40/Tomamp.png | Bin 0 -> 4170 bytes data/64x64/Tomamp.png | Bin 0 -> 4170 bytes debian/changelog | 20 + debian/compat | 1 + debian/control | 17 + debian/copyright | 52 ++ debian/dirs | 1 + debian/optify | 1 + debian/rules | 60 +++ debian/tomamp.install | 3 + debian/tomamp.postinst | 3 + debian/tomamp.postrm | 2 + debian/tomamp.preinst | 4 + images/Button Next.png | Bin 4573 -> 0 bytes images/Button Pause.png | Bin 4323 -> 0 bytes images/Button Play.png | Bin 4483 -> 0 bytes images/Button Previous.png | Bin 4545 -> 0 bytes images/Button Reload Active.png | Bin 5016 -> 0 bytes images/Button Reload.png | Bin 4774 -> 0 bytes images/Button Stop.png | Bin 4284 -> 0 bytes images/Tomamp.png | Bin 4170 -> 0 bytes images/audio-volume-high.png | Bin 2041 -> 0 bytes images/shuffle Active.png | Bin 4971 -> 0 bytes images/shuffle.png | Bin 4733 -> 0 bytes main.cpp | 16 - mainwindow.cpp | 865 -------------------------------- mainwindow.h | 154 ------ optiondialog.cpp | 6 - optiondialog.h | 18 - playlistmanager.cpp | 349 ------------- playlistmanager.h | 61 --- tomamp.pro | 77 +-- tomamp/README | 7 + tomamp/ampres.qrc | 15 + tomamp/bugs.txt | 13 + tomamp/images/Button Next.png | Bin 0 -> 4573 bytes tomamp/images/Button Pause.png | Bin 0 -> 4323 bytes tomamp/images/Button Play.png | Bin 0 -> 4483 bytes tomamp/images/Button Previous.png | Bin 0 -> 4545 bytes tomamp/images/Button Reload Active.png | Bin 0 -> 5016 bytes tomamp/images/Button Reload.png | Bin 0 -> 4774 bytes tomamp/images/Button Stop.png | Bin 0 -> 4284 bytes tomamp/images/Tomamp.png | Bin 0 -> 4170 bytes tomamp/images/audio-volume-high.png | Bin 0 -> 2041 bytes tomamp/images/shuffle Active.png | Bin 0 -> 4971 bytes tomamp/images/shuffle.png | Bin 0 -> 4733 bytes tomamp/main.cpp | 16 + tomamp/mainwindow.cpp | 865 ++++++++++++++++++++++++++++++++ tomamp/mainwindow.h | 154 ++++++ tomamp/optiondialog.cpp | 6 + tomamp/optiondialog.h | 18 + tomamp/playlistmanager.cpp | 349 +++++++++++++ tomamp/playlistmanager.h | 61 +++ tomamp/tomamp.pro | 73 +++ 58 files changed, 1813 insertions(+), 1568 deletions(-) create mode 100644 LICENSE delete mode 100644 ampres.qrc delete mode 100644 bugs.txt create mode 100644 data/26x26/Tomamp.png create mode 100644 data/40x40/Tomamp.png create mode 100644 data/64x64/Tomamp.png create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/dirs create mode 100644 debian/docs create mode 100644 debian/optify create mode 100755 debian/rules create mode 100644 debian/tomamp.install create mode 100755 debian/tomamp.postinst create mode 100755 debian/tomamp.postrm create mode 100644 debian/tomamp.preinst delete mode 100644 images/Button Next.png delete mode 100644 images/Button Pause.png delete mode 100644 images/Button Play.png delete mode 100644 images/Button Previous.png delete mode 100644 images/Button Reload Active.png delete mode 100644 images/Button Reload.png delete mode 100644 images/Button Stop.png delete mode 100644 images/Tomamp.png delete mode 100644 images/audio-volume-high.png delete mode 100644 images/shuffle Active.png delete mode 100644 images/shuffle.png delete mode 100644 main.cpp delete mode 100644 mainwindow.cpp delete mode 100644 mainwindow.h delete mode 100644 optiondialog.cpp delete mode 100644 optiondialog.h delete mode 100644 playlistmanager.cpp delete mode 100644 playlistmanager.h create mode 100644 tomamp/README create mode 100644 tomamp/ampres.qrc create mode 100644 tomamp/bugs.txt create mode 100644 tomamp/images/Button Next.png create mode 100644 tomamp/images/Button Pause.png create mode 100644 tomamp/images/Button Play.png create mode 100644 tomamp/images/Button Previous.png create mode 100644 tomamp/images/Button Reload Active.png create mode 100644 tomamp/images/Button Reload.png create mode 100644 tomamp/images/Button Stop.png create mode 100644 tomamp/images/Tomamp.png create mode 100644 tomamp/images/audio-volume-high.png create mode 100644 tomamp/images/shuffle Active.png create mode 100644 tomamp/images/shuffle.png create mode 100644 tomamp/main.cpp create mode 100644 tomamp/mainwindow.cpp create mode 100644 tomamp/mainwindow.h create mode 100644 tomamp/optiondialog.cpp create mode 100644 tomamp/optiondialog.h create mode 100644 tomamp/playlistmanager.cpp create mode 100644 tomamp/playlistmanager.h create mode 100644 tomamp/tomamp.pro diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..199b9e7 --- /dev/null +++ b/LICENSE @@ -0,0 +1,66 @@ +GNU LESSER GENERAL PUBLIC LICENSE + +Version 3, 29 June 2007 + +Copyright © 2007 Free Software Foundation, Inc. + +Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. + +This version of the GNU Lesser General Public License incorporates the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below. +0. Additional Definitions. + +As used herein, “this License” refers to version 3 of the GNU Lesser General Public License, and the “GNU GPL” refers to version 3 of the GNU General Public License. + +“The Library” refers to a covered work governed by this License, other than an Application or a Combined Work as defined below. + +An “Application” is any work that makes use of an interface provided by the Library, but which is not otherwise based on the Library. Defining a subclass of a class defined by the Library is deemed a mode of using an interface provided by the Library. + +A “Combined Work” is a work produced by combining or linking an Application with the Library. The particular version of the Library with which the Combined Work was made is also called the “Linked Version”. + +The “Minimal Corresponding Source” for a Combined Work means the Corresponding Source for the Combined Work, excluding any source code for portions of the Combined Work that, considered in isolation, are based on the Application, and not on the Linked Version. + +The “Corresponding Application Code” for a Combined Work means the object code and/or source code for the Application, including any data and utility programs needed for reproducing the Combined Work from the Application, but excluding the System Libraries of the Combined Work. +1. Exception to Section 3 of the GNU GPL. + +You may convey a covered work under sections 3 and 4 of this License without being bound by section 3 of the GNU GPL. +2. Conveying Modified Versions. + +If you modify a copy of the Library, and, in your modifications, a facility refers to a function or data to be supplied by an Application that uses the facility (other than as an argument passed when the facility is invoked), then you may convey a copy of the modified version: + + * a) under this License, provided that you make a good faith effort to ensure that, in the event an Application does not supply the function or data, the facility still operates, and performs whatever part of its purpose remains meaningful, or + * b) under the GNU GPL, with none of the additional permissions of this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from a header file that is part of the Library. You may convey such object code under terms of your choice, provided that, if the incorporated material is not limited to numerical parameters, data structure layouts and accessors, or small macros, inline functions and templates (ten or fewer lines in length), you do both of the following: + + * a) Give prominent notice with each copy of the object code that the Library is used in it and that the Library and its use are covered by this License. + * b) Accompany the object code with a copy of the GNU GPL and this license document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, taken together, effectively do not restrict modification of the portions of the Library contained in the Combined Work and reverse engineering for debugging such modifications, if you also do each of the following: + + * a) Give prominent notice with each copy of the Combined Work that the Library is used in it and that the Library and its use are covered by this License. + * b) Accompany the Combined Work with a copy of the GNU GPL and this license document. + * c) For a Combined Work that displays copyright notices during execution, include the copyright notice for the Library among these notices, as well as a reference directing the user to the copies of the GNU GPL and this license document. + * d) Do one of the following: + o 0) Convey the Minimal Corresponding Source under the terms of this License, and the Corresponding Application Code in a form suitable for, and under terms that permit, the user to recombine or relink the Application with a modified version of the Linked Version to produce a modified Combined Work, in the manner specified by section 6 of the GNU GPL for conveying Corresponding Source. + o 1) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (a) uses at run time a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked Version. + * e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the GNU GPL, and only to the extent that such information is necessary to install and execute a modified version of the Combined Work produced by recombining or relinking the Application with a modified version of the Linked Version. (If you use option 4d0, the Installation Information must accompany the Minimal Corresponding Source and Corresponding Application Code. If you use option 4d1, you must provide the Installation Information in the manner specified by section 6 of the GNU GPL for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the Library side by side in a single library together with other library facilities that are not Applications and are not covered by this License, and convey such a combined library under terms of your choice, if you do both of the following: + + * a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities, conveyed under the terms of this License. + * b) Give prominent notice with the combined library that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions of the GNU Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the Library as you received it specifies that a certain numbered version of the GNU Lesser General Public License “or any later version” applies to it, you have the option of following the terms and conditions either of that published version or of any later version published by the Free Software Foundation. If the Library as you received it does not specify a version number of the GNU Lesser General Public License, you may choose any version of the GNU Lesser General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide whether future versions of the GNU Lesser General Public License shall apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library. + diff --git a/ampres.qrc b/ampres.qrc deleted file mode 100644 index 1673f53..0000000 --- a/ampres.qrc +++ /dev/null @@ -1,15 +0,0 @@ - - - images/audio-volume-high.png - images/shuffle.png - images/Button Next.png - images/Button Pause.png - images/Button Play.png - images/Button Reload.png - images/Button Stop.png - images/Button Previous.png - images/shuffle Active.png - images/Button Reload Active.png - images/Tomamp.png - - diff --git a/bugs.txt b/bugs.txt deleted file mode 100644 index 8001ce8..0000000 --- a/bugs.txt +++ /dev/null @@ -1,13 +0,0 @@ -- remember folder position when adding songs (takes time as adding a song and going one folder up for next song jumps to top of folder) -- when saving a playlist, the default path seems invalid, so playlist doesn's save, and no error given -- for some reasom, one folder shows 0 files, but filled with mp3 files (?) -- quit while reading tags causes crash - -Fixed: -+ context menu event outside of musicTable causes crash -+ cancel add folder, add url causes crash -+ doesn't remember add folder folder -+ adding some files can cause a crash ("Blessing, Compassion") -+ bold-italic highlight does not move on normal track switch (when one ends and the next starts) -+ quick next-next while playing stops playback -+ meta info display mismatch (title duplication, some files receive some other file's meta info instead of their ("reality")) (might be related to previous) diff --git a/data/26x26/Tomamp.png b/data/26x26/Tomamp.png new file mode 100644 index 0000000000000000000000000000000000000000..5a92bc5b72fbff47df9f951cf220bb2d79ccfb14 GIT binary patch literal 4170 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 literal 0 HcmV?d00001 diff --git a/data/40x40/Tomamp.png b/data/40x40/Tomamp.png new file mode 100644 index 0000000000000000000000000000000000000000..5a92bc5b72fbff47df9f951cf220bb2d79ccfb14 GIT binary patch literal 4170 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 literal 0 HcmV?d00001 diff --git a/data/64x64/Tomamp.png b/data/64x64/Tomamp.png new file mode 100644 index 0000000000000000000000000000000000000000..5a92bc5b72fbff47df9f951cf220bb2d79ccfb14 GIT binary patch literal 4170 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 literal 0 HcmV?d00001 diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..a0b1419 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,20 @@ +tomamp (0.1-maemo2) unstable; urgency=low + + * Package fix again :( + + + -- Tamas Marki Tue, 10 Aug 2010 11:59:07 +0200 + +tomamp (0.1-maemo1) unstable; urgency=low + + * Package fix (hopefully) + + + -- Tamas Marki Mon, 09 Aug 2010 21:34:07 +0200 +tomamp (0.1-maemo0) unstable; urgency=low + + * Initial release + + + -- Tamas Marki Mon, 09 Aug 2010 21:34:07 +0200 + diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..7ed6ff8 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +5 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..c8e49e2 --- /dev/null +++ b/debian/control @@ -0,0 +1,17 @@ +Source: tomamp +Section: user/multimedia +Priority: extra +Maintainer: Tamas Marki +Build-Depends: debhelper (>= 5), libqt4-dev (>= 4.5.0) +Standards-Version: 3.8.0 +Homepage: http://tmarki.com/wp/tomamp +XSBC-Bugtracker: mailto:tmarki@gmail.com + +Package: tomamp +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Simple playlist-based music player + TomAmp is a simple, easy to use, playlist-based audio player + for Maemo. + . +XB-Maemo-Display-Name: TomAmp Music Player diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..6185bbf --- /dev/null +++ b/debian/copyright @@ -0,0 +1,52 @@ +This package was debianized by: + + Tamas Marki on Mon, 09 Aug 2010 21:37:54 +0200 + +It was downloaded from: + + + +Upstream Author(s): + + + + +Copyright: + + + + +License: + +### SELECT: ### + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. +### OR ### + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. +########## + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +The Debian packaging is: + + Copyright C) 2010, Tamas Marki + +and is licensed under the GPL, see above. + + +# Please also look if there are files or directories which have a +# different copyright/license attached and list them here. diff --git a/debian/dirs b/debian/dirs new file mode 100644 index 0000000..e772481 --- /dev/null +++ b/debian/dirs @@ -0,0 +1 @@ +usr/bin diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..e69de29 diff --git a/debian/optify b/debian/optify new file mode 100644 index 0000000..865faf1 --- /dev/null +++ b/debian/optify @@ -0,0 +1 @@ +auto diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..4e97e7c --- /dev/null +++ b/debian/rules @@ -0,0 +1,60 @@ +#!/usr/bin/make -f +APPNAME := tomamp +builddir: + mkdir -p builddir + +builddir/Makefile: builddir +# qmake -v +# cd builddir && /opt/qt4-maemo5/bin/qmake PREFIX=/usr ../$(APPNAME).pro + cd builddir && qmake-qt4 PREFIX=/usr ../$(APPNAME).pro + +build: build-stamp + +build-stamp: builddir/Makefile + dh_testdir + # Add here commands to compile the package. + cd builddir && $(MAKE) + touch $@ + +clean: + dh_testdir + dh_testroot + rm -f build-stamp + # Add here commands to clean up after the build process. + rm -rf builddir + dh_clean +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs +# dh_install -X.svn + + + # Add here commands to install the package into debian/your_appname + cd builddir && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/$(APPNAME) install +# cd builddir && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/$(APPNAME)-experimental install +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installdocs + dh_installexamples + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure + diff --git a/debian/tomamp.install b/debian/tomamp.install new file mode 100644 index 0000000..379002e --- /dev/null +++ b/debian/tomamp.install @@ -0,0 +1,3 @@ +tomamp/*.desktop usr/share/applications/hildon +tomamp/images/Tomamp.png usr/share/icons/hicolor/26x26/apps + diff --git a/debian/tomamp.postinst b/debian/tomamp.postinst new file mode 100755 index 0000000..fd751fa --- /dev/null +++ b/debian/tomamp.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +gtk-update-icon-cache /usr/share/icons/hicolor + diff --git a/debian/tomamp.postrm b/debian/tomamp.postrm new file mode 100755 index 0000000..13f4793 --- /dev/null +++ b/debian/tomamp.postrm @@ -0,0 +1,2 @@ +#!/bin/sh + diff --git a/debian/tomamp.preinst b/debian/tomamp.preinst new file mode 100644 index 0000000..594dd96 --- /dev/null +++ b/debian/tomamp.preinst @@ -0,0 +1,4 @@ +#!/bin/sh + +rm -f /home/user/.config/TomAmp/TomAmp.conf + diff --git a/images/Button Next.png b/images/Button Next.png deleted file mode 100644 index 3e18aad5f4197edb195956643ee3f38bee057613..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4573 zcmV<35hCu1P)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z000LFNklx) z*9#Xe^$!C3fL(yRsR-PlJ@44|?)%rbvFYyBBw{g)F&F~|Q;`kzGwNuWJDW8tmQnQm zrsF41zx;8>7cYmA-U00SssQ%h(c04f^rH`uPNgu$kSmOn%jGEr0ZJ*tFap4KY+|m* zjC6`bBEkK4uVM9yrTp#KN4vZF2U~&dw+i658`rMf_UPt&z`#&;gu&q~N-4C~Xk*aY zV2rMe25mID&tMCi=6SPeY^dkkk8I}H$Dg);dgirVbuzvNYi<-2dPxmp_G$GIaM!}LaDH#536&j6e=vsr_Y`zkO9jVF93LPIsmp1 zV&~dBmvQz&7rvC&Fv{g}6=r2eCEuqoUYO8@Au_Ch2t%X_31nIJrQ+1*=lJ@PRxHcf z3D~s&9$&KHYh*9y$Q6nNDn!bVK!vC9%y-$cd1Ez^=FDzn z*Uq1D?8Lv=_3Pg;I+iDqo`Gdq6WL~gB?Lt&0a|JSc-{TOjEr7JM-ewuBQ(vKeU0vc zjrVfjy0yH1@DK+NAHy&Kz_KiaZBq7pFm0(VmmIvb`Zk8rn~OcGfQhdEwEV3 zW8Iq7v@|zOwP8Ehj*C(elW)nZR{M;_Qrq<~fYH}RA?C%V%>5vsuC8v1uBU&H{eSoq z|2}=D%-R-J_Li`*T@Oor;qvRG3!2KiYjQydoBw=vme&scnVx|R zt<7`MTJ!GvAM)nAhZ!&VRcBM2SH8XDc{r|1sh9^iQvKZ+!)Ex zL`tD`R5i4G(E`qOU8>G!)}@%4PSGVcZDCmyu8aV@dcE6F8e?{3`?_)C z3F4_Vv1AG-7M~J{o9V)FaAI*{$rSNa8aJLG+t-aTW=CzIT3e9p@eBFZ?4_>urp3## zo$}tDoD(-Xq%6yt^3ABO}qXWJBx;su{ zqL5@dO}e3xx`tV#>KjPTm`QTROcLoCRXJ7PKwZNu(hZFy(`if;(tY|AqXWJBK6v}U zbGKR*i+>#a{Y&c~dpal;^4n)Mw=j3%V&bWZlh0J@!SX3L!6Q_XfeW3C4)l>5$?W~) z@S$H+h(@>kF!|*0p|>0_cKohQk9>dl(#40;jdSYK4YNt6)7XxSW!so2A_^77e4hN} zEcub)!r1WO`=5XK_cucsbbZyAkp=?bN+^S&{~rCz8^Aj)%U89{YMS4cNY9)v949F( z;cBCm4#Q$8Kh`@s*xS)}?sNw*1`GpNDt7dB6ZdvM&;K_7@)R7Q9BKgE00000NkvXX Hu0mjfcJHP9 diff --git a/images/Button Pause.png b/images/Button Pause.png deleted file mode 100644 index 76ba422627268dda3e492de2e75b2e4a87c7ce5f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4323 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 R3K9SS002ovPDHLkV1gI4G|vD4 diff --git a/images/Button Play.png b/images/Button Play.png deleted file mode 100644 index de1a5f3365ac6263acfaa849e46a653ca44fc5fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4483 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 V0c6Uw8}a}E002ovPDHLkV1o3ehXeos diff --git a/images/Button Previous.png b/images/Button Previous.png deleted file mode 100644 index dcaad8d28afbcdda26ed8bf164b0f0b27198ba9a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4545 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 diff --git a/images/Button Reload Active.png b/images/Button Reload Active.png deleted file mode 100644 index 5f983ddb576a9382de353d7630b93f1e950e6da1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5016 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 AlK=n! diff --git a/images/Button Stop.png b/images/Button Stop.png deleted file mode 100644 index 24151547deb5963dbacec7e2415125e9e301e0ba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4284 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 diff --git a/images/audio-volume-high.png b/images/audio-volume-high.png deleted file mode 100644 index 70ae43a1d773de628ec18d67aa24e3c52016372c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2041 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 diff --git a/images/shuffle.png b/images/shuffle.png deleted file mode 100644 index 3ce441a88d598b5e97bdaff4cda4896b175e5664..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4733 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 LNkvXXu0mjfWX$b! diff --git a/main.cpp b/main.cpp deleted file mode 100644 index 29dd3e6..0000000 --- a/main.cpp +++ /dev/null @@ -1,16 +0,0 @@ -#include -#include "mainwindow.h" - -int main(int argc, char *argv[]) -{ - QApplication a(argc, argv); - a.setApplicationName("tomamp"); - MainWindow w; -#if defined(Q_WS_S60) - w.showMaximized(); -#else - w.show(); -#endif - - return a.exec(); -} diff --git a/mainwindow.cpp b/mainwindow.cpp deleted file mode 100644 index a3f1bde..0000000 --- a/mainwindow.cpp +++ /dev/null @@ -1,865 +0,0 @@ -#include -#include -#include - -#include "mainwindow.h" -#include "time.h" - -//#define AVOID_INPUT_DIALOG 0 - -MainWindow::MainWindow() - : plman (this), settings (tr ("TomAmp"), "TomAmp"), isPlaying (false) -{ -#ifdef Q_WS_MAEMO_5 - setAttribute(Qt::WA_Maemo5AutoOrientation, true); -#endif - audioOutput = new Phonon::AudioOutput(Phonon::MusicCategory, this); - mediaObject = new Phonon::MediaObject(this); - - mediaObject->setTickInterval(1000); - connect(mediaObject, SIGNAL(tick(qint64)), this, SLOT(tick(qint64))); - connect(mediaObject, SIGNAL(stateChanged(Phonon::State,Phonon::State)), - this, SLOT(stateChanged(Phonon::State,Phonon::State))); - connect(mediaObject, SIGNAL(currentSourceChanged(Phonon::MediaSource)), - this, SLOT(sourceChanged(Phonon::MediaSource))); - connect(mediaObject, SIGNAL(aboutToFinish()), this, SLOT(aboutToFinish())); - connect (&plman, SIGNAL (playlistChanged (int)), this, SLOT (playlistChanged(int))); - connect (&plman, SIGNAL (itemUpdated(int)), this, SLOT (itemUpdated (int))); - connect (&plman, SIGNAL (itemRemoved(int)), this, SLOT (itemRemoved (int))); - - Phonon::createPath(mediaObject, audioOutput); - - qsrand (time (NULL)); - repeat = settings.value("repeat", false).toBool(); - shuffle = settings.value("shuffle", false).toBool(); - setupShuffleList(); - setupActions(); - setupMenus(); - setupUi(); - show (); - timeLcd->display("00:00:00"); - plman.addStringList(settings.value("lastPlaylist").toStringList()); - setupShuffleList(); - int curind = settings.value("currentIndex", -1).toInt (); - if (curind >= 0) - setItem (curind, false); - audioOutput->setVolume(settings.value("volume", .5).toReal()); - QApplication::setWindowIcon(QIcon (QPixmap (":images/tomamp"))); -} - -MainWindow::~MainWindow() -{ - settings.setValue("shuffle", shuffle); - settings.setValue("repeat", repeat); - settings.setValue("lastPlaylist", plman.playlistStrings()); - settings.setValue("volume", audioOutput->volume()); - settings.setValue("currentIndex", plman.indexOf(mediaObject->currentSource())); - for (int i = 0; i < musicTable->columnCount(); ++i) - { - QString lab = QString ("colWidth_%1").arg (i); - settings.setValue(lab, musicTable->columnWidth(i)); - } -} - -void MainWindow::addFiles() -{ - QString folder = settings.value("LastFolder").toString(); - if (folder.isEmpty()) - folder = QDesktopServices::storageLocation(QDesktopServices::MusicLocation); - QStringList files = QFileDialog::getOpenFileNames(this, tr("Select Files To Add"), - folder, "Music files (*.mp3 *.ogg *.wav *.flac);;Playlists (*.m3u *.pls)"); - - if (files.isEmpty()) - return; - - QString dir = QFileInfo (files[0]).absoluteDir().absolutePath(); - settings.setValue("LastFolder", dir); - QStringList toadd; - foreach (QString string, files) - { - if (string.toLower().endsWith(".pls") || string.toLower().endsWith(".m3u")) - plman.addPlaylist(string); - else - toadd.append (string); - } - plman.addStringList(toadd); -} - -void MainWindow::addFolder() -{ - QString folder = settings.value("LastFolder").toString(); - if (folder.isEmpty()) - folder = QDesktopServices::storageLocation(QDesktopServices::MusicLocation); - QString dir = QFileDialog::getExistingDirectory(this, - tr("Select Directory To Add"), - folder); - - if (dir.isEmpty()) - return; - - settings.setValue("LastFolder", dir); - - QStringList filters; - QStringList files = QDir (dir).entryList(filters, QDir::AllDirs); - files.removeAll("."); - files.removeAll(".."); - bool recursive = false; - if (files.size()) - recursive = QMessageBox::question(this, "Add all folders", "Subfolders have been detected, add everything?", QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes; - plman.parseAndAddFolder(dir, recursive); -} - - -void MainWindow::addUrl() -{ -#ifdef AVOID_INPUT_DIALOG - QString url = "http://war.str3am.com:7970"; -#else - QString url = QInputDialog::getText(this, "Get URL", "Please type in the stream URL"); -#endif - if (url.isEmpty() || !url.toLower().startsWith("http")) - return; - QStringList toadd; - toadd << url; - plman.addStringList(toadd); -} - - -void MainWindow::about() -{ - QMessageBox::information(this, tr("About TomAmp v0.1"), - tr("TomAmp is a simple playlist-based music player.\n\n" - "(c) 2010 Tamas Marki \n\n" - "Please send comments and bug reports to the above e-mail address.\n\n" - "Icons by http://itweek.deviantart.com/")); -} - -void MainWindow::stateChanged(Phonon::State newState, Phonon::State /* oldState */) -{ - switch (newState) - { - case Phonon::ErrorState: - if (mediaObject->errorType() == Phonon::FatalError) - { -// QMessageBox::warning(this, tr("Fatal Error"), -// mediaObject->errorString() + mediaObject->currentSource().fileName() + ", " + mediaObject->currentSource().url().toString()); - } - else - { -// QMessageBox::warning(this, tr("Error"), -// mediaObject->errorString()); - } - next (); - break; - case Phonon::PlayingState: - setWindowTitle(mediaObject->metaData().value("TITLE") + " - TomAmp"); - pauseAction->setVisible(true); - playAction->setVisible (false); - playAction->setEnabled(false); - pauseAction->setEnabled(true); - stopAction->setEnabled(true); - //lastPlayed = plman.indexOf(mediaObject->currentSource()); - break; - case Phonon::StoppedState: - setWindowTitle("TomAmp"); - stopAction->setEnabled(false); - playAction->setEnabled(true); - pauseAction->setVisible(false); - playAction->setVisible(true); - pauseAction->setEnabled(false); - timeLcd->display("00:00:00"); - unhighlightRow(plman.indexOf(mediaObject->currentSource())); - break; - case Phonon::PausedState: - pauseAction->setEnabled(false); - stopAction->setEnabled(true); - pauseAction->setVisible(false); - playAction->setVisible(true); - playAction->setEnabled(true); - break; - case Phonon::BufferingState: - break; - default: - ; - } -} - -void MainWindow::next() -{ - bool wasPlaying = isPlaying; - if (mediaObject->state () == Phonon::ErrorState) - wasPlaying = true; - int index = plman.indexOf(mediaObject->currentSource()); - if (shuffle) - { - index = shuffleList.indexOf(plman.indexOf(mediaObject->currentSource())) + 1; - while (index < shuffleList.size () && !plman.getItem(shuffleList[index]).playable) - { - index += 1; - } - if (index < shuffleList.size ()) - { - setItem (index, wasPlaying); - } - else if (repeat) - { - index = 0; - while ((index) < shuffleList.size () && !plman.getItem(shuffleList[index]).playable) - { - index += 1; - } - setItem (index, wasPlaying); - } - } - else - { - index++; - while ((index) < plman.size () && !plman.getItem(index).playable) - { - index += 1; - } - if (index < plman.size()) - { - setItem (index, wasPlaying); - } - else if (repeat) - { - index = 0; - while ((index) < plman.size () && !plman.getItem(index).playable) - { - index += 1; - } - setItem (index, wasPlaying); - } - } -} - -void MainWindow::setItem(int i, bool doplay) -{ - if (i < plman.size() && i >= 0) - { - if (lastPlayed >= 0) - unhighlightRow(lastPlayed); - if (shuffle) - { - mediaObject->setCurrentSource(plman.at (shuffleList[i])); - } - else - { - mediaObject->setCurrentSource(plman.at(i)); - } - } - if (doplay && mediaObject->currentSource().type() != Phonon::MediaSource::Invalid) - { - play(); - } - else - stop (); -} - -void MainWindow::previous() -{ - bool wasPlaying = isPlaying;//(mediaObject->state () == Phonon::PlayingState); - if (mediaObject->state () == Phonon::ErrorState) - wasPlaying = true; - int index = plman.indexOf(mediaObject->currentSource()); - if (shuffle) - { - index = shuffleList.indexOf(plman.indexOf(mediaObject->currentSource())) - 1; - while (index >= 0 && !plman.getItem(shuffleList[index]).playable) - { - index--; - } - if (index >= 0) - { - setItem (index, wasPlaying); - } - else if (repeat) - { - index = plman.size () - 1; - while (index >= 0 && !plman.getItem(shuffleList[index]).playable) - { - index--; - } - setItem (index, wasPlaying); - } -/* if (index < 0) - wasPlaying = false;*/ - - } - else - { - index--; - while ((index) >= 0 && !plman.getItem(index).playable) - { - index--; - } - if (index >= 0) - { - setItem (index, wasPlaying); - } - else if (repeat) - { - index = plman.size() - 1; - while ((index) >= 0 && !plman.getItem(index).playable) - { - index--; - } - setItem (index, wasPlaying); - } - } -} - -void MainWindow::highlightRow (int i) -{ - for (int j = 0; j < 3; ++j) - { - QTableWidgetItem* item = musicTable->item(i, j); - if (item) - { - QFont font = item->font(); - font.setBold(true); - font.setItalic(true); - item->setFont(font); - } - } -} - -void MainWindow::unhighlightRow (int i) -{ - for (int j = 0; j < 3; ++j) - { - QTableWidgetItem* item = musicTable->item(i, j); - if (item) - { - QFont font = item->font(); - font.setBold(false); - font.setItalic(false); - item->setFont(font); - } - } -} - - -void MainWindow::tick(qint64 time) -{ - QTime displayTime((time / 3600000), (time / 60000) % 60, (time / 1000) % 60); - - timeLcd->display(displayTime.toString("HH:mm:ss")); -} - -void MainWindow::tableClicked(int row, int /* column */) -{ -// bool wasPlaying = mediaObject->state() == Phonon::PlayingState; - -/* mediaObject->stop(); - mediaObject->clearQueue();*/ - - if (row >= plman.size()) - return; - - int index = row; - while (index < shuffleList.size () && !plman.getItem(index).playable) - { - index += 1; - } - if (plman.size() > index) - { - if (shuffle) - index = shuffleList.indexOf(index); - setItem (index, true); -// mediaObject->play(); - } - else - { - index = 0; - while (index < plman.size () && !plman.getItem(index).playable) - { - index += 1; - } - if (plman.size() > index) - { - if (shuffle) - index = shuffleList.indexOf(index); - setItem (index, true); -// mediaObject->play(); - } - } - -} - -void MainWindow::sourceChanged(const Phonon::MediaSource &source) -{ - int ind = plman.indexOf(source); - highlightRow(ind); - unhighlightRow(lastPlayed); - lastPlayed = ind; - musicTable->selectRow(ind); - timeLcd->display("00:00:00"); -} - - -void MainWindow::aboutToFinish() -{ - int index = plman.indexOf(mediaObject->currentSource()) + 1; - if (shuffle) - { - index = shuffleList.indexOf(plman.indexOf(mediaObject->currentSource())) + 1; - if (index < shuffleList.size ()) - { - mediaObject->enqueue(plman.at (shuffleList[index])); - } - else if (repeat) - { - mediaObject->enqueue(plman.at (shuffleList[0])); - } - - } - else - { - if (plman.size() > index) - { - mediaObject->enqueue(plman.at(index)); - } - else if (repeat) - { - mediaObject->enqueue(plman.at(0)); - } - } -} - -void MainWindow::finished() -{ -} - -void MainWindow::setupActions() -{ - playAction = new QAction(QIcon (QPixmap (":images/play")), "", this); - playAction->setShortcut(tr("Crl+P")); - playAction->setDisabled(true); - pauseAction = new QAction(QIcon (QPixmap (":images/pause")), "", this); - pauseAction->setShortcut(tr("Ctrl+A")); - pauseAction->setDisabled(true); - pauseAction->setVisible(false); - stopAction = new QAction(QIcon (QPixmap (":images/stop")), "", this); - stopAction->setShortcut(tr("Ctrl+S")); - stopAction->setDisabled(true); - nextAction = new QAction(QIcon (QPixmap (":images/next")), "", this); - nextAction->setShortcut(tr("Ctrl+N")); - previousAction = new QAction(QIcon (QPixmap (":images/previous")), "", this); - previousAction->setShortcut(tr("Ctrl+R")); - if (repeat) - repeatAction = new QAction(QIcon (QPixmap (":images/repeatActive")), "", this); - else - repeatAction = new QAction(QIcon (QPixmap (":images/repeat")), "", this); - repeatAction->setCheckable(true); - repeatAction->setChecked(repeat); - repeatAction->setShortcut(tr("Ctrl+I")); - if (shuffle) - shuffleAction = new QAction(QIcon (QPixmap (":images/shuffleActive")), "", this); - else - shuffleAction = new QAction(QIcon (QPixmap (":images/shuffle")), "", this); - shuffleAction->setCheckable(true); - shuffleAction->setChecked(shuffle); - shuffleAction->setShortcut(tr("Ctrl+H")); - volumeAction = new QAction(QIcon (QPixmap (":images/volume")), "", this); - volumeAction->setCheckable(true); - volumeAction->setShortcut(tr("Ctrl+V")); - addFilesAction = new QAction(tr("Add &File"), this); - addFilesAction->setShortcut(tr("Ctrl+F")); - addFoldersAction = new QAction(tr("Add F&older"), this); - addFoldersAction->setShortcut(tr("Ctrl+O")); - addUrlAction = new QAction(tr("Add &Url"), this); - addUrlAction->setShortcut(tr("Ctrl+U")); - savePlaylistAction = new QAction (tr("Sa&ve Playlist"), this); - savePlaylistAction->setShortcut(tr ("Ctrl+V")); - loadPlaylistAction = new QAction (tr("&Load Playlist"), this); - loadPlaylistAction->setShortcut(tr("Ctrl+L")); - clearPlaylistAction = new QAction (tr("&Clear Playlist"), this); - clearPlaylistAction->setShortcut(tr("Ctrl+C")); - exitAction = new QAction(tr("E&xit"), this); - exitAction->setShortcut(tr("Ctrl+X")); - aboutAction = new QAction(tr("A&bout"), this); - aboutAction->setShortcut(tr("Ctrl+B")); - aboutQtAction = new QAction(tr("About &Qt"), this); - aboutQtAction->setShortcut(tr("Ctrl+Q")); -/* removeSelected = new QAction (tr("&Delete from playlist")); - removeSelected->setShortcut(tr ("Ctrl+D"));*/ - - connect(playAction, SIGNAL(triggered()), this, SLOT(play())); - connect(pauseAction, SIGNAL(triggered()), mediaObject, SLOT(pause()) ); - connect(stopAction, SIGNAL(triggered()), this, SLOT(stop())); - connect(repeatAction, SIGNAL(triggered()), this, SLOT(repeatToggle())); - connect(shuffleAction, SIGNAL(triggered()), this, SLOT(shuffleToggle())); - connect(volumeAction, SIGNAL(triggered()), this, SLOT(volumeToggle())); - - connect(addFilesAction, SIGNAL(triggered()), this, SLOT(addFiles())); - connect(addFoldersAction, SIGNAL(triggered()), this, SLOT(addFolder())); - connect(addUrlAction, SIGNAL(triggered()), this, SLOT(addUrl())); - connect (savePlaylistAction, SIGNAL (triggered()), this, SLOT (savePlaylist())); - connect (loadPlaylistAction, SIGNAL (triggered()), this, SLOT (loadPlaylist())); - connect (clearPlaylistAction, SIGNAL (triggered()), &plman, SLOT (clearPlaylist())); - connect (nextAction, SIGNAL(triggered()), this, SLOT(next())); - connect (previousAction, SIGNAL(triggered()), this, SLOT(previous())); - connect(exitAction, SIGNAL(triggered()), this, SLOT(close())); - connect(aboutAction, SIGNAL(triggered()), this, SLOT(about())); - connect(aboutQtAction, SIGNAL(triggered()), qApp, SLOT(aboutQt())); -// connect (removeSelected, SIGNAL (triggered()), this, SLOT (removeSelectedItem())); -} - -void MainWindow::removeSelectedItem() -{ - if (QMessageBox::question(this, "Confirm remove", "Are you sure you want to remove this item?", QMessageBox::Yes, QMessageBox::No) == QMessageBox::No) - return; - int row = musicTable->currentRow(); - if (row >= 0) - plman.removeItem(row); -} - -void MainWindow::removeAllButSelectedItem() -{ - if (QMessageBox::question(this, "Confirm remove", "Are you sure you want to remove all other items?", QMessageBox::Yes, QMessageBox::No) == QMessageBox::No) - return; - int row = musicTable->currentRow(); - if (row >= 0) - { - QString uri = plman.getItem(row).uri; - QStringList lst; - lst << uri; - plman.clearPlaylist(); - plman.addStringList(lst); - } -} - -void MainWindow::repeatToggle () -{ - repeat = !repeat; - settings.setValue("repeat", QVariant (repeat)); - if (repeat) - repeatAction->setIcon(QIcon (QPixmap (":images/repeatActive"))); - else - repeatAction->setIcon(QIcon (QPixmap (":images/repeat"))); -} - -void MainWindow::shuffleToggle () -{ - shuffle = !shuffle; - settings.setValue("shuffle", QVariant (shuffle)); - if (shuffle) - shuffleAction->setIcon(QIcon (QPixmap (":images/shuffleActive"))); - else - shuffleAction->setIcon(QIcon (QPixmap (":images/shuffle"))); -} - -void MainWindow::volumeToggle () -{ - volumeSlider->setVisible(volumeAction->isChecked()); -} - -void MainWindow::play() -{ - mediaObject->play(); - lastPlayed = plman.indexOf(mediaObject->currentSource()); - highlightRow(lastPlayed); - isPlaying = true; -} - -void MainWindow::stop() -{ - mediaObject->stop(); - isPlaying = false; -} - - -void MainWindow::setupMenus() -{ - QMenu *fileMenu = menuBar()->addMenu(tr("&File")); - fileMenu->addAction(addFilesAction); - fileMenu->addAction(addFoldersAction); - fileMenu->addAction(addUrlAction); - fileMenu->addSeparator(); - fileMenu->addAction(savePlaylistAction); - fileMenu->addAction(loadPlaylistAction); - fileMenu->addAction(clearPlaylistAction); -// fileMenu->addAction(exitAction); - - QMenu *aboutMenu = menuBar()->addMenu(tr("&Help")); - aboutMenu->addAction(aboutAction); - aboutMenu->addAction(aboutQtAction); -} - -void MainWindow::setupUi() -{ - QToolBar *bar = new QToolBar; - - bar->setOrientation(Qt::Vertical); - bar->setStyleSheet("padding:7px"); - //bar->addAction(volumeAction); - - seekSlider = new Phonon::SeekSlider(this); - seekSlider->setMediaObject(mediaObject); - - volumeSlider = new Phonon::VolumeSlider(this); - volumeSlider->setAudioOutput(audioOutput); - volumeSlider->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum); - volumeSlider->setOrientation(Qt::Horizontal); - volumeSlider->setMuteVisible(false); -// volumeAddedAction = bar->addWidget(volumeSlider); -// volumeAddedAction->setVisible(false); - bar->addAction(playAction); - bar->addAction(pauseAction); - bar->addAction(stopAction); - bar->addAction(repeatAction); - bar->addAction(shuffleAction); - bar->addAction(nextAction); - bar->addAction(previousAction); - - contextMenu = new QMenu (this); - removeSelected = contextMenu->addAction(tr ("Remove selected")); - removeAllButSelected = contextMenu->addAction(tr("Remove all but selected")); - connect (removeSelected, SIGNAL (triggered()), this, SLOT (removeSelectedItem())); - connect (removeAllButSelected, SIGNAL (triggered()), this, SLOT (removeAllButSelectedItem())); - - - timeLcd = new QLCDNumber; - - QStringList headers; - headers << tr("Artist") << tr("Title") << tr("Album") << "Controls"; - - musicTable = new QTableWidget(0, 4); - musicTable->setHorizontalHeaderLabels(headers); - musicTable->setSelectionMode(QAbstractItemView::SingleSelection); - musicTable->setSelectionBehavior(QAbstractItemView::SelectRows); - connect(musicTable, SIGNAL(cellDoubleClicked(int,int)), - this, SLOT(tableClicked(int,int))); - connect(musicTable, SIGNAL(cellClicked(int,int)), - this, SLOT(cellClicked(int,int))); -/* for (int i = 0; i < 3; ++i) - { - if (!musicTable->horizontalHeaderItem(i)) - continue; - musicTable->horizontalHeaderItem(i)->setBackgroundColor(QColor (128, 128, 255));; - musicTable->horizontalHeaderItem(i)->setForeground(QColor (255, 255, 255)); - }*/ - for (int i = 0; i < musicTable->columnCount(); ++i) - { - QString lab = QString ("colWidth_%1").arg (i); - int val = settings.value(lab, 0).toInt(); - if (val) - musicTable->setColumnWidth(i, val); -// settings.setValue(lab, musicTable->columnWidth(i)); - } - - - QHBoxLayout *seekerLayout = new QHBoxLayout; - QToolBar* bar2 = new QToolBar; - bar2->addAction(volumeAction); - seekerLayout->addWidget(bar2); - seekerLayout->addWidget(volumeSlider); - seekerLayout->addWidget(seekSlider); - seekerLayout->addWidget(timeLcd); - - QVBoxLayout *playbackLayout = new QVBoxLayout; - volumeSlider->hide (); - playbackLayout->addWidget(bar); - - QVBoxLayout *seekAndTableLayout = new QVBoxLayout; - - seekAndTableLayout->addWidget(musicTable); - seekAndTableLayout->addLayout(seekerLayout); - - QHBoxLayout *mainLayout = new QHBoxLayout; - mainLayout->addLayout(seekAndTableLayout); - mainLayout->addLayout(playbackLayout); - - QWidget *widget = new QWidget; - widget->setLayout(mainLayout); - - setCentralWidget(widget); - setWindowTitle("TomAmp"); -} - -void MainWindow::cellClicked(int /*row*/, int) -{ -} - -void MainWindow::contextMenuEvent (QContextMenuEvent*e) -{ - if (!childAt (e->pos())) - return; - if (childAt (e->pos())->parentWidget() != musicTable) - return; - contextMenu->popup(e->globalPos()); -} - - -void MainWindow::setupShuffleList() -{ - QList tmp; - int index = plman.indexOf(mediaObject->currentSource()); - if (index < 0) - index = 0; - for (int i = 0; i < plman.size(); ++i) - { - if ((i != index)) - tmp.append(i); - } - shuffleList.clear(); - shuffleList.append (index); - while (tmp.size ()) - { - int ind = qrand () % tmp.size(); - shuffleList.append(tmp[ind]); - tmp.removeAt(ind); - } -} - -void MainWindow::savePlaylist () -{ - QString filename = QFileDialog::getSaveFileName(this, tr("Please select file name"), "", "Playlist Files (*.m3u *.pls)"); - if (filename.isEmpty()) - return; - plman.savePlaylist(filename); -} - -void MainWindow::loadPlaylist () -{ - QString filename = QFileDialog::getOpenFileName(this, tr("Select playlist file to load"), "", "*.m3u *.pls"); - if (filename.isEmpty()) - return; - plman.loadPlaylist (filename); -} - -void MainWindow::playlistChanged(int from) -{ - while (musicTable->rowCount() > from) - { - musicTable->removeRow(musicTable->rowCount () - 1); - } - int firstGood = -1; - for (int i = from; i < plman.size (); ++i) - { - if (firstGood < 0 && plman.getItem (i).playable) - firstGood = i; - int currentRow = musicTable->rowCount(); - musicTable->insertRow(currentRow); - setRowFromItem (currentRow, plman.getItem(i)); - } -/* if (plman.indexOf(mediaObject->currentSource()) < 0) - { - setItem (firstGood, false); - }*/ - setupShuffleList(); -} - -void MainWindow::setRowFromItem (int row, const PlaylistItem& item) -{ - if (row >= musicTable->rowCount()) - return; - if (item.artist.isEmpty() && item.title.isEmpty()) - { - QTableWidgetItem *item1 = new QTableWidgetItem(item.uri); - item1->setFlags(item1->flags() ^ Qt::ItemIsEditable); - musicTable->setItem(row, 1, item1); - } - else - { - QTableWidgetItem *item1 = new QTableWidgetItem(item.artist); - item1->setFlags(item1->flags() ^ Qt::ItemIsEditable); - musicTable->setItem(row, 0, item1); - QTableWidgetItem *item2 = new QTableWidgetItem(item.title); - item2->setFlags(item2->flags() ^ Qt::ItemIsEditable); - musicTable->setItem(row, 1, item2); - QTableWidgetItem *item3 = new QTableWidgetItem(item.album); - item3->setFlags(item3->flags() ^ Qt::ItemIsEditable); - musicTable->setItem(row, 2, item3); - } - - if (!musicTable->cellWidget(row, 3)) - { - QToolBar* bar = new QToolBar; - QLabel* up = new QLabel; - up->setText(QString::fromUtf8("▲")); - up->setStyleSheet("padding-right:3px;"); - up->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum); - bar->addWidget(up); - QLabel* down = new QLabel; - down->setText(QString::fromUtf8("▼")); - down->setStyleSheet("padding-right:3px;"); - bar->addWidget(down); - QLabel* del = new QLabel; - del->setText(QString::fromUtf8("╳")); - del->setStyleSheet("padding-right:3px;"); - bar->addWidget(del); - down->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum); - bar->setProperty("row", row); - musicTable->setCellWidget(row, 3, bar); - connect (up, SIGNAL (linkActivated (const QString&)), this, SLOT (buttonUp ())); - connect (down, SIGNAL (linkActivated (const QString&)), this, SLOT (buttonDown ())); - connect (del, SIGNAL (linkActivated (const QString&)), this, SLOT (buttonDel ())); - } -} - -void MainWindow::buttonUp() -{ - int i = sender()->parent()->property("row").toInt(); - qDebug () << "Presses up on " << i; - if (i) - { - plman.moveItemUp(i); - setRowFromItem (i, plman.getItem(i)); - setRowFromItem (i - 1, plman.getItem(i - 1)); - musicTable->cellWidget(i, 3)->setProperty("row", i); - musicTable->cellWidget(i - 1, 3)->setProperty("row", i - 1); - musicTable->selectRow(i - 1); - } -} - -void MainWindow::buttonDown() -{ - int i = sender()->parent()->property("row").toInt(); - qDebug () << "Presses down on " << i; - if (i < plman.size() - 1) - { - plman.moveItemDown(i); - setRowFromItem (i, plman.getItem(i)); - setRowFromItem (i + 1, plman.getItem(i + 1)); - musicTable->cellWidget(i, 3)->setProperty("row", i); - musicTable->cellWidget(i + 1, 3)->setProperty("row", i + 1); - musicTable->selectRow(i + 1); - } -} - -void MainWindow::buttonDel() -{ - int i = sender()->parent()->property("row").toInt(); - qDebug () << "Presses del on " << i; - if (i < plman.size()) - { - plman.removeItem(i); - } -} - -void MainWindow::itemUpdated(int index) -{ - if (plman.indexOf(mediaObject->currentSource()) < 0 && plman.getItem (index).playable) - { - setItem (index, false); - } - setRowFromItem (index, plman.getItem(index)); - if (plman.indexOf(mediaObject->currentSource()) == index) - { - if (shuffle) index = shuffleList.indexOf(index); - setItem (index, false); - } -} - -void MainWindow::itemRemoved (int i) -{ - musicTable->removeRow(i); - for (int j = i ? (i - 1) : 0; j < musicTable->rowCount(); ++j) - { - if (musicTable->cellWidget(j, 3)) - musicTable->cellWidget(j, 3)->setProperty("row", j); - } -} diff --git a/mainwindow.h b/mainwindow.h deleted file mode 100644 index ce4edca..0000000 --- a/mainwindow.h +++ /dev/null @@ -1,154 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial Usage -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef MAINWINDOW_H -#define MAINWINDOW_H - -#include -#include -#include -#include -#include -#include -#include -#include -#include "playlistmanager.h" - -class QAction; -class QTableWidget; -class QLCDNumber; - - -class MainWindow : public QMainWindow -{ - Q_OBJECT - -public: - MainWindow(); - ~MainWindow (); - - QSize sizeHint() const - { - return QSize(800, 480); - } - -private slots: - void addFiles(); - void addFolder(); - void addUrl (); - void repeatToggle (); - void shuffleToggle (); - void volumeToggle (); - void about(); - void stateChanged(Phonon::State newState, Phonon::State oldState); - void tick(qint64 time); - void sourceChanged(const Phonon::MediaSource &source); - void aboutToFinish(); - void finished(); - void tableClicked(int row, int column); - void play(); - void stop(); - void next(); - void previous(); - void cellClicked(int row, int column); - void savePlaylist (); - void loadPlaylist (); - void playlistChanged (int from); - void itemUpdated (int index); - void setItem (int ind, bool doplay); - void removeSelectedItem (); - void removeAllButSelectedItem (); - void highlightRow (int i); - void unhighlightRow (int i); - void buttonUp (); - void buttonDown (); - void buttonDel (); - void itemRemoved (int i); - -protected: - void contextMenuEvent (QContextMenuEvent*e); -private: - void setupActions(); - void setupMenus(); - void setupUi(); - void setupShuffleList(); - void setRowFromItem (int row, const PlaylistItem& item); - - Phonon::SeekSlider *seekSlider; - Phonon::MediaObject *mediaObject; - Phonon::AudioOutput *audioOutput; - Phonon::VolumeSlider *volumeSlider; - - PlaylistManager plman; - - QAction *playAction; - QAction *pauseAction; - QAction *stopAction; - QAction *repeatAction; - QAction *shuffleAction; - QAction *volumeAction; - QAction *volumeAddedAction; - QAction *nextAction; - QAction *previousAction; - QAction *addFilesAction; - QAction *addFoldersAction; - QAction *addUrlAction; - QAction *savePlaylistAction; - QAction *loadPlaylistAction; - QAction *clearPlaylistAction; - QAction *exitAction; - QAction *aboutAction; - QAction *aboutQtAction; - QAction *removeSelected; - QAction *removeAllButSelected; - QMenu *contextMenu; - QToolBar *bar; - QLCDNumber *timeLcd; - QTableWidget *musicTable; - bool repeat; - bool shuffle; - QSettings settings; - QList shuffleList; - int lastPlayed; - bool isPlaying; -}; - -#endif diff --git a/optiondialog.cpp b/optiondialog.cpp deleted file mode 100644 index ed40032..0000000 --- a/optiondialog.cpp +++ /dev/null @@ -1,6 +0,0 @@ -#include "optiondialog.h" - -OptionDialog::OptionDialog(QWidget *parent) : - QDialog(parent) -{ -} diff --git a/optiondialog.h b/optiondialog.h deleted file mode 100644 index 12d15ce..0000000 --- a/optiondialog.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef OPTIONDIALOG_H -#define OPTIONDIALOG_H - -#include - -class OptionDialog : public QDialog -{ - Q_OBJECT -public: - explicit OptionDialog(QWidget *parent = 0); - -signals: - -public slots: - -}; - -#endif // OPTIONDIALOG_H diff --git a/playlistmanager.cpp b/playlistmanager.cpp deleted file mode 100644 index 61681a2..0000000 --- a/playlistmanager.cpp +++ /dev/null @@ -1,349 +0,0 @@ -#include "playlistmanager.h" -#include -#include -#include - -QStringList allowedExtensions; - - -PlaylistManager::PlaylistManager(QWidget* parent) - : parentWidget (parent), lastMetaRead (-1) -{ - allowedExtensions << "mp3" << "ogg" << "wav" << "wmv" << "wma"; -// qDebug () << Phonon::BackendCapabilities::availableMimeTypes(); - metaInformationResolver = new Phonon::MediaObject(parent); - connect(metaInformationResolver, SIGNAL(stateChanged(Phonon::State,Phonon::State)), - this, SLOT(metaStateChanged(Phonon::State,Phonon::State))); -} - -int PlaylistManager::indexOf(const Phonon::MediaSource &s) const -{ - for (int i = 0; i < items.size(); ++i) - { - if (items[i].source == s) - return i; - } - return -1; -} - -void PlaylistManager::parseAndAddFolder(const QString &dir, bool recursive) -{ - QStringList filters; -// filters << "*.mp3"; - - QStringList files = QDir (dir).entryList(filters); - - if (files.isEmpty()) - return; - - qDebug () << "Parsing folder " << dir; - - //settings.setValue("LastFolder", dir); - int index = items.size(); - foreach (QString string, files) - { - if (string == "." || string == "..") - continue; - QString fname = dir + "/" + string; - QFileInfo fi (fname); - if (fi.isDir()) - { - if (recursive) - parseAndAddFolder(fname, true); - continue; - } - if (fileSupported(fname)) - { - qDebug () << "Adding: " << fname; - items.append(PlaylistItem (PlaylistItem (fname))); - } - } -// if (!items.isEmpty()) - if (items.size () > index) - { - metaInformationResolver->setCurrentSource(items.at(index).source); - lastMetaRead = index; - } - qDebug () << " SIZE: " << items.size (); - emit playlistChanged (index); -} - -void PlaylistManager::addStringList(const QStringList& list) -{ - int index = items.size(); - foreach (QString string, list) - { - if (fileSupported(string) || string.toLower().startsWith("http")) - { - qDebug () << "Adding " << string; - items.append(PlaylistItem (string)); - } - } -// if (!items.isEmpty()) - if (items.size () > index) - { - metaInformationResolver->setCurrentSource(items.at(index).source); - lastMetaRead = index; - } - emit playlistChanged(index); -} - -void PlaylistManager::metaStateChanged(Phonon::State newState, Phonon::State oldState) -{ - qDebug () << "Meta state now " << newState << " old state " << oldState; - // This is an ugly hack, since the metaInformationResolver doesn't properly load the assigned source when it's in the error state - // In order to properly read the next file we have to set it as current source again when the resolver entered the stopped state after the error - static bool wasError = false; - if (wasError && newState == Phonon::StoppedState) - { - metaInformationResolver->setCurrentSource(items[lastMetaRead].source); - wasError = false; - return; - } - if (newState == Phonon::ErrorState) - { - wasError = true; - } - - if (newState != Phonon::StoppedState && newState != Phonon::ErrorState) - { - return; - } - - int index = lastMetaRead; - qDebug () << "Reading meta info of " << metaInformationResolver->currentSource().fileName() << " => " << index; - - QMap metaData = metaInformationResolver->metaData(); - - - if (index >= 0 && newState != Phonon::ErrorState) - { - items[index].artist = metaData.value("ARTIST"); - items[index].title = metaData.value("TITLE"); - items[index].album = metaData.value("ALBUM"); - qDebug () << "Info is: " << items[index].artist << " - " << items[index].title; - if (metaData.isEmpty()) - qDebug () << "Detected to be empty: " << items[index].uri; - else - items[index].playable = true; - emit itemUpdated (index); - } - if (index >= 0 && items.size () > index + 1) - { - metaInformationResolver->setCurrentSource(items[index + 1].source); - lastMetaRead = index + 1; - } -} - -void PlaylistManager::savePlaylist(const QString& filenam) -{ - QString filename = filenam; - if (filename.isEmpty()) - return; - bool writepls = false; - if (filename.length() < 4 || (filename.right(4).toLower() != ".m3u" && filename.right(4).toLower() != ".pls")) - { - filename += ".pls"; - writepls = true; - } - else if (filename.right(4).toLower() == ".pls") - writepls = true; - QFile f (filename); - try - { - f.open(QFile::WriteOnly); - if (writepls) - { - f.write ("[playlist]\n"); - f.write (QString ("NumberOfEntries=%1\n").arg (items.size ()).toAscii()); - } - for (int i = 0; i < items.size(); ++i) - { - if (writepls) - { - f.write (QString ("File%1=%2\n").arg (i + 1).arg (items[i].uri).toAscii()); - f.write (QString ("Title%1=%2 - %3 - %4\n").arg (i + 1).arg (items[i].artist).arg (items[i].title).arg (items[i].album).toAscii()); - } - else - { - f.write (items[i].uri.toAscii()); - f.write ("\n"); - } - } - if (writepls) - f.write ("Version=2\n"); - f.close (); - } - catch (...) - { -// QMessageBox::critical(this, "Write error", "Could not write playlist file", QMessageBox::Ok); - } -} - -void PlaylistManager::loadPlaylist(const QString& filename) -{ - clearPlaylist(); - if (filename.right(4).toLower() == ".m3u") - appendPlaylist(filename); - else if (filename.right(4).toLower() == ".pls") - appendPlaylistPLS(filename); - if (!items.isEmpty()) - { - metaInformationResolver->setCurrentSource(items.at(0).source); - lastMetaRead = 0; - } - emit playlistChanged (0); -} - -void PlaylistManager::addPlaylist(const QString& filename) -{ - int index = items.size(); - if (filename.right(4).toLower() == ".m3u") - appendPlaylist(filename); - else if (filename.right(4).toLower() == ".pls") - appendPlaylistPLS(filename); - if (items.size () > index) -// if (!items.isEmpty()) - { - metaInformationResolver->setCurrentSource(items.at(index).source); - lastMetaRead = index; - emit playlistChanged (index); - } -} - -void PlaylistManager::appendPlaylist(const QString& filename) -{ - qDebug () << "Attempting to load playlist: " << filename; - QFile f(filename); - if (!f.open (QFile::ReadOnly)) - return; - QString tmp = f.readAll(); - f.close (); - QStringList lines = tmp.split("\n"); - foreach (QString l, lines) - { - if (l.isEmpty() || (!QFileInfo (l).exists() && (l.indexOf("http") != 0))) - { - continue; - } - qDebug () << "Load " << l; - items.append(PlaylistItem (l)); - } -} - -void PlaylistManager::appendPlaylistPLS(const QString& filename) -{ - qDebug () << "Attempting to load playlist: " << filename; - QFile f(filename); - if (!f.open (QFile::ReadOnly)) - return; - QString tmp = f.readAll(); - f.close (); - QStringList lines = tmp.split("\n"); - QMap filemap; - - foreach (QString l, lines) - { - if (l.isEmpty() || l.trimmed().toLower() == "[playlist]" || l.trimmed().toLower() == "version=2") - { - continue; - } - qDebug () << "PLS " << l; - if (l.trimmed().toLower().left(4) == "file") - { - QStringList tokens = l.split('='); - if (tokens.size () < 2) - continue; - tokens[0] = tokens[0].mid (4); - filemap.insert(tokens[0].toInt (), items.size ()); - qDebug () << tokens; - items.append(PlaylistItem (tokens[1])); - } - else if (l.trimmed().toLower().left(5) == "title") - { - QStringList tokens = l.split('='); - if (tokens.size () < 2) - continue; - tokens[0] = tokens[0].mid (5); - int toupdate = filemap[tokens[0].toInt()]; - qDebug () << "Need to update " << toupdate << " for " << l; - QStringList metatok = tokens[1].split (" - "); - qDebug () << metatok; - if (metatok.size() > 2 && toupdate >= 0 && toupdate < items.size ()) - { - items[toupdate].artist = metatok[0]; - items[toupdate].title = metatok[1]; - metatok = metatok.mid (2); - items[toupdate].album = metatok.join (" - "); - } - else - { - items[toupdate].title = metatok.join (" - "); - } - } - } -} - - -void PlaylistManager::clearPlaylist() -{ - items.clear(); - emit playlistChanged(0); -/* while (musicTable->rowCount()) - musicTable->removeRow(0); - mediaObject->clear();*/ -} - -QStringList PlaylistManager::playlistStrings() const -{ - QStringList ret; - for (int i = 0; i < items.size (); ++i) - ret << items[i].uri; - qDebug () << "Returning playlist " << ret << " SIZE: " << items.size (); - return ret; -} - -void PlaylistManager::removeItem(int i) -{ - items.removeAt (i); - emit itemRemoved(i); -} - - -bool PlaylistManager::fileSupported (const QString& fname) const -{ - QString ext = fname.right(3).toLower(); - foreach (QString e, allowedExtensions) - { - if (ext == e) - return true; - } - - return false; -} - -bool PlaylistManager::moveItemUp (int i) -{ - if (i) - { - PlaylistItem tmp = items[i - 1]; - items[i - 1] = items[i]; - items[i] = tmp; - return true; -// emit playlistChanged(i - 1); - } - return false; -} - -bool PlaylistManager::moveItemDown (int i) -{ - if (i < items.size () - 1) - { - PlaylistItem tmp = items[i + 1]; - items[i + 1] = items[i]; - items[i] = tmp; - return true; -// emit playlistChanged(i - 1); - } - return false; -} diff --git a/playlistmanager.h b/playlistmanager.h deleted file mode 100644 index d1bbaba..0000000 --- a/playlistmanager.h +++ /dev/null @@ -1,61 +0,0 @@ -#ifndef PLAYLISTMANAGER_H -#define PLAYLISTMANAGER_H - -#include -#include -#include - - - -struct PlaylistItem -{ - Phonon::MediaSource source; - QString uri; - bool playable; - bool localFile; - QString title; - QString artist; - QString album; - PlaylistItem (const QString& uri) : source (Phonon::MediaSource (uri)), uri (uri), playable (false), localFile (false) { } - bool operator ==(const Phonon::MediaSource& s) const { return source == s; } -}; - -class PlaylistManager : public QObject -{ - Q_OBJECT -public: - PlaylistManager(QWidget* parent); - void addStringList (const QStringList&); - void parseAndAddFolder (const QString& dir, bool recursive); - void removeItem (int i); - - QStringList playlistStrings () const; - int size () const { return items.size (); } - int indexOf (const Phonon::MediaSource& s) const; - const Phonon::MediaSource& at (int i) { return items[i].source; } - const PlaylistItem& getItem (int i) const { return items[i]; } - bool moveItemUp (int i); - bool moveItemDown (int i); -public slots: - void savePlaylist(const QString& filename); - void loadPlaylist(const QString& filename); - void clearPlaylist(); - void addPlaylist (const QString& filename); -signals: - void playlistChanged (int from); - void itemRemoved (int i); - void itemUpdated (int index); -private slots: - void metaStateChanged(Phonon::State newState, Phonon::State oldState); - void appendPlaylist (const QString& filename); - void appendPlaylistPLS (const QString& filename); -private: - bool fileSupported (const QString& fname) const; - - Phonon::MediaObject *metaInformationResolver; - QList items; - QWidget* parentWidget; - int lastMetaRead; -}; - -#endif // PLAYLISTMANAGER_H diff --git a/tomamp.pro b/tomamp.pro index 13eaa0f..e39cc6a 100644 --- a/tomamp.pro +++ b/tomamp.pro @@ -1,73 +1,8 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2010-07-15T14:44:54 -# -#------------------------------------------------- - -QT += core gui phonon - -TARGET = tomamp -TEMPLATE = app - - -SOURCES += main.cpp\ - mainwindow.cpp \ - playlistmanager.cpp \ - optiondialog.cpp - -HEADERS += mainwindow.h \ - playlistmanager.h \ - optiondialog.h - -FORMS += - -CONFIG += mobility -MOBILITY = - -symbian { - TARGET.UID3 = 0xe3107f4b - # TARGET.CAPABILITY += - TARGET.EPOCSTACKSIZE = 0x14000 - TARGET.EPOCHEAPSIZE = 0x020000 0x800000 +QMAKEVERSION = $$[QMAKE_VERSION] +ISQT4 = $$find(QMAKEVERSION, ^[2-9]) +isEmpty( ISQT4 ) { +error("Use the qmake include with Qt4.4 or greater, on Debian that is qmake-qt4"); } +TEMPLATE = subdirs +SUBDIRS = tomamp -RESOURCES += \ - ampres.qrc - -OTHER_FILES += \ - bugs.txt \ - README - -unix { - # VARIABLES - isEmpty(PREFIX):PREFIX = /usr #/local ? - BINDIR = $$PREFIX/bin - DATADIR = $$PREFIX/share - DEFINES += DATADIR=\"$$DATADIR\" \ - PKGDATADIR=\"$$PKGDATADIR\" - - contains(QT_CONFIG, hildon):{ - DEFINES += CHIMGDIR=\'\"$$DATADIR/$${TARGET}\"\' - } - # MAKE INSTALL - INSTALLS += target \ - imagery \ - desktop \ - iconxpm \ - icon26 \ - icon40 \ - icon64 - target.path = $$BINDIR - imagery.path = $$DATADIR/$${TARGET}/images - imagery.files += ../src/images/*png - desktop.path = $$DATADIR/applications/hildon - desktop.files += $${TARGET}.desktop - iconxpm.path = $$DATADIR/pixmap - iconxpm.files += ../data/maemo/$${TARGET}.xpm - icon26.path = $$DATADIR/icons/hicolor/26x26/apps - icon26.files += ../data/26x26/Tomamp.png - icon40.path = $$DATADIR/icons/hicolor/40x40/apps - icon40.files += ../data/40x40/Tomamp.png - icon64.path = $$DATADIR/icons/hicolor/64x64/apps - icon64.files += ../data/64x64/Tomamp.png -} diff --git a/tomamp/README b/tomamp/README new file mode 100644 index 0000000..9ef4f0b --- /dev/null +++ b/tomamp/README @@ -0,0 +1,7 @@ +TomAmp v0.1 +(c) 2010 Tamas Marki + +TomAmp is a simple playlist-based audio player written in Qt, designed for Maemo. + + +The project is released under the LGPL license. See http://www.gnu.org/licenses/lgpl.html diff --git a/tomamp/ampres.qrc b/tomamp/ampres.qrc new file mode 100644 index 0000000..1673f53 --- /dev/null +++ b/tomamp/ampres.qrc @@ -0,0 +1,15 @@ + + + images/audio-volume-high.png + images/shuffle.png + images/Button Next.png + images/Button Pause.png + images/Button Play.png + images/Button Reload.png + images/Button Stop.png + images/Button Previous.png + images/shuffle Active.png + images/Button Reload Active.png + images/Tomamp.png + + diff --git a/tomamp/bugs.txt b/tomamp/bugs.txt new file mode 100644 index 0000000..8001ce8 --- /dev/null +++ b/tomamp/bugs.txt @@ -0,0 +1,13 @@ +- remember folder position when adding songs (takes time as adding a song and going one folder up for next song jumps to top of folder) +- when saving a playlist, the default path seems invalid, so playlist doesn's save, and no error given +- for some reasom, one folder shows 0 files, but filled with mp3 files (?) +- quit while reading tags causes crash + +Fixed: ++ context menu event outside of musicTable causes crash ++ cancel add folder, add url causes crash ++ doesn't remember add folder folder ++ adding some files can cause a crash ("Blessing, Compassion") ++ bold-italic highlight does not move on normal track switch (when one ends and the next starts) ++ quick next-next while playing stops playback ++ meta info display mismatch (title duplication, some files receive some other file's meta info instead of their ("reality")) (might be related to previous) diff --git a/tomamp/images/Button Next.png b/tomamp/images/Button Next.png new file mode 100644 index 0000000000000000000000000000000000000000..3e18aad5f4197edb195956643ee3f38bee057613 GIT binary patch literal 4573 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 Hu0mjfcJHP9 literal 0 HcmV?d00001 diff --git a/tomamp/images/Button Pause.png b/tomamp/images/Button Pause.png new file mode 100644 index 0000000000000000000000000000000000000000..76ba422627268dda3e492de2e75b2e4a87c7ce5f GIT binary patch literal 4323 zcmV<95FGD`P)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z000IKNkl z1>Og)Zf2uT-ucTifCn@mI0JO=-?OvjQ2Sn*8&kw%QKXQlFl1qIk#u(EXaBi9bY}40 z_#|)%_#+T(ih*xvuenlQc)F{T6Hgu{7Kvc3#agh~%GlCSUq{;`+d0zFPN7(Axq7Yd z^)GsFydG+E8hG>D0=W3t?zWznU-%)(L;`Cq^Z5nl=W{HUN+_iWLk)m*B@xf3KA9jE zi}Cc6M>yQEpTB+f`GukJ$=$%ItpfP-@uN?4zi{#?uy8+_^Rit{@XtA>&*hV`2E8NyMKJ*DRK)1Mn=aemI915 zSYs=PoARNRude>LSX<)e;1Is&@#vmiob2jEYt!8~Fc_@IL@j{V_O`Y5JbS#0``Kwm zM#s@+SxapUw!**~0H(r%wHR$E76Y#J-r%vlyZPRc$H~sl^-QF*Beg!UG7tE!6c>K_ z%yBZ)GYs4vp%^Gifuf`or63?sOXKDF)oWIaRY);V^xhm`Vk*tau1=&77b;P;E(2$e z9qK@9!@%8V}4czDhYthz%wd`r{sIoD1tG~m5S1!N3%2vNTbH03lwS4g2-jVw?a6>5|&%R{Z1&li}upQW|A3E;(AA9${HM>BUuMhTRv9InbX57fE<%JPsP zTnC)iC|w4xjH!a@zcWNrssZ4+S`!@eU6(?!R1LKyddr@^Hdc#8g$hF~YlRDiVrAAY z{lHpEK^5$=S^#YYr6`3VLB-p(HiThWll89b*@gUuDKxZZ?W6;a5EOy{psf~wKRli$ zJ3WKZn$6S*LdY%29LGUONud<7G8C5p1VIoYT@P@u#{B;Q2!V9nC8rH)0gPFP{nGQX zfHeVlmI@iW#GewT#mZN9f*hk3mSzn`hR9X z2#NGO{74MP5iI0#03X%@(AL`X`MK$H4b3g!I0VijtT4q(zd5@`%cZuFY>9e58pHD= z%%!JTnTBg`!#5UYr@?WE#NtF^aXimQN{J9+%Uw!|=lRvWa2)cpS%5b-x{d>D?diIORkmeIGv(!;3}{QZjM7pSjG`rHu;Hb+gH* z@4ofw^u*|;;ofUl9THC_Nv4{pOEr>cND;5!M!bF-v1EO9oM=cJwJH|>eDCewcm3q$(qcY$s^dbUhp? zv09@;MIo0XH378Fo(*1vb^1)w$_uCE}>TGP; z*%?c2+bLW(E*#+*Ym^DY!eVZ2bb4~MckEVQFE9tBf!WGF8|HQAVL#9RI{-Z+f2bK( R3K9SS002ovPDHLkV1gI4G|vD4 literal 0 HcmV?d00001 diff --git a/tomamp/images/Button Play.png b/tomamp/images/Button Play.png new file mode 100644 index 0000000000000000000000000000000000000000..de1a5f3365ac6263acfaa849e46a653ca44fc5fc GIT binary patch literal 4483 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 V0c6Uw8}a}E002ovPDHLkV1o3ehXeos literal 0 HcmV?d00001 diff --git a/tomamp/images/Button Previous.png b/tomamp/images/Button Previous.png new file mode 100644 index 0000000000000000000000000000000000000000..dcaad8d28afbcdda26ed8bf164b0f0b27198ba9a GIT binary patch literal 4545 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 literal 0 HcmV?d00001 diff --git a/tomamp/images/Button Reload Active.png b/tomamp/images/Button Reload Active.png new file mode 100644 index 0000000000000000000000000000000000000000..5f983ddb576a9382de353d7630b93f1e950e6da1 GIT binary patch literal 5016 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 AlK=n! literal 0 HcmV?d00001 diff --git a/tomamp/images/Button Stop.png b/tomamp/images/Button Stop.png new file mode 100644 index 0000000000000000000000000000000000000000..24151547deb5963dbacec7e2415125e9e301e0ba GIT binary patch literal 4284 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 literal 0 HcmV?d00001 diff --git a/tomamp/images/audio-volume-high.png b/tomamp/images/audio-volume-high.png new file mode 100644 index 0000000000000000000000000000000000000000..70ae43a1d773de628ec18d67aa24e3c52016372c GIT binary patch literal 2041 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 literal 0 HcmV?d00001 diff --git a/tomamp/images/shuffle.png b/tomamp/images/shuffle.png new file mode 100644 index 0000000000000000000000000000000000000000..3ce441a88d598b5e97bdaff4cda4896b175e5664 GIT binary patch literal 4733 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 LNkvXXu0mjfWX$b! literal 0 HcmV?d00001 diff --git a/tomamp/main.cpp b/tomamp/main.cpp new file mode 100644 index 0000000..29dd3e6 --- /dev/null +++ b/tomamp/main.cpp @@ -0,0 +1,16 @@ +#include +#include "mainwindow.h" + +int main(int argc, char *argv[]) +{ + QApplication a(argc, argv); + a.setApplicationName("tomamp"); + MainWindow w; +#if defined(Q_WS_S60) + w.showMaximized(); +#else + w.show(); +#endif + + return a.exec(); +} diff --git a/tomamp/mainwindow.cpp b/tomamp/mainwindow.cpp new file mode 100644 index 0000000..a3f1bde --- /dev/null +++ b/tomamp/mainwindow.cpp @@ -0,0 +1,865 @@ +#include +#include +#include + +#include "mainwindow.h" +#include "time.h" + +//#define AVOID_INPUT_DIALOG 0 + +MainWindow::MainWindow() + : plman (this), settings (tr ("TomAmp"), "TomAmp"), isPlaying (false) +{ +#ifdef Q_WS_MAEMO_5 + setAttribute(Qt::WA_Maemo5AutoOrientation, true); +#endif + audioOutput = new Phonon::AudioOutput(Phonon::MusicCategory, this); + mediaObject = new Phonon::MediaObject(this); + + mediaObject->setTickInterval(1000); + connect(mediaObject, SIGNAL(tick(qint64)), this, SLOT(tick(qint64))); + connect(mediaObject, SIGNAL(stateChanged(Phonon::State,Phonon::State)), + this, SLOT(stateChanged(Phonon::State,Phonon::State))); + connect(mediaObject, SIGNAL(currentSourceChanged(Phonon::MediaSource)), + this, SLOT(sourceChanged(Phonon::MediaSource))); + connect(mediaObject, SIGNAL(aboutToFinish()), this, SLOT(aboutToFinish())); + connect (&plman, SIGNAL (playlistChanged (int)), this, SLOT (playlistChanged(int))); + connect (&plman, SIGNAL (itemUpdated(int)), this, SLOT (itemUpdated (int))); + connect (&plman, SIGNAL (itemRemoved(int)), this, SLOT (itemRemoved (int))); + + Phonon::createPath(mediaObject, audioOutput); + + qsrand (time (NULL)); + repeat = settings.value("repeat", false).toBool(); + shuffle = settings.value("shuffle", false).toBool(); + setupShuffleList(); + setupActions(); + setupMenus(); + setupUi(); + show (); + timeLcd->display("00:00:00"); + plman.addStringList(settings.value("lastPlaylist").toStringList()); + setupShuffleList(); + int curind = settings.value("currentIndex", -1).toInt (); + if (curind >= 0) + setItem (curind, false); + audioOutput->setVolume(settings.value("volume", .5).toReal()); + QApplication::setWindowIcon(QIcon (QPixmap (":images/tomamp"))); +} + +MainWindow::~MainWindow() +{ + settings.setValue("shuffle", shuffle); + settings.setValue("repeat", repeat); + settings.setValue("lastPlaylist", plman.playlistStrings()); + settings.setValue("volume", audioOutput->volume()); + settings.setValue("currentIndex", plman.indexOf(mediaObject->currentSource())); + for (int i = 0; i < musicTable->columnCount(); ++i) + { + QString lab = QString ("colWidth_%1").arg (i); + settings.setValue(lab, musicTable->columnWidth(i)); + } +} + +void MainWindow::addFiles() +{ + QString folder = settings.value("LastFolder").toString(); + if (folder.isEmpty()) + folder = QDesktopServices::storageLocation(QDesktopServices::MusicLocation); + QStringList files = QFileDialog::getOpenFileNames(this, tr("Select Files To Add"), + folder, "Music files (*.mp3 *.ogg *.wav *.flac);;Playlists (*.m3u *.pls)"); + + if (files.isEmpty()) + return; + + QString dir = QFileInfo (files[0]).absoluteDir().absolutePath(); + settings.setValue("LastFolder", dir); + QStringList toadd; + foreach (QString string, files) + { + if (string.toLower().endsWith(".pls") || string.toLower().endsWith(".m3u")) + plman.addPlaylist(string); + else + toadd.append (string); + } + plman.addStringList(toadd); +} + +void MainWindow::addFolder() +{ + QString folder = settings.value("LastFolder").toString(); + if (folder.isEmpty()) + folder = QDesktopServices::storageLocation(QDesktopServices::MusicLocation); + QString dir = QFileDialog::getExistingDirectory(this, + tr("Select Directory To Add"), + folder); + + if (dir.isEmpty()) + return; + + settings.setValue("LastFolder", dir); + + QStringList filters; + QStringList files = QDir (dir).entryList(filters, QDir::AllDirs); + files.removeAll("."); + files.removeAll(".."); + bool recursive = false; + if (files.size()) + recursive = QMessageBox::question(this, "Add all folders", "Subfolders have been detected, add everything?", QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes; + plman.parseAndAddFolder(dir, recursive); +} + + +void MainWindow::addUrl() +{ +#ifdef AVOID_INPUT_DIALOG + QString url = "http://war.str3am.com:7970"; +#else + QString url = QInputDialog::getText(this, "Get URL", "Please type in the stream URL"); +#endif + if (url.isEmpty() || !url.toLower().startsWith("http")) + return; + QStringList toadd; + toadd << url; + plman.addStringList(toadd); +} + + +void MainWindow::about() +{ + QMessageBox::information(this, tr("About TomAmp v0.1"), + tr("TomAmp is a simple playlist-based music player.\n\n" + "(c) 2010 Tamas Marki \n\n" + "Please send comments and bug reports to the above e-mail address.\n\n" + "Icons by http://itweek.deviantart.com/")); +} + +void MainWindow::stateChanged(Phonon::State newState, Phonon::State /* oldState */) +{ + switch (newState) + { + case Phonon::ErrorState: + if (mediaObject->errorType() == Phonon::FatalError) + { +// QMessageBox::warning(this, tr("Fatal Error"), +// mediaObject->errorString() + mediaObject->currentSource().fileName() + ", " + mediaObject->currentSource().url().toString()); + } + else + { +// QMessageBox::warning(this, tr("Error"), +// mediaObject->errorString()); + } + next (); + break; + case Phonon::PlayingState: + setWindowTitle(mediaObject->metaData().value("TITLE") + " - TomAmp"); + pauseAction->setVisible(true); + playAction->setVisible (false); + playAction->setEnabled(false); + pauseAction->setEnabled(true); + stopAction->setEnabled(true); + //lastPlayed = plman.indexOf(mediaObject->currentSource()); + break; + case Phonon::StoppedState: + setWindowTitle("TomAmp"); + stopAction->setEnabled(false); + playAction->setEnabled(true); + pauseAction->setVisible(false); + playAction->setVisible(true); + pauseAction->setEnabled(false); + timeLcd->display("00:00:00"); + unhighlightRow(plman.indexOf(mediaObject->currentSource())); + break; + case Phonon::PausedState: + pauseAction->setEnabled(false); + stopAction->setEnabled(true); + pauseAction->setVisible(false); + playAction->setVisible(true); + playAction->setEnabled(true); + break; + case Phonon::BufferingState: + break; + default: + ; + } +} + +void MainWindow::next() +{ + bool wasPlaying = isPlaying; + if (mediaObject->state () == Phonon::ErrorState) + wasPlaying = true; + int index = plman.indexOf(mediaObject->currentSource()); + if (shuffle) + { + index = shuffleList.indexOf(plman.indexOf(mediaObject->currentSource())) + 1; + while (index < shuffleList.size () && !plman.getItem(shuffleList[index]).playable) + { + index += 1; + } + if (index < shuffleList.size ()) + { + setItem (index, wasPlaying); + } + else if (repeat) + { + index = 0; + while ((index) < shuffleList.size () && !plman.getItem(shuffleList[index]).playable) + { + index += 1; + } + setItem (index, wasPlaying); + } + } + else + { + index++; + while ((index) < plman.size () && !plman.getItem(index).playable) + { + index += 1; + } + if (index < plman.size()) + { + setItem (index, wasPlaying); + } + else if (repeat) + { + index = 0; + while ((index) < plman.size () && !plman.getItem(index).playable) + { + index += 1; + } + setItem (index, wasPlaying); + } + } +} + +void MainWindow::setItem(int i, bool doplay) +{ + if (i < plman.size() && i >= 0) + { + if (lastPlayed >= 0) + unhighlightRow(lastPlayed); + if (shuffle) + { + mediaObject->setCurrentSource(plman.at (shuffleList[i])); + } + else + { + mediaObject->setCurrentSource(plman.at(i)); + } + } + if (doplay && mediaObject->currentSource().type() != Phonon::MediaSource::Invalid) + { + play(); + } + else + stop (); +} + +void MainWindow::previous() +{ + bool wasPlaying = isPlaying;//(mediaObject->state () == Phonon::PlayingState); + if (mediaObject->state () == Phonon::ErrorState) + wasPlaying = true; + int index = plman.indexOf(mediaObject->currentSource()); + if (shuffle) + { + index = shuffleList.indexOf(plman.indexOf(mediaObject->currentSource())) - 1; + while (index >= 0 && !plman.getItem(shuffleList[index]).playable) + { + index--; + } + if (index >= 0) + { + setItem (index, wasPlaying); + } + else if (repeat) + { + index = plman.size () - 1; + while (index >= 0 && !plman.getItem(shuffleList[index]).playable) + { + index--; + } + setItem (index, wasPlaying); + } +/* if (index < 0) + wasPlaying = false;*/ + + } + else + { + index--; + while ((index) >= 0 && !plman.getItem(index).playable) + { + index--; + } + if (index >= 0) + { + setItem (index, wasPlaying); + } + else if (repeat) + { + index = plman.size() - 1; + while ((index) >= 0 && !plman.getItem(index).playable) + { + index--; + } + setItem (index, wasPlaying); + } + } +} + +void MainWindow::highlightRow (int i) +{ + for (int j = 0; j < 3; ++j) + { + QTableWidgetItem* item = musicTable->item(i, j); + if (item) + { + QFont font = item->font(); + font.setBold(true); + font.setItalic(true); + item->setFont(font); + } + } +} + +void MainWindow::unhighlightRow (int i) +{ + for (int j = 0; j < 3; ++j) + { + QTableWidgetItem* item = musicTable->item(i, j); + if (item) + { + QFont font = item->font(); + font.setBold(false); + font.setItalic(false); + item->setFont(font); + } + } +} + + +void MainWindow::tick(qint64 time) +{ + QTime displayTime((time / 3600000), (time / 60000) % 60, (time / 1000) % 60); + + timeLcd->display(displayTime.toString("HH:mm:ss")); +} + +void MainWindow::tableClicked(int row, int /* column */) +{ +// bool wasPlaying = mediaObject->state() == Phonon::PlayingState; + +/* mediaObject->stop(); + mediaObject->clearQueue();*/ + + if (row >= plman.size()) + return; + + int index = row; + while (index < shuffleList.size () && !plman.getItem(index).playable) + { + index += 1; + } + if (plman.size() > index) + { + if (shuffle) + index = shuffleList.indexOf(index); + setItem (index, true); +// mediaObject->play(); + } + else + { + index = 0; + while (index < plman.size () && !plman.getItem(index).playable) + { + index += 1; + } + if (plman.size() > index) + { + if (shuffle) + index = shuffleList.indexOf(index); + setItem (index, true); +// mediaObject->play(); + } + } + +} + +void MainWindow::sourceChanged(const Phonon::MediaSource &source) +{ + int ind = plman.indexOf(source); + highlightRow(ind); + unhighlightRow(lastPlayed); + lastPlayed = ind; + musicTable->selectRow(ind); + timeLcd->display("00:00:00"); +} + + +void MainWindow::aboutToFinish() +{ + int index = plman.indexOf(mediaObject->currentSource()) + 1; + if (shuffle) + { + index = shuffleList.indexOf(plman.indexOf(mediaObject->currentSource())) + 1; + if (index < shuffleList.size ()) + { + mediaObject->enqueue(plman.at (shuffleList[index])); + } + else if (repeat) + { + mediaObject->enqueue(plman.at (shuffleList[0])); + } + + } + else + { + if (plman.size() > index) + { + mediaObject->enqueue(plman.at(index)); + } + else if (repeat) + { + mediaObject->enqueue(plman.at(0)); + } + } +} + +void MainWindow::finished() +{ +} + +void MainWindow::setupActions() +{ + playAction = new QAction(QIcon (QPixmap (":images/play")), "", this); + playAction->setShortcut(tr("Crl+P")); + playAction->setDisabled(true); + pauseAction = new QAction(QIcon (QPixmap (":images/pause")), "", this); + pauseAction->setShortcut(tr("Ctrl+A")); + pauseAction->setDisabled(true); + pauseAction->setVisible(false); + stopAction = new QAction(QIcon (QPixmap (":images/stop")), "", this); + stopAction->setShortcut(tr("Ctrl+S")); + stopAction->setDisabled(true); + nextAction = new QAction(QIcon (QPixmap (":images/next")), "", this); + nextAction->setShortcut(tr("Ctrl+N")); + previousAction = new QAction(QIcon (QPixmap (":images/previous")), "", this); + previousAction->setShortcut(tr("Ctrl+R")); + if (repeat) + repeatAction = new QAction(QIcon (QPixmap (":images/repeatActive")), "", this); + else + repeatAction = new QAction(QIcon (QPixmap (":images/repeat")), "", this); + repeatAction->setCheckable(true); + repeatAction->setChecked(repeat); + repeatAction->setShortcut(tr("Ctrl+I")); + if (shuffle) + shuffleAction = new QAction(QIcon (QPixmap (":images/shuffleActive")), "", this); + else + shuffleAction = new QAction(QIcon (QPixmap (":images/shuffle")), "", this); + shuffleAction->setCheckable(true); + shuffleAction->setChecked(shuffle); + shuffleAction->setShortcut(tr("Ctrl+H")); + volumeAction = new QAction(QIcon (QPixmap (":images/volume")), "", this); + volumeAction->setCheckable(true); + volumeAction->setShortcut(tr("Ctrl+V")); + addFilesAction = new QAction(tr("Add &File"), this); + addFilesAction->setShortcut(tr("Ctrl+F")); + addFoldersAction = new QAction(tr("Add F&older"), this); + addFoldersAction->setShortcut(tr("Ctrl+O")); + addUrlAction = new QAction(tr("Add &Url"), this); + addUrlAction->setShortcut(tr("Ctrl+U")); + savePlaylistAction = new QAction (tr("Sa&ve Playlist"), this); + savePlaylistAction->setShortcut(tr ("Ctrl+V")); + loadPlaylistAction = new QAction (tr("&Load Playlist"), this); + loadPlaylistAction->setShortcut(tr("Ctrl+L")); + clearPlaylistAction = new QAction (tr("&Clear Playlist"), this); + clearPlaylistAction->setShortcut(tr("Ctrl+C")); + exitAction = new QAction(tr("E&xit"), this); + exitAction->setShortcut(tr("Ctrl+X")); + aboutAction = new QAction(tr("A&bout"), this); + aboutAction->setShortcut(tr("Ctrl+B")); + aboutQtAction = new QAction(tr("About &Qt"), this); + aboutQtAction->setShortcut(tr("Ctrl+Q")); +/* removeSelected = new QAction (tr("&Delete from playlist")); + removeSelected->setShortcut(tr ("Ctrl+D"));*/ + + connect(playAction, SIGNAL(triggered()), this, SLOT(play())); + connect(pauseAction, SIGNAL(triggered()), mediaObject, SLOT(pause()) ); + connect(stopAction, SIGNAL(triggered()), this, SLOT(stop())); + connect(repeatAction, SIGNAL(triggered()), this, SLOT(repeatToggle())); + connect(shuffleAction, SIGNAL(triggered()), this, SLOT(shuffleToggle())); + connect(volumeAction, SIGNAL(triggered()), this, SLOT(volumeToggle())); + + connect(addFilesAction, SIGNAL(triggered()), this, SLOT(addFiles())); + connect(addFoldersAction, SIGNAL(triggered()), this, SLOT(addFolder())); + connect(addUrlAction, SIGNAL(triggered()), this, SLOT(addUrl())); + connect (savePlaylistAction, SIGNAL (triggered()), this, SLOT (savePlaylist())); + connect (loadPlaylistAction, SIGNAL (triggered()), this, SLOT (loadPlaylist())); + connect (clearPlaylistAction, SIGNAL (triggered()), &plman, SLOT (clearPlaylist())); + connect (nextAction, SIGNAL(triggered()), this, SLOT(next())); + connect (previousAction, SIGNAL(triggered()), this, SLOT(previous())); + connect(exitAction, SIGNAL(triggered()), this, SLOT(close())); + connect(aboutAction, SIGNAL(triggered()), this, SLOT(about())); + connect(aboutQtAction, SIGNAL(triggered()), qApp, SLOT(aboutQt())); +// connect (removeSelected, SIGNAL (triggered()), this, SLOT (removeSelectedItem())); +} + +void MainWindow::removeSelectedItem() +{ + if (QMessageBox::question(this, "Confirm remove", "Are you sure you want to remove this item?", QMessageBox::Yes, QMessageBox::No) == QMessageBox::No) + return; + int row = musicTable->currentRow(); + if (row >= 0) + plman.removeItem(row); +} + +void MainWindow::removeAllButSelectedItem() +{ + if (QMessageBox::question(this, "Confirm remove", "Are you sure you want to remove all other items?", QMessageBox::Yes, QMessageBox::No) == QMessageBox::No) + return; + int row = musicTable->currentRow(); + if (row >= 0) + { + QString uri = plman.getItem(row).uri; + QStringList lst; + lst << uri; + plman.clearPlaylist(); + plman.addStringList(lst); + } +} + +void MainWindow::repeatToggle () +{ + repeat = !repeat; + settings.setValue("repeat", QVariant (repeat)); + if (repeat) + repeatAction->setIcon(QIcon (QPixmap (":images/repeatActive"))); + else + repeatAction->setIcon(QIcon (QPixmap (":images/repeat"))); +} + +void MainWindow::shuffleToggle () +{ + shuffle = !shuffle; + settings.setValue("shuffle", QVariant (shuffle)); + if (shuffle) + shuffleAction->setIcon(QIcon (QPixmap (":images/shuffleActive"))); + else + shuffleAction->setIcon(QIcon (QPixmap (":images/shuffle"))); +} + +void MainWindow::volumeToggle () +{ + volumeSlider->setVisible(volumeAction->isChecked()); +} + +void MainWindow::play() +{ + mediaObject->play(); + lastPlayed = plman.indexOf(mediaObject->currentSource()); + highlightRow(lastPlayed); + isPlaying = true; +} + +void MainWindow::stop() +{ + mediaObject->stop(); + isPlaying = false; +} + + +void MainWindow::setupMenus() +{ + QMenu *fileMenu = menuBar()->addMenu(tr("&File")); + fileMenu->addAction(addFilesAction); + fileMenu->addAction(addFoldersAction); + fileMenu->addAction(addUrlAction); + fileMenu->addSeparator(); + fileMenu->addAction(savePlaylistAction); + fileMenu->addAction(loadPlaylistAction); + fileMenu->addAction(clearPlaylistAction); +// fileMenu->addAction(exitAction); + + QMenu *aboutMenu = menuBar()->addMenu(tr("&Help")); + aboutMenu->addAction(aboutAction); + aboutMenu->addAction(aboutQtAction); +} + +void MainWindow::setupUi() +{ + QToolBar *bar = new QToolBar; + + bar->setOrientation(Qt::Vertical); + bar->setStyleSheet("padding:7px"); + //bar->addAction(volumeAction); + + seekSlider = new Phonon::SeekSlider(this); + seekSlider->setMediaObject(mediaObject); + + volumeSlider = new Phonon::VolumeSlider(this); + volumeSlider->setAudioOutput(audioOutput); + volumeSlider->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum); + volumeSlider->setOrientation(Qt::Horizontal); + volumeSlider->setMuteVisible(false); +// volumeAddedAction = bar->addWidget(volumeSlider); +// volumeAddedAction->setVisible(false); + bar->addAction(playAction); + bar->addAction(pauseAction); + bar->addAction(stopAction); + bar->addAction(repeatAction); + bar->addAction(shuffleAction); + bar->addAction(nextAction); + bar->addAction(previousAction); + + contextMenu = new QMenu (this); + removeSelected = contextMenu->addAction(tr ("Remove selected")); + removeAllButSelected = contextMenu->addAction(tr("Remove all but selected")); + connect (removeSelected, SIGNAL (triggered()), this, SLOT (removeSelectedItem())); + connect (removeAllButSelected, SIGNAL (triggered()), this, SLOT (removeAllButSelectedItem())); + + + timeLcd = new QLCDNumber; + + QStringList headers; + headers << tr("Artist") << tr("Title") << tr("Album") << "Controls"; + + musicTable = new QTableWidget(0, 4); + musicTable->setHorizontalHeaderLabels(headers); + musicTable->setSelectionMode(QAbstractItemView::SingleSelection); + musicTable->setSelectionBehavior(QAbstractItemView::SelectRows); + connect(musicTable, SIGNAL(cellDoubleClicked(int,int)), + this, SLOT(tableClicked(int,int))); + connect(musicTable, SIGNAL(cellClicked(int,int)), + this, SLOT(cellClicked(int,int))); +/* for (int i = 0; i < 3; ++i) + { + if (!musicTable->horizontalHeaderItem(i)) + continue; + musicTable->horizontalHeaderItem(i)->setBackgroundColor(QColor (128, 128, 255));; + musicTable->horizontalHeaderItem(i)->setForeground(QColor (255, 255, 255)); + }*/ + for (int i = 0; i < musicTable->columnCount(); ++i) + { + QString lab = QString ("colWidth_%1").arg (i); + int val = settings.value(lab, 0).toInt(); + if (val) + musicTable->setColumnWidth(i, val); +// settings.setValue(lab, musicTable->columnWidth(i)); + } + + + QHBoxLayout *seekerLayout = new QHBoxLayout; + QToolBar* bar2 = new QToolBar; + bar2->addAction(volumeAction); + seekerLayout->addWidget(bar2); + seekerLayout->addWidget(volumeSlider); + seekerLayout->addWidget(seekSlider); + seekerLayout->addWidget(timeLcd); + + QVBoxLayout *playbackLayout = new QVBoxLayout; + volumeSlider->hide (); + playbackLayout->addWidget(bar); + + QVBoxLayout *seekAndTableLayout = new QVBoxLayout; + + seekAndTableLayout->addWidget(musicTable); + seekAndTableLayout->addLayout(seekerLayout); + + QHBoxLayout *mainLayout = new QHBoxLayout; + mainLayout->addLayout(seekAndTableLayout); + mainLayout->addLayout(playbackLayout); + + QWidget *widget = new QWidget; + widget->setLayout(mainLayout); + + setCentralWidget(widget); + setWindowTitle("TomAmp"); +} + +void MainWindow::cellClicked(int /*row*/, int) +{ +} + +void MainWindow::contextMenuEvent (QContextMenuEvent*e) +{ + if (!childAt (e->pos())) + return; + if (childAt (e->pos())->parentWidget() != musicTable) + return; + contextMenu->popup(e->globalPos()); +} + + +void MainWindow::setupShuffleList() +{ + QList tmp; + int index = plman.indexOf(mediaObject->currentSource()); + if (index < 0) + index = 0; + for (int i = 0; i < plman.size(); ++i) + { + if ((i != index)) + tmp.append(i); + } + shuffleList.clear(); + shuffleList.append (index); + while (tmp.size ()) + { + int ind = qrand () % tmp.size(); + shuffleList.append(tmp[ind]); + tmp.removeAt(ind); + } +} + +void MainWindow::savePlaylist () +{ + QString filename = QFileDialog::getSaveFileName(this, tr("Please select file name"), "", "Playlist Files (*.m3u *.pls)"); + if (filename.isEmpty()) + return; + plman.savePlaylist(filename); +} + +void MainWindow::loadPlaylist () +{ + QString filename = QFileDialog::getOpenFileName(this, tr("Select playlist file to load"), "", "*.m3u *.pls"); + if (filename.isEmpty()) + return; + plman.loadPlaylist (filename); +} + +void MainWindow::playlistChanged(int from) +{ + while (musicTable->rowCount() > from) + { + musicTable->removeRow(musicTable->rowCount () - 1); + } + int firstGood = -1; + for (int i = from; i < plman.size (); ++i) + { + if (firstGood < 0 && plman.getItem (i).playable) + firstGood = i; + int currentRow = musicTable->rowCount(); + musicTable->insertRow(currentRow); + setRowFromItem (currentRow, plman.getItem(i)); + } +/* if (plman.indexOf(mediaObject->currentSource()) < 0) + { + setItem (firstGood, false); + }*/ + setupShuffleList(); +} + +void MainWindow::setRowFromItem (int row, const PlaylistItem& item) +{ + if (row >= musicTable->rowCount()) + return; + if (item.artist.isEmpty() && item.title.isEmpty()) + { + QTableWidgetItem *item1 = new QTableWidgetItem(item.uri); + item1->setFlags(item1->flags() ^ Qt::ItemIsEditable); + musicTable->setItem(row, 1, item1); + } + else + { + QTableWidgetItem *item1 = new QTableWidgetItem(item.artist); + item1->setFlags(item1->flags() ^ Qt::ItemIsEditable); + musicTable->setItem(row, 0, item1); + QTableWidgetItem *item2 = new QTableWidgetItem(item.title); + item2->setFlags(item2->flags() ^ Qt::ItemIsEditable); + musicTable->setItem(row, 1, item2); + QTableWidgetItem *item3 = new QTableWidgetItem(item.album); + item3->setFlags(item3->flags() ^ Qt::ItemIsEditable); + musicTable->setItem(row, 2, item3); + } + + if (!musicTable->cellWidget(row, 3)) + { + QToolBar* bar = new QToolBar; + QLabel* up = new QLabel; + up->setText(QString::fromUtf8("▲")); + up->setStyleSheet("padding-right:3px;"); + up->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum); + bar->addWidget(up); + QLabel* down = new QLabel; + down->setText(QString::fromUtf8("▼")); + down->setStyleSheet("padding-right:3px;"); + bar->addWidget(down); + QLabel* del = new QLabel; + del->setText(QString::fromUtf8("╳")); + del->setStyleSheet("padding-right:3px;"); + bar->addWidget(del); + down->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum); + bar->setProperty("row", row); + musicTable->setCellWidget(row, 3, bar); + connect (up, SIGNAL (linkActivated (const QString&)), this, SLOT (buttonUp ())); + connect (down, SIGNAL (linkActivated (const QString&)), this, SLOT (buttonDown ())); + connect (del, SIGNAL (linkActivated (const QString&)), this, SLOT (buttonDel ())); + } +} + +void MainWindow::buttonUp() +{ + int i = sender()->parent()->property("row").toInt(); + qDebug () << "Presses up on " << i; + if (i) + { + plman.moveItemUp(i); + setRowFromItem (i, plman.getItem(i)); + setRowFromItem (i - 1, plman.getItem(i - 1)); + musicTable->cellWidget(i, 3)->setProperty("row", i); + musicTable->cellWidget(i - 1, 3)->setProperty("row", i - 1); + musicTable->selectRow(i - 1); + } +} + +void MainWindow::buttonDown() +{ + int i = sender()->parent()->property("row").toInt(); + qDebug () << "Presses down on " << i; + if (i < plman.size() - 1) + { + plman.moveItemDown(i); + setRowFromItem (i, plman.getItem(i)); + setRowFromItem (i + 1, plman.getItem(i + 1)); + musicTable->cellWidget(i, 3)->setProperty("row", i); + musicTable->cellWidget(i + 1, 3)->setProperty("row", i + 1); + musicTable->selectRow(i + 1); + } +} + +void MainWindow::buttonDel() +{ + int i = sender()->parent()->property("row").toInt(); + qDebug () << "Presses del on " << i; + if (i < plman.size()) + { + plman.removeItem(i); + } +} + +void MainWindow::itemUpdated(int index) +{ + if (plman.indexOf(mediaObject->currentSource()) < 0 && plman.getItem (index).playable) + { + setItem (index, false); + } + setRowFromItem (index, plman.getItem(index)); + if (plman.indexOf(mediaObject->currentSource()) == index) + { + if (shuffle) index = shuffleList.indexOf(index); + setItem (index, false); + } +} + +void MainWindow::itemRemoved (int i) +{ + musicTable->removeRow(i); + for (int j = i ? (i - 1) : 0; j < musicTable->rowCount(); ++j) + { + if (musicTable->cellWidget(j, 3)) + musicTable->cellWidget(j, 3)->setProperty("row", j); + } +} diff --git a/tomamp/mainwindow.h b/tomamp/mainwindow.h new file mode 100644 index 0000000..ce4edca --- /dev/null +++ b/tomamp/mainwindow.h @@ -0,0 +1,154 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef MAINWINDOW_H +#define MAINWINDOW_H + +#include +#include +#include +#include +#include +#include +#include +#include +#include "playlistmanager.h" + +class QAction; +class QTableWidget; +class QLCDNumber; + + +class MainWindow : public QMainWindow +{ + Q_OBJECT + +public: + MainWindow(); + ~MainWindow (); + + QSize sizeHint() const + { + return QSize(800, 480); + } + +private slots: + void addFiles(); + void addFolder(); + void addUrl (); + void repeatToggle (); + void shuffleToggle (); + void volumeToggle (); + void about(); + void stateChanged(Phonon::State newState, Phonon::State oldState); + void tick(qint64 time); + void sourceChanged(const Phonon::MediaSource &source); + void aboutToFinish(); + void finished(); + void tableClicked(int row, int column); + void play(); + void stop(); + void next(); + void previous(); + void cellClicked(int row, int column); + void savePlaylist (); + void loadPlaylist (); + void playlistChanged (int from); + void itemUpdated (int index); + void setItem (int ind, bool doplay); + void removeSelectedItem (); + void removeAllButSelectedItem (); + void highlightRow (int i); + void unhighlightRow (int i); + void buttonUp (); + void buttonDown (); + void buttonDel (); + void itemRemoved (int i); + +protected: + void contextMenuEvent (QContextMenuEvent*e); +private: + void setupActions(); + void setupMenus(); + void setupUi(); + void setupShuffleList(); + void setRowFromItem (int row, const PlaylistItem& item); + + Phonon::SeekSlider *seekSlider; + Phonon::MediaObject *mediaObject; + Phonon::AudioOutput *audioOutput; + Phonon::VolumeSlider *volumeSlider; + + PlaylistManager plman; + + QAction *playAction; + QAction *pauseAction; + QAction *stopAction; + QAction *repeatAction; + QAction *shuffleAction; + QAction *volumeAction; + QAction *volumeAddedAction; + QAction *nextAction; + QAction *previousAction; + QAction *addFilesAction; + QAction *addFoldersAction; + QAction *addUrlAction; + QAction *savePlaylistAction; + QAction *loadPlaylistAction; + QAction *clearPlaylistAction; + QAction *exitAction; + QAction *aboutAction; + QAction *aboutQtAction; + QAction *removeSelected; + QAction *removeAllButSelected; + QMenu *contextMenu; + QToolBar *bar; + QLCDNumber *timeLcd; + QTableWidget *musicTable; + bool repeat; + bool shuffle; + QSettings settings; + QList shuffleList; + int lastPlayed; + bool isPlaying; +}; + +#endif diff --git a/tomamp/optiondialog.cpp b/tomamp/optiondialog.cpp new file mode 100644 index 0000000..ed40032 --- /dev/null +++ b/tomamp/optiondialog.cpp @@ -0,0 +1,6 @@ +#include "optiondialog.h" + +OptionDialog::OptionDialog(QWidget *parent) : + QDialog(parent) +{ +} diff --git a/tomamp/optiondialog.h b/tomamp/optiondialog.h new file mode 100644 index 0000000..12d15ce --- /dev/null +++ b/tomamp/optiondialog.h @@ -0,0 +1,18 @@ +#ifndef OPTIONDIALOG_H +#define OPTIONDIALOG_H + +#include + +class OptionDialog : public QDialog +{ + Q_OBJECT +public: + explicit OptionDialog(QWidget *parent = 0); + +signals: + +public slots: + +}; + +#endif // OPTIONDIALOG_H diff --git a/tomamp/playlistmanager.cpp b/tomamp/playlistmanager.cpp new file mode 100644 index 0000000..61681a2 --- /dev/null +++ b/tomamp/playlistmanager.cpp @@ -0,0 +1,349 @@ +#include "playlistmanager.h" +#include +#include +#include + +QStringList allowedExtensions; + + +PlaylistManager::PlaylistManager(QWidget* parent) + : parentWidget (parent), lastMetaRead (-1) +{ + allowedExtensions << "mp3" << "ogg" << "wav" << "wmv" << "wma"; +// qDebug () << Phonon::BackendCapabilities::availableMimeTypes(); + metaInformationResolver = new Phonon::MediaObject(parent); + connect(metaInformationResolver, SIGNAL(stateChanged(Phonon::State,Phonon::State)), + this, SLOT(metaStateChanged(Phonon::State,Phonon::State))); +} + +int PlaylistManager::indexOf(const Phonon::MediaSource &s) const +{ + for (int i = 0; i < items.size(); ++i) + { + if (items[i].source == s) + return i; + } + return -1; +} + +void PlaylistManager::parseAndAddFolder(const QString &dir, bool recursive) +{ + QStringList filters; +// filters << "*.mp3"; + + QStringList files = QDir (dir).entryList(filters); + + if (files.isEmpty()) + return; + + qDebug () << "Parsing folder " << dir; + + //settings.setValue("LastFolder", dir); + int index = items.size(); + foreach (QString string, files) + { + if (string == "." || string == "..") + continue; + QString fname = dir + "/" + string; + QFileInfo fi (fname); + if (fi.isDir()) + { + if (recursive) + parseAndAddFolder(fname, true); + continue; + } + if (fileSupported(fname)) + { + qDebug () << "Adding: " << fname; + items.append(PlaylistItem (PlaylistItem (fname))); + } + } +// if (!items.isEmpty()) + if (items.size () > index) + { + metaInformationResolver->setCurrentSource(items.at(index).source); + lastMetaRead = index; + } + qDebug () << " SIZE: " << items.size (); + emit playlistChanged (index); +} + +void PlaylistManager::addStringList(const QStringList& list) +{ + int index = items.size(); + foreach (QString string, list) + { + if (fileSupported(string) || string.toLower().startsWith("http")) + { + qDebug () << "Adding " << string; + items.append(PlaylistItem (string)); + } + } +// if (!items.isEmpty()) + if (items.size () > index) + { + metaInformationResolver->setCurrentSource(items.at(index).source); + lastMetaRead = index; + } + emit playlistChanged(index); +} + +void PlaylistManager::metaStateChanged(Phonon::State newState, Phonon::State oldState) +{ + qDebug () << "Meta state now " << newState << " old state " << oldState; + // This is an ugly hack, since the metaInformationResolver doesn't properly load the assigned source when it's in the error state + // In order to properly read the next file we have to set it as current source again when the resolver entered the stopped state after the error + static bool wasError = false; + if (wasError && newState == Phonon::StoppedState) + { + metaInformationResolver->setCurrentSource(items[lastMetaRead].source); + wasError = false; + return; + } + if (newState == Phonon::ErrorState) + { + wasError = true; + } + + if (newState != Phonon::StoppedState && newState != Phonon::ErrorState) + { + return; + } + + int index = lastMetaRead; + qDebug () << "Reading meta info of " << metaInformationResolver->currentSource().fileName() << " => " << index; + + QMap metaData = metaInformationResolver->metaData(); + + + if (index >= 0 && newState != Phonon::ErrorState) + { + items[index].artist = metaData.value("ARTIST"); + items[index].title = metaData.value("TITLE"); + items[index].album = metaData.value("ALBUM"); + qDebug () << "Info is: " << items[index].artist << " - " << items[index].title; + if (metaData.isEmpty()) + qDebug () << "Detected to be empty: " << items[index].uri; + else + items[index].playable = true; + emit itemUpdated (index); + } + if (index >= 0 && items.size () > index + 1) + { + metaInformationResolver->setCurrentSource(items[index + 1].source); + lastMetaRead = index + 1; + } +} + +void PlaylistManager::savePlaylist(const QString& filenam) +{ + QString filename = filenam; + if (filename.isEmpty()) + return; + bool writepls = false; + if (filename.length() < 4 || (filename.right(4).toLower() != ".m3u" && filename.right(4).toLower() != ".pls")) + { + filename += ".pls"; + writepls = true; + } + else if (filename.right(4).toLower() == ".pls") + writepls = true; + QFile f (filename); + try + { + f.open(QFile::WriteOnly); + if (writepls) + { + f.write ("[playlist]\n"); + f.write (QString ("NumberOfEntries=%1\n").arg (items.size ()).toAscii()); + } + for (int i = 0; i < items.size(); ++i) + { + if (writepls) + { + f.write (QString ("File%1=%2\n").arg (i + 1).arg (items[i].uri).toAscii()); + f.write (QString ("Title%1=%2 - %3 - %4\n").arg (i + 1).arg (items[i].artist).arg (items[i].title).arg (items[i].album).toAscii()); + } + else + { + f.write (items[i].uri.toAscii()); + f.write ("\n"); + } + } + if (writepls) + f.write ("Version=2\n"); + f.close (); + } + catch (...) + { +// QMessageBox::critical(this, "Write error", "Could not write playlist file", QMessageBox::Ok); + } +} + +void PlaylistManager::loadPlaylist(const QString& filename) +{ + clearPlaylist(); + if (filename.right(4).toLower() == ".m3u") + appendPlaylist(filename); + else if (filename.right(4).toLower() == ".pls") + appendPlaylistPLS(filename); + if (!items.isEmpty()) + { + metaInformationResolver->setCurrentSource(items.at(0).source); + lastMetaRead = 0; + } + emit playlistChanged (0); +} + +void PlaylistManager::addPlaylist(const QString& filename) +{ + int index = items.size(); + if (filename.right(4).toLower() == ".m3u") + appendPlaylist(filename); + else if (filename.right(4).toLower() == ".pls") + appendPlaylistPLS(filename); + if (items.size () > index) +// if (!items.isEmpty()) + { + metaInformationResolver->setCurrentSource(items.at(index).source); + lastMetaRead = index; + emit playlistChanged (index); + } +} + +void PlaylistManager::appendPlaylist(const QString& filename) +{ + qDebug () << "Attempting to load playlist: " << filename; + QFile f(filename); + if (!f.open (QFile::ReadOnly)) + return; + QString tmp = f.readAll(); + f.close (); + QStringList lines = tmp.split("\n"); + foreach (QString l, lines) + { + if (l.isEmpty() || (!QFileInfo (l).exists() && (l.indexOf("http") != 0))) + { + continue; + } + qDebug () << "Load " << l; + items.append(PlaylistItem (l)); + } +} + +void PlaylistManager::appendPlaylistPLS(const QString& filename) +{ + qDebug () << "Attempting to load playlist: " << filename; + QFile f(filename); + if (!f.open (QFile::ReadOnly)) + return; + QString tmp = f.readAll(); + f.close (); + QStringList lines = tmp.split("\n"); + QMap filemap; + + foreach (QString l, lines) + { + if (l.isEmpty() || l.trimmed().toLower() == "[playlist]" || l.trimmed().toLower() == "version=2") + { + continue; + } + qDebug () << "PLS " << l; + if (l.trimmed().toLower().left(4) == "file") + { + QStringList tokens = l.split('='); + if (tokens.size () < 2) + continue; + tokens[0] = tokens[0].mid (4); + filemap.insert(tokens[0].toInt (), items.size ()); + qDebug () << tokens; + items.append(PlaylistItem (tokens[1])); + } + else if (l.trimmed().toLower().left(5) == "title") + { + QStringList tokens = l.split('='); + if (tokens.size () < 2) + continue; + tokens[0] = tokens[0].mid (5); + int toupdate = filemap[tokens[0].toInt()]; + qDebug () << "Need to update " << toupdate << " for " << l; + QStringList metatok = tokens[1].split (" - "); + qDebug () << metatok; + if (metatok.size() > 2 && toupdate >= 0 && toupdate < items.size ()) + { + items[toupdate].artist = metatok[0]; + items[toupdate].title = metatok[1]; + metatok = metatok.mid (2); + items[toupdate].album = metatok.join (" - "); + } + else + { + items[toupdate].title = metatok.join (" - "); + } + } + } +} + + +void PlaylistManager::clearPlaylist() +{ + items.clear(); + emit playlistChanged(0); +/* while (musicTable->rowCount()) + musicTable->removeRow(0); + mediaObject->clear();*/ +} + +QStringList PlaylistManager::playlistStrings() const +{ + QStringList ret; + for (int i = 0; i < items.size (); ++i) + ret << items[i].uri; + qDebug () << "Returning playlist " << ret << " SIZE: " << items.size (); + return ret; +} + +void PlaylistManager::removeItem(int i) +{ + items.removeAt (i); + emit itemRemoved(i); +} + + +bool PlaylistManager::fileSupported (const QString& fname) const +{ + QString ext = fname.right(3).toLower(); + foreach (QString e, allowedExtensions) + { + if (ext == e) + return true; + } + + return false; +} + +bool PlaylistManager::moveItemUp (int i) +{ + if (i) + { + PlaylistItem tmp = items[i - 1]; + items[i - 1] = items[i]; + items[i] = tmp; + return true; +// emit playlistChanged(i - 1); + } + return false; +} + +bool PlaylistManager::moveItemDown (int i) +{ + if (i < items.size () - 1) + { + PlaylistItem tmp = items[i + 1]; + items[i + 1] = items[i]; + items[i] = tmp; + return true; +// emit playlistChanged(i - 1); + } + return false; +} diff --git a/tomamp/playlistmanager.h b/tomamp/playlistmanager.h new file mode 100644 index 0000000..d1bbaba --- /dev/null +++ b/tomamp/playlistmanager.h @@ -0,0 +1,61 @@ +#ifndef PLAYLISTMANAGER_H +#define PLAYLISTMANAGER_H + +#include +#include +#include + + + +struct PlaylistItem +{ + Phonon::MediaSource source; + QString uri; + bool playable; + bool localFile; + QString title; + QString artist; + QString album; + PlaylistItem (const QString& uri) : source (Phonon::MediaSource (uri)), uri (uri), playable (false), localFile (false) { } + bool operator ==(const Phonon::MediaSource& s) const { return source == s; } +}; + +class PlaylistManager : public QObject +{ + Q_OBJECT +public: + PlaylistManager(QWidget* parent); + void addStringList (const QStringList&); + void parseAndAddFolder (const QString& dir, bool recursive); + void removeItem (int i); + + QStringList playlistStrings () const; + int size () const { return items.size (); } + int indexOf (const Phonon::MediaSource& s) const; + const Phonon::MediaSource& at (int i) { return items[i].source; } + const PlaylistItem& getItem (int i) const { return items[i]; } + bool moveItemUp (int i); + bool moveItemDown (int i); +public slots: + void savePlaylist(const QString& filename); + void loadPlaylist(const QString& filename); + void clearPlaylist(); + void addPlaylist (const QString& filename); +signals: + void playlistChanged (int from); + void itemRemoved (int i); + void itemUpdated (int index); +private slots: + void metaStateChanged(Phonon::State newState, Phonon::State oldState); + void appendPlaylist (const QString& filename); + void appendPlaylistPLS (const QString& filename); +private: + bool fileSupported (const QString& fname) const; + + Phonon::MediaObject *metaInformationResolver; + QList items; + QWidget* parentWidget; + int lastMetaRead; +}; + +#endif // PLAYLISTMANAGER_H diff --git a/tomamp/tomamp.pro b/tomamp/tomamp.pro new file mode 100644 index 0000000..13eaa0f --- /dev/null +++ b/tomamp/tomamp.pro @@ -0,0 +1,73 @@ +#------------------------------------------------- +# +# Project created by QtCreator 2010-07-15T14:44:54 +# +#------------------------------------------------- + +QT += core gui phonon + +TARGET = tomamp +TEMPLATE = app + + +SOURCES += main.cpp\ + mainwindow.cpp \ + playlistmanager.cpp \ + optiondialog.cpp + +HEADERS += mainwindow.h \ + playlistmanager.h \ + optiondialog.h + +FORMS += + +CONFIG += mobility +MOBILITY = + +symbian { + TARGET.UID3 = 0xe3107f4b + # TARGET.CAPABILITY += + TARGET.EPOCSTACKSIZE = 0x14000 + TARGET.EPOCHEAPSIZE = 0x020000 0x800000 +} + +RESOURCES += \ + ampres.qrc + +OTHER_FILES += \ + bugs.txt \ + README + +unix { + # VARIABLES + isEmpty(PREFIX):PREFIX = /usr #/local ? + BINDIR = $$PREFIX/bin + DATADIR = $$PREFIX/share + DEFINES += DATADIR=\"$$DATADIR\" \ + PKGDATADIR=\"$$PKGDATADIR\" + + contains(QT_CONFIG, hildon):{ + DEFINES += CHIMGDIR=\'\"$$DATADIR/$${TARGET}\"\' + } + # MAKE INSTALL + INSTALLS += target \ + imagery \ + desktop \ + iconxpm \ + icon26 \ + icon40 \ + icon64 + target.path = $$BINDIR + imagery.path = $$DATADIR/$${TARGET}/images + imagery.files += ../src/images/*png + desktop.path = $$DATADIR/applications/hildon + desktop.files += $${TARGET}.desktop + iconxpm.path = $$DATADIR/pixmap + iconxpm.files += ../data/maemo/$${TARGET}.xpm + icon26.path = $$DATADIR/icons/hicolor/26x26/apps + icon26.files += ../data/26x26/Tomamp.png + icon40.path = $$DATADIR/icons/hicolor/40x40/apps + icon40.files += ../data/40x40/Tomamp.png + icon64.path = $$DATADIR/icons/hicolor/64x64/apps + icon64.files += ../data/64x64/Tomamp.png +} -- 1.7.9.5