diff --git a/CMakeLists.txt b/CMakeLists.txt index 3f3bdf8c1..c1331dd12 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -104,8 +104,8 @@ if(PHONON_FOUND) message(STATUS "Phonon found; ensure that phonon-vlc is at least 0.4") endif() -macro_optional_find_package(LibEchonest 2.0.0) -macro_log_feature(LIBECHONEST_FOUND "Echonest" "Qt library for communicating with The Echo Nest" "http://projects.kde.org/libechonest" TRUE "" "libechonest 2.0.0 is needed for dynamic playlists and the infosystem") +macro_optional_find_package(Echonest 2.0.0) +macro_log_feature(ECHONEST_FOUND "Echonest" "Qt library for communicating with The Echo Nest" "http://projects.kde.org/libechonest" TRUE "" "libechonest 2.0.0 is needed for dynamic playlists and the infosystem") macro_optional_find_package(CLucene 0.9.23) macro_log_feature(CLucene_FOUND "CLucene" "The open-source, C++ search engine" "http://clucene.sf.net" TRUE "" "CLucene is used for indexing the collection") diff --git a/CMakeModules/FindEchonest.cmake b/CMakeModules/FindEchonest.cmake new file mode 100644 index 000000000..768d0eb4c --- /dev/null +++ b/CMakeModules/FindEchonest.cmake @@ -0,0 +1,36 @@ +# - Find libechonest +# Find the libechonest includes and the libechonest libraries +# This module defines +# ECHONEST_INCLUDE_DIR, root echonest include dir. Include echonest includes with echonest/foo.h +# ECHONEST_LIBRARIES, the path to libechonest +# ECHONEST_FOUND, whether libechonest was found + +FIND_PACKAGE(PkgConfig QUIET) +PKG_CHECK_MODULES(PC_ECHONEST QUIET libechonest) + +FIND_PATH(ECHONEST_INCLUDE_DIR NAMES echonest/Track.h + HINTS + ${PC_ECHONEST_INCLUDEDIR} + ${PC_ECHONEST_INCLUDE_DIRS} + ${CMAKE_INSTALL_INCLUDEDIR} + ${KDE4_INCLUDE_DIR} +) + +FIND_LIBRARY(ECHONEST_LIBRARIES NAMES echonest + HINTS + ${PC_ECHONEST_LIBDIR} + ${PC_ECHONEST_LIBRARY_DIRS} + ${CMAKE_INSTALL_LIBDIR} + ${KDE4_LIB_DIR} +) + +IF(ECHONEST_LIBRARIES AND ECHONEST_INCLUDE_DIR AND NOT PC_ECHONEST_VERSION) + MESSAGE(WARNING "You don't have pkg-config and so the libechonest version check does not work!") +ENDIF() + +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(Echonest + REQUIRED_VARS ECHONEST_LIBRARIES ECHONEST_INCLUDE_DIR + VERSION_VAR PC_ECHONEST_VERSION) + +MARK_AS_ADVANCED(ECHONEST_INCLUDE_DIR ECHONEST_LIBRARIES) diff --git a/CMakeModules/FindLibEchonest.cmake b/CMakeModules/FindLibEchonest.cmake deleted file mode 100644 index 9c78462f4..000000000 --- a/CMakeModules/FindLibEchonest.cmake +++ /dev/null @@ -1,42 +0,0 @@ -# - Find libechonest -# Find the libechonest includes and the libechonest libraries -# This module defines -# LIBECHONEST_INCLUDE_DIR, root echonest include dir. Include echonest includes with echonest/foo.h -# LIBECHONEST_LIBRARY, the path to libechonest -# LIBECHONEST_FOUND, whether libechonest was found - - -find_path(LIBECHONEST_INCLUDE_DIR NAMES echonest_export.h - HINTS - ~/usr/include - /opt/local/include - /usr/include - /usr/local/include - /opt/kde4/include - ${KDE4_INCLUDE_DIR} - PATH_SUFFIXES echonest -) - -find_library( LIBECHONEST_LIBRARY NAMES echonest - PATHS - ~/usr/lib - /opt/local/lib - /usr/lib - /usr/lib64 - /usr/local/lib - /opt/kde4/lib - ${KDE4_LIB_DIR} -) - - -if(LIBECHONEST_INCLUDE_DIR AND LIBECHONEST_LIBRARY) - set(LIBECHONEST_FOUND TRUE) - message(STATUS "Found libechonest: ${LIBECHONEST_INCLUDE_DIR}, ${LIBECHONEST_LIBRARY}") -else(LIBECHONEST_INCLUDE_DIR AND LIBECHONEST_LIBRARY) - set(LIBECHONEST_FOUND FALSE) - if (LIBECHONEST_FIND_REQUIRED) - message(FATAL_ERROR "Could NOT find required package libechonest") - endif(LIBECHONEST_FIND_REQUIRED) -endif(LIBECHONEST_INCLUDE_DIR AND LIBECHONEST_LIBRARY) - -mark_as_advanced(LIBECHONEST_INCLUDE_DIR LIBECHONEST_LIBRARY) diff --git a/data/images/artistpage-background-tile.png b/data/images/artistpage-background-tile.png new file mode 100644 index 000000000..e3e635823 Binary files /dev/null and b/data/images/artistpage-background-tile.png differ diff --git a/data/images/subscribe-off.png b/data/images/subscribe-off.png new file mode 100644 index 000000000..99565fd80 Binary files /dev/null and b/data/images/subscribe-off.png differ diff --git a/data/images/subscribe-on.png b/data/images/subscribe-on.png new file mode 100644 index 000000000..81da59c8d Binary files /dev/null and b/data/images/subscribe-on.png differ diff --git a/lang/tomahawk_ar.ts b/lang/tomahawk_ar.ts index 8d022ae17..2e375a71f 100644 --- a/lang/tomahawk_ar.ts +++ b/lang/tomahawk_ar.ts @@ -146,17 +146,17 @@ connect and stream from you? ألبومات أخرى للفنان - + Sorry, we could not find any other albums for this artist! نعتذر, لم نستطيع إيجاد ألبومات أخرى لهذا الفنان! - + Sorry, we could not find any tracks for this album! نعتذر، لم نستطيع إيجاد أغاني أخرى لهذا الألبوم! - + Other Albums by %1 ألبومات أخرى ل%1 @@ -3538,12 +3538,14 @@ enter the displayed PIN number here: from - من + streaming artist - track from friend + to - إلى + streaming artist - track to friend + @@ -3711,12 +3713,12 @@ You can re-send a sync message at any time simply by sending another tweet using الأغاني التي إستمعت إليها مؤخرا - + No recently created playlists in your network. لا قوائم أغاني جديدة أنشئت مؤخرا على شبكتك. - + Welcome to Tomahawk مرحبا بكم في توماهوك diff --git a/lang/tomahawk_bg.ts b/lang/tomahawk_bg.ts index 69c7fb575..fc5ad004a 100644 --- a/lang/tomahawk_bg.ts +++ b/lang/tomahawk_bg.ts @@ -145,17 +145,17 @@ connect and stream from you? Други албуми на този артист - + Sorry, we could not find any other albums for this artist! Съжалявам, но не откривам нито един албум от този артист! - + Sorry, we could not find any tracks for this album! Съжалявам, но не откривам нито една песен за този артист! - + Other Albums by %1 Други албуми от %1 @@ -3548,12 +3548,14 @@ enter the displayed PIN number here: from - от + streaming artist - track from friend + to - до + streaming artist - track to friend + @@ -3723,12 +3725,12 @@ You can re-send a sync message at any time simply by sending another tweet using Наскоро изпълнени - + No recently created playlists in your network. Не откривам наскоро създадени списъци в твоята мрежа - + Welcome to Tomahawk Здравей! diff --git a/lang/tomahawk_ca.ts b/lang/tomahawk_ca.ts index 955a02cd4..94180e068 100644 --- a/lang/tomahawk_ca.ts +++ b/lang/tomahawk_ca.ts @@ -145,17 +145,17 @@ connect and stream from you? Altres Àlbums de l'Artista - + Sorry, we could not find any other albums for this artist! - + Sorry, we could not find any tracks for this album! - + Other Albums by %1 Altres Àlbums de %1 @@ -3537,12 +3537,14 @@ introduïu el PIN aquí: from - de + streaming artist - track from friend + to - a + streaming artist - track to friend + @@ -3710,12 +3712,12 @@ Podeu reenviar un missatge de sincronisme en qualsevol moment simplement enviant Cançons Escoltades Recentment - + No recently created playlists in your network. No hi ha cançons escoltades recentment a la xarxa. - + Welcome to Tomahawk Us donem la benvinguda a Tomahawk diff --git a/lang/tomahawk_de.ts b/lang/tomahawk_de.ts index cc0a37f69..435ab6792 100644 --- a/lang/tomahawk_de.ts +++ b/lang/tomahawk_de.ts @@ -146,17 +146,17 @@ erlauben sich mit dir zu verbinden? Andere Alben des Künstlers - + Sorry, we could not find any other albums for this artist! Sorry, wir konnten keine anderen Alben für diesen Künstler finden! - + Sorry, we could not find any tracks for this album! Sorry, wir konnten keine anderen Lieder für dieses Album finden! - + Other Albums by %1 Andere Alben von %1 @@ -3533,12 +3533,14 @@ Tomahawk auf Twitter's Website authentifiziert hast: from - von + streaming artist - track from friend + to - an + streaming artist - track to friend + @@ -3701,12 +3703,12 @@ You can re-send a sync message at any time simply by sending another tweet using Kürzlich gehörte Lieder - + No recently created playlists in your network. Es gibt keine kürzlich erstellten Playlisten in deinem Netzwerk. - + Welcome to Tomahawk Willkommen bei Tomahawk diff --git a/lang/tomahawk_en.ts b/lang/tomahawk_en.ts index 893995482..c2886d466 100644 --- a/lang/tomahawk_en.ts +++ b/lang/tomahawk_en.ts @@ -146,17 +146,17 @@ connect and stream from you? Other Albums by Artist - + Sorry, we could not find any other albums for this artist! Sorry, we could not find any other albums for this artist! - + Sorry, we could not find any tracks for this album! Sorry, we could not find any tracks for this album! - + Other Albums by %1 Other Albums by %1 @@ -3538,11 +3538,13 @@ enter the displayed PIN number here: from + streaming artist - track from friend from to + streaming artist - track to friend to @@ -3711,12 +3713,12 @@ You can re-send a sync message at any time simply by sending another tweet using Recently Played Tracks - + No recently created playlists in your network. No recently created playlists in your network. - + Welcome to Tomahawk Welcome to Tomahawk diff --git a/lang/tomahawk_es.ts b/lang/tomahawk_es.ts index 5137dfcd0..e40f6115d 100644 --- a/lang/tomahawk_es.ts +++ b/lang/tomahawk_es.ts @@ -145,17 +145,17 @@ connect and stream from you? Otros álbumes por el artista - + Sorry, we could not find any other albums for this artist! - + Sorry, we could not find any tracks for this album! - + Other Albums by %1 Otros álbumes por %1 @@ -3536,12 +3536,14 @@ introduzca su número PIN aquí: from - de + streaming artist - track from friend + to - para + streaming artist - track to friend + @@ -3709,12 +3711,12 @@ Puede reenviar el mensaje de sincronización en cualquier momento simplemente en Pistas reproducidas recientemente - + No recently created playlists in your network. No hay listas de reproducción recientemente creadas en su red. - + Welcome to Tomahawk Bienvenido a Tomahawk diff --git a/lang/tomahawk_fr.ts b/lang/tomahawk_fr.ts index 62e675a3c..7fe9345ac 100644 --- a/lang/tomahawk_fr.ts +++ b/lang/tomahawk_fr.ts @@ -146,17 +146,17 @@ de se connecter et streamer de vous? Tous les albums par cet artiste - + Sorry, we could not find any other albums for this artist! Désolé, aucun autre album n'a pu être trouvé pour cet artiste ! - + Sorry, we could not find any tracks for this album! Désolé, on a pas pu trouver aucune pistes pour cet album! - + Other Albums by %1 Autres albums de %1 @@ -3538,12 +3538,14 @@ saisissez le numéro PIN ici : from - de + streaming artist - track from friend + to - à + streaming artist - track to friend + @@ -3711,12 +3713,12 @@ Vous pouvez envoyer un message de synchronisation quand vous le souhaitez en env Joués récemment - + No recently created playlists in your network. Pas de liste de lecture créée récemment sur votre réseau. - + Welcome to Tomahawk Bienvenue dans Tomahawk diff --git a/lang/tomahawk_ja.ts b/lang/tomahawk_ja.ts index 19c1685c7..3148af2a2 100644 --- a/lang/tomahawk_ja.ts +++ b/lang/tomahawk_ja.ts @@ -5,12 +5,12 @@ Allow %1 to connect and stream from you? - + %1からの接続、又はストリーミングを許可しますか？ Allow Streaming - + ストリーミングを許可 @@ -23,7 +23,7 @@ connect and stream from you? Tomahawk needs you to decide whether %1 is allowed to connect. - + %1からの接続を許可することが必要です。 @@ -145,17 +145,17 @@ connect and stream from you? 他のアルバム - + Sorry, we could not find any other albums for this artist! このアーティストのアルバムは他に見つかりませんでした。 - + Sorry, we could not find any tracks for this album! このアルバムの曲は見つかりませんでした。 - + Other Albums by %1 %1の他のアルバム @@ -451,7 +451,7 @@ connect and stream from you? About - + 情報 @@ -1690,12 +1690,12 @@ connect and stream from you? Local Music Information - + ローカルミュージック情報 Path to scan for music files: - + 音楽ファイルの検索パス: @@ -1708,42 +1708,42 @@ connect and stream from you? Upload collection list to The Echo Nest to enable user radio - + The Echo Nestにコレクションのリストをアップロードして、ユーザーラジオを有効にする Watch for changes - + 変更を監視 Time between scans, in seconds: - + スキャン作業の時間間隔(秒数): Advanced Settings - + 詳細設定 Remote Peer Connection Method - + リモートピアとの接続方法 None (outgoing connections only) - + 無 (出接続のみ) Use UPnP to establish port forward (recommended) - + UPnPを使用して、ポートのフォワーディングを設ける (推奨) Use static external IP address/host name and port - + グローバル静的IP、又はホスト名とポートを使用する @@ -1753,22 +1753,22 @@ connect and stream from you? SOCKS Proxy - + SOCKSのプロクシ Use SOCKS Proxy - + SOCKSのプロクシを使用する Clear All Access Control Entries - + 全てのアクセス制御のエントリーを削除する Internet Services - + インターネットサービス @@ -3528,12 +3528,14 @@ Meta+Ctrl+Z from - から + streaming artist - track from friend + to - まで + streaming artist - track to friend + @@ -3701,12 +3703,12 @@ Twitterを使っている友達にTomahawkを接続したいなら、ツイー 最近再生したトラック - + No recently created playlists in your network. ネットワークに最近作成したプレイリストはありません。 - + Welcome to Tomahawk Tomahawkへようこそ diff --git a/lang/tomahawk_pl.ts b/lang/tomahawk_pl.ts index 4b7d2cfd6..ff27e0820 100644 --- a/lang/tomahawk_pl.ts +++ b/lang/tomahawk_pl.ts @@ -145,17 +145,17 @@ connect and stream from you? Inne albumy artysty - + Sorry, we could not find any other albums for this artist! - + Sorry, we could not find any tracks for this album! - + Other Albums by %1 Inne albumy %1 @@ -3532,12 +3532,14 @@ wprowadź pokazany numer PIN tutaj: from - od + streaming artist - track from friend + to - do + streaming artist - track to friend + @@ -3705,12 +3707,12 @@ Zawsze możesz ponownie wysłać wiadomość synchronizacyjną - po prostu wyśl Ostatnio Odtworzone Utwory - + No recently created playlists in your network. Brak ostatnio utworzonych list w twojej sieci. - + Welcome to Tomahawk Witaj w Tomahawk diff --git a/lang/tomahawk_pt_BR.ts b/lang/tomahawk_pt_BR.ts index d33e59fa4..2442bf381 100644 --- a/lang/tomahawk_pt_BR.ts +++ b/lang/tomahawk_pt_BR.ts @@ -146,17 +146,17 @@ se conecte e faça o stream de você? Outros álbuns do artista - + Sorry, we could not find any other albums for this artist! Desculpe, mas não conseguimos encontrar outro álbum para este artista! - + Sorry, we could not find any tracks for this album! Desculpe, mas não conseguimos encontrar outras faixas para este álbum! - + Other Albums by %1 Outros álbuns de %1 @@ -3538,12 +3538,14 @@ colocar o número PIN mostrado aqui: from - de + streaming artist - track from friend + to - para + streaming artist - track to friend + @@ -3711,12 +3713,12 @@ Você pode enviar uma outra mensagem de sincronia a qualquer momento simplesment Faixas reproduzidas recentemente - + No recently created playlists in your network. Nenhuma lista de reprodução criada recentemente na sua rede. - + Welcome to Tomahawk Bem-vindo ao Tomahawk diff --git a/lang/tomahawk_ru.ts b/lang/tomahawk_ru.ts index 7d42754ce..94409ce08 100644 --- a/lang/tomahawk_ru.ts +++ b/lang/tomahawk_ru.ts @@ -5,17 +5,18 @@ Allow %1 to connect and stream from you? - + Разрешить %1 ⏎ +подключиться и слушать ваш поток? Allow Streaming - + Разрешить Поток Deny Access - + Запретить доступ @@ -145,17 +146,17 @@ connect and stream from you? Другие альбомы артиста - + Sorry, we could not find any other albums for this artist! - + Sorry, we could not find any tracks for this album! - + Other Albums by %1 Другие альбомы %1 @@ -305,17 +306,17 @@ connect and stream from you? Sorry, Tomahawk couldn't find the track '%1' by %2 - + К сожалению, Tomahawk не мог найти песню '%1' %2 Sorry, Tomahawk couldn't find the artist '%1' - + К сожалению, Tomahawk не мог найти исполнителя '%1' Sorry, Tomahawk couldn't find the album '%1' by %2 - + К сожалению, Tomahawk не мог найти альбом '%1' %2 @@ -486,7 +487,7 @@ connect and stream from you? Filter... - + Фильтр... @@ -626,32 +627,32 @@ connect and stream from you? Top Loved Tracks - + Топ Любимых Песен Sorry, we could not find any loved tracks! - + К сожалению, мы не смогли найти никаких любимых песен! The most loved tracks from all your friends - + Любимые песни ваших друзей All of your loved tracks - + Все ваши любимые песни All of %1's loved tracks - + Все из %1 любимые песни Loved Tracks - + Любимые Песни @@ -659,107 +660,107 @@ connect and stream from you? Form - + Форма Tags - + Теги Title: - + Название: Title... - + Название... Artist: - + Исполнитель: Artist... - + Исполнитель...Алб Album: - + Альбом: Album... - + Альбом... Disc Number: - + Номер диска: Duration: - + Продолжительность: 00.00 - + 00.00 Year: - + Год: Bitrate: - + Битрей: File - + Файл File Name: - + Имя файла: File Name... - + Имя файла... File Size... - + Размер Файла... File size... - + Размер файла... File Size: - + Размер Файла: Back - + Назад Forward - + Вперед @@ -882,7 +883,7 @@ connect and stream from you? Caption - + Заголовок @@ -1737,7 +1738,7 @@ connect and stream from you? Use UPnP to establish port forward (recommended) - + Использование UPnP для проброса портов (рекомендуется) @@ -1991,7 +1992,7 @@ connect and stream from you? Create local copy - + Создать локальную копию @@ -2029,7 +2030,7 @@ connect and stream from you? Logged in as %1 - + Вошли как %1 @@ -2048,7 +2049,7 @@ connect and stream from you? Play music from and sync your playlists with Spotify Premium - + Слушать музыку и синхронизировать плейлисты с Spotify Премиум @@ -2193,7 +2194,7 @@ You may wish to try re-authenticating. Log on to your Jabber/XMPP account to connect to your friends - + Войдите в ваш Jabber/XMPP аккаунт чтобы соединится с вашими друзьями. @@ -2221,12 +2222,12 @@ You may wish to try re-authenticating. Continue Playback after this &Track - + Продолжить воспроизведение после этого &Песни Stop Playback after this &Track - + Остановить воспроизведение после этого &Песни @@ -2242,12 +2243,12 @@ You may wish to try re-authenticating. Copy Album &Link - + Копировать &Ссылку Альбома Copy Artist &Link - + Копировать &Ссылку Исполнителя @@ -2395,7 +2396,7 @@ Try tweaking the filters for a new set of songs to play. is - + is @@ -2433,7 +2434,7 @@ Try tweaking the filters for a new set of songs to play. More - + Более @@ -2473,122 +2474,122 @@ Try tweaking the filters for a new set of songs to play. Minor - + Minor C - + C C Sharp - + C Sharp D - + D E Flat - + E Flat E - + E F - + F F Sharp - + F Sharp G - + G A Flat - + A Flat A - + A B Flat - + B Flat B - + B Ascending - + Ascending Descending - + Descending Tempo - + Tempo Duration - + Продолжительность Loudness - + Loudness Artist Familiarity - + Artist Familiarity Artist Hotttnesss - + Artist Hotttnesss Song Hotttnesss - + Song Hotttnesss Latitude - + Latitude Longitude - + Longitude Mode - + Mode @@ -2603,12 +2604,12 @@ Try tweaking the filters for a new set of songs to play. Danceability - + Danceability only by ~%1 - + только ~ %1 @@ -2618,7 +2619,7 @@ Try tweaking the filters for a new set of songs to play. with genre ~%1 - + с жанром ~%1 @@ -2644,7 +2645,7 @@ Try tweaking the filters for a new set of songs to play. about %1 BPM - + около %1 BPM @@ -2659,7 +2660,7 @@ Try tweaking the filters for a new set of songs to play. at around %1%2 %3 - + около %1%2 %3 @@ -2669,22 +2670,22 @@ Try tweaking the filters for a new set of songs to play. in a %1 key - + в %1 ключ sorted in %1 %2 order - + отсортированы в %1 %2 порядке with a %1 mood - + настроение %1 in a %1 style - + в стиле %1 @@ -2737,12 +2738,12 @@ Try tweaking the filters for a new set of songs to play. Loudness - + Loudness Danceability - + Danceability @@ -2752,17 +2753,17 @@ Try tweaking the filters for a new set of songs to play. Song Hotttnesss - + Song Hotttnesss Artist Hotttnesss - + Artist Hotttnesss Artist Familiarity - + Artist Familiarity @@ -3408,7 +3409,7 @@ enter the displayed PIN number here: %1 by %2 track, artist name - + %1 %2 @@ -3531,11 +3532,13 @@ enter the displayed PIN number here: from + streaming artist - track from friend из to + streaming artist - track to friend к @@ -3682,7 +3685,7 @@ You can re-send a sync message at any time simply by sending another tweet using Sorry, we could not find any recent plays! - + К сожалению, мы не смогли найти никаких воспроизвидений песен! @@ -3703,12 +3706,12 @@ You can re-send a sync message at any time simply by sending another tweet using Последние Воспроизводимые Песни - + No recently created playlists in your network. Нет списков, созданных в последнее время в вашей сети. - + Welcome to Tomahawk Добро пожаловать в Tomahawk @@ -3778,7 +3781,7 @@ Lyrics for "%1" by %2: Failed to parse contents of XSPF playlist - + Невозможно разобрать содержимое XSPF плейлиста diff --git a/lang/tomahawk_sv.ts b/lang/tomahawk_sv.ts index 7babac319..65d2736a4 100644 --- a/lang/tomahawk_sv.ts +++ b/lang/tomahawk_sv.ts @@ -145,17 +145,17 @@ connect and stream from you? Andra album av artisten - + Sorry, we could not find any other albums for this artist! - + Sorry, we could not find any tracks for this album! - + Other Albums by %1 Andra album av %1 @@ -3526,12 +3526,14 @@ enter the displayed PIN number here: from - från + streaming artist - track from friend + to - till + streaming artist - track to friend + @@ -3694,12 +3696,12 @@ You can re-send a sync message at any time simply by sending another tweet using Senaste spelade spår - + No recently created playlists in your network. Inga skapade spellistor i ditt nätverk på sistone. - + Welcome to Tomahawk Välkommen till Tomahawk diff --git a/lang/tomahawk_tr.ts b/lang/tomahawk_tr.ts index e167967a9..a798887ea 100644 --- a/lang/tomahawk_tr.ts +++ b/lang/tomahawk_tr.ts @@ -145,17 +145,17 @@ connect and stream from you? Sanatçının Diğer Albümleri - + Sorry, we could not find any other albums for this artist! - + Sorry, we could not find any tracks for this album! - + Other Albums by %1 Diğer %1 Albümleri @@ -3525,11 +3525,13 @@ enter the displayed PIN number here: from + streaming artist - track from friend to + streaming artist - track to friend @@ -3693,12 +3695,12 @@ You can re-send a sync message at any time simply by sending another tweet using - + No recently created playlists in your network. - + Welcome to Tomahawk diff --git a/lang/tomahawk_zh_CN.ts b/lang/tomahawk_zh_CN.ts index 010057964..9dfae0c46 100644 --- a/lang/tomahawk_zh_CN.ts +++ b/lang/tomahawk_zh_CN.ts @@ -145,17 +145,17 @@ connect and stream from you? 艺人的其他专辑 - + Sorry, we could not find any other albums for this artist! - + Sorry, we could not find any tracks for this album! - + Other Albums by %1 %1 的其他专辑 @@ -3525,11 +3525,13 @@ enter the displayed PIN number here: from + streaming artist - track from friend to + streaming artist - track to friend @@ -3693,12 +3695,12 @@ You can re-send a sync message at any time simply by sending another tweet using 最近播放曲目 - + No recently created playlists in your network. - + Welcome to Tomahawk diff --git a/lang/tomahawk_zh_TW.ts b/lang/tomahawk_zh_TW.ts index 3f38ca231..48d5f2005 100644 --- a/lang/tomahawk_zh_TW.ts +++ b/lang/tomahawk_zh_TW.ts @@ -145,17 +145,17 @@ connect and stream from you? 列出演出者的其他專輯 - + Sorry, we could not find any other albums for this artist! - + Sorry, we could not find any tracks for this album! - + Other Albums by %1 列出所有其他專輯，依 %1 @@ -3525,11 +3525,13 @@ enter the displayed PIN number here: from + streaming artist - track from friend to + streaming artist - track to friend @@ -3693,12 +3695,12 @@ You can re-send a sync message at any time simply by sending another tweet using 最近播放的曲目 - + No recently created playlists in your network. 沒有最近建立的播放清單在您的網路。 - + Welcome to Tomahawk 歡迎到 Tomahawk diff --git a/resource.qrc b/resource.qrc new file mode 100644 index 000000000..e69de29bb diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 863aa797f..c7894f210 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -113,8 +113,7 @@ INCLUDE_DIRECTORIES( ${PHONON_INCLUDES} ${QJSON_INCLUDE_DIR} ${LIBATTICA_INCLUDE_DIR} - ${LIBECHONEST_INCLUDE_DIR} - ${LIBECHONEST_INCLUDE_DIR}/.. + ${ECHONEST_INCLUDE_DIR} ${LIBLASTFM_INCLUDE_DIRS} ${LIBLASTFM_INCLUDE_DIRS}/.. ) @@ -200,7 +199,7 @@ TARGET_LINK_LIBRARIES( tomahawk ${OS_SPECIFIC_LINK_LIBRARIES} ${QT_LIBRARIES} ${MAC_EXTRA_LIBS} - ${LIBECHONEST_LIBRARY} + ${ECHONEST_LIBRARIES} ${QXTWEB_LIBRARIES} ${QJSON_LIBRARIES} ${TAGLIB_LIBRARIES} diff --git a/src/accounts/xmpp/sip/AvatarManager.cpp b/src/accounts/xmpp/sip/AvatarManager.cpp index 9ff1d26bf..68abbf819 100644 --- a/src/accounts/xmpp/sip/AvatarManager.cpp +++ b/src/accounts/xmpp/sip/AvatarManager.cpp @@ -73,6 +73,11 @@ AvatarManager::fetchVCard( const QString& jid ) void AvatarManager::onNewPresence( const Jreen::Presence& presence ) { + if ( presence.error() ) + { + return; + } + Jreen::VCardUpdate::Ptr update = presence.payload(); if ( update ) { diff --git a/src/infoplugins/generic/CMakeLists.txt b/src/infoplugins/generic/CMakeLists.txt index c077e1e77..60e981687 100644 --- a/src/infoplugins/generic/CMakeLists.txt +++ b/src/infoplugins/generic/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(${LIBECHONEST_INCLUDE_DIR}) +include_directories(${ECHONEST_INCLUDE_DIR}) list(APPEND simple_plugins Echonest diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt index f5577de71..d98f14c19 100644 --- a/src/libtomahawk/CMakeLists.txt +++ b/src/libtomahawk/CMakeLists.txt @@ -333,8 +333,7 @@ include_directories( . ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/. ${CMAKE_CURRENT_SOURCE_DIR} ${QT_INCLUDE_DIR} ${QJSON_INCLUDE_DIR} - ${LIBECHONEST_INCLUDE_DIR} - ${LIBECHONEST_INCLUDE_DIR}/.. + ${ECHONEST_INCLUDE_DIR} ${LIBLASTFM_INCLUDE_DIRS} ${LIBLASTFM_INCLUDE_DIRS}/.. ${CLUCENE_INCLUDE_DIRS} @@ -447,7 +446,7 @@ TARGET_LINK_LIBRARIES( tomahawklib ${PHONON_LIBS} ${TAGLIB_LIBRARIES} ${CLUCENE_LIBRARIES} - ${LIBECHONEST_LIBRARY} + ${ECHONEST_LIBRARIES} ${QT_QTSQL_LIBRARY} ${QT_QTUITOOLS_LIBRARY} ${QT_QTGUI_LIBRARY} diff --git a/src/libtomahawk/jobview/TransferStatusItem.cpp b/src/libtomahawk/jobview/TransferStatusItem.cpp index ae5794013..ec696a974 100644 --- a/src/libtomahawk/jobview/TransferStatusItem.cpp +++ b/src/libtomahawk/jobview/TransferStatusItem.cpp @@ -55,7 +55,7 @@ TransferStatusItem::mainText() const return QString( "%1" ).arg( QString( "%1 - %2" ).arg( m_stream.data()->track()->artist()->name() ).arg( m_stream.data()->track()->track() ) ); else if ( !m_stream.data()->source().isNull() && !m_stream.data()->track().isNull() ) return QString( "%1 %2 %3" ).arg( QString( "%1 - %2" ).arg( m_stream.data()->track()->artist()->name() ).arg( m_stream.data()->track()->track() ) ) - .arg( m_stream.data()->type() == StreamConnection::RECEIVING ? tr( "from" ) : tr( "to" ) ) + .arg( m_stream.data()->type() == StreamConnection::RECEIVING ? tr( "from", "streaming artist - track from friend" ) : tr( "to", "streaming artist - track to friend" ) ) .arg( m_stream.data()->source()->friendlyName() ); else return QString(); diff --git a/src/libtomahawk/utils/SpotifyParser.cpp b/src/libtomahawk/utils/SpotifyParser.cpp index 19e000171..ce2ecc682 100644 --- a/src/libtomahawk/utils/SpotifyParser.cpp +++ b/src/libtomahawk/utils/SpotifyParser.cpp @@ -337,6 +337,9 @@ SpotifyParser::playlistListingResult( const QString& msgType, const QVariantMap& if ( q.isNull() ) continue; + if( !trackMap.value( "id" ).toString().isEmpty() ) + q->setResultHint( trackMap.value( "id" ).toString() ); + m_tracks << q; } diff --git a/thirdparty/jreen b/thirdparty/jreen new file mode 160000 index 000000000..2957d0ff0 --- /dev/null +++ b/thirdparty/jreen @@ -0,0 +1 @@ +Subproject commit 2957d0ff03d9561af8afc4bd3a45947392868875