Hello community,
here is the log from the commit of package lxmusic for openSUSE:Factory
checked in at Fri Apr 16 01:01:44 CEST 2010.
--------
--- lxmusic/lxmusic.changes 2010-04-06 10:46:24.000000000 +0200
+++ /mounts/work_src_done/STABLE/lxmusic/lxmusic.changes 2010-04-14 00:18:28.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Apr 13 20:49:02 UTC 2010 - andrea@opensuse.org
+
+- new upstream version 0.4.4
+- added lxmusic-0.4.4-no-gcc-warnings.patch to fix gcc warnings
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
lxmusic-0.4.3.tar.bz2
New:
----
lxmusic-0.4.4-no-gcc-warnings.patch
lxmusic-0.4.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lxmusic.spec ++++++
--- /var/tmp/diff_new_pack.VRMCjr/_old 2010-04-16 01:01:14.000000000 +0200
+++ /var/tmp/diff_new_pack.VRMCjr/_new 2010-04-16 01:01:14.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package lxmusic (Version 0.4.3)
+# spec file for package lxmusic (Version 0.4.4)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,13 +19,14 @@
Name: lxmusic
-Version: 0.4.3
-Release: 2
+Version: 0.4.4
+Release: 1
Summary: Lightweight Audio Player
Group: Productivity/Multimedia/Sound/Players
License: GPL
Url: http://www.lxde.org/
Source0: %name-%version.tar.bz2
+Patch0: %name-0.4.4-no-gcc-warnings.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: gtk2-devel intltool pkg-config update-desktop-files
BuildRequires: docbook-utils libnotify-devel
@@ -38,6 +39,7 @@
%prep
%setup -q
+%patch0 -p1
%build
export CFLAGS="$RPM_OPT_FLAGS"
++++++ lxmusic-0.4.4-no-gcc-warnings.patch ++++++
diff -uNr old-lxmusic-0.4.4//src/lxmusic.c lxmusic-0.4.4/src/lxmusic.c
--- old-lxmusic-0.4.4//src/lxmusic.c 2010-04-11 02:15:13.000000000 +0200
+++ lxmusic-0.4.4/src/lxmusic.c 2010-04-14 00:15:25.311019476 +0200
@@ -576,9 +576,7 @@
static int on_coll_info_received(xmmsv_t* value, void* user_data)
{
- xmmsv_list_iter_t *l_iter;
int32_t id;
- const gchar *str;
GtkTreeModel* model = GTK_TREE_MODEL(list_store);
GtkTreeIter it;
int i = 0;
@@ -601,7 +599,6 @@
while (gtk_list_store_iter_is_valid( list_store , &it ))
{
xmmsv_t *track_info;
- TrackProperties track_properties;
gtk_tree_model_get( model, &it, COL_ID, &id, -1 );
/* find corressponding track info */
track_info = (xmmsv_t*) g_hash_table_lookup( id_to_coll_info, GINT_TO_POINTER( id ));
@@ -610,6 +607,8 @@
i++;
}
g_hash_table_unref( id_to_coll_info );
+
+ return 0;
}
@@ -1329,8 +1328,8 @@
{
GtkTreeModel* mf;
GtkTreeIter it;
- xmmsv_coll_t *coll;
xmmsc_result_t *res;
+
int i;
int pl_size = xmmsv_list_get_size( value);;
++++++ lxmusic-0.4.3.tar.bz2 -> lxmusic-0.4.4.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxmusic-0.4.3/configure new/lxmusic-0.4.4/configure
--- old/lxmusic-0.4.3/configure 2010-03-01 21:47:43.000000000 +0100
+++ new/lxmusic-0.4.4/configure 2010-04-13 22:14:47.000000000 +0200
@@ -2625,7 +2625,7 @@
# Define the identity of the package.
PACKAGE=lxmusic
- VERSION=0.4.3
+ VERSION=0.4.4
cat >>confdefs.h <<_ACEOF
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxmusic-0.4.3/configure.in new/lxmusic-0.4.4/configure.in
--- old/lxmusic-0.4.3/configure.in 2010-03-01 21:47:34.000000000 +0100
+++ new/lxmusic-0.4.4/configure.in 2010-04-11 10:06:21.000000000 +0200
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(configure.in)
-AM_INIT_AUTOMAKE(lxmusic, 0.4.3)
+AM_INIT_AUTOMAKE(lxmusic, 0.4.4)
AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxmusic-0.4.3/data/lxmusic.desktop new/lxmusic-0.4.4/data/lxmusic.desktop
--- old/lxmusic-0.4.3/data/lxmusic.desktop 2010-03-01 21:09:17.000000000 +0100
+++ new/lxmusic-0.4.4/data/lxmusic.desktop 2010-04-11 02:15:23.000000000 +0200
@@ -3,6 +3,8 @@
Name=Music Player
Name[af]=Musiekspeler
Name[ar]=مشغل الموسيقى
+Name[bg]=Музикален Плейър
+Name[bn_IN]=মিউজিক প্লেয়ার
Name[ca]=Reproductor musical
Name[cs]=Přehrávač hudby
Name[da]=Musikafspiller
@@ -12,6 +14,7 @@
Name[et]=Muusikaesitaja
Name[fa]=پخش کننده آهنگ
Name[fr]=Lecteur de musique
+Name[gl]=Reprodutor de música
Name[he]=נגן מוזיקה
Name[hu]=Zenelejátszó
Name[id]=Pemutar Musik
@@ -23,6 +26,7 @@
Name[pl]=Odtwarzacz muzyczny
Name[pt]=Reprodutor de Música
Name[pt_BR]=Reprodutor de músicas
+Name[ru]=Музыкальный плейер
Name[sk]=Prehrávač hudby
Name[sl]=Predvajalnik glasbe
Name[sv]=Musikspelare
@@ -32,6 +36,8 @@
GenericName=Music Player
GenericName[af]=Musiekspeler
GenericName[ar]=مشغل الموسيقى
+GenericName[bg]=Музикален Плейър
+GenericName[bn_IN]=মিউজিক প্লেয়ার
GenericName[ca]=Reproductor musical
GenericName[cs]=Přehrávač hudby
GenericName[da]=Musikafspiller
@@ -41,6 +47,7 @@
GenericName[et]=Muusikaesitaja
GenericName[fa]=پخش کننده آهنگ
GenericName[fr]=Lecteur de musique
+GenericName[gl]=Reprodutor de música
GenericName[he]=נגן מוזיקה
GenericName[hu]=Zenelejátszó
GenericName[id]=Pemutar Musik
@@ -52,6 +59,7 @@
GenericName[pl]=Odtwarzacz muzyczny
GenericName[pt]=Reprodutor de Música
GenericName[pt_BR]=Reprodutor de músicas
+GenericName[ru]=Музыкальный плейер
GenericName[sk]=Prehrávač hudby
GenericName[sl]=Predvajalnik glasbe
GenericName[sv]=Musikspelare
@@ -61,6 +69,8 @@
Comment=Play your music files easily
Comment[af]=Speel musieklêers met gemak
Comment[ar]=يشغل ملفات الموسيقى بسهولة
+Comment[bg]=Изпълявай музиката по-бавно
+Comment[bn_IN]=আপনার মিউজিক ফাইলগুলি সহজে শুনুন
Comment[ca]=Escolteu la vostra música de manera simple
Comment[cs]=Přehrávejte hudbu jednoduše
Comment[da]=Enkel musikafspilning
@@ -69,6 +79,8 @@
Comment[es]=Reproducir fácilmente sus archivos de música
Comment[et]=Muusikafailide mugav kuulamine
Comment[fa]=پخش آسان پروندههای آهنگ شما
+Comment[fr]=Lit vos fichiers de musique intuitivement
+Comment[gl]=Reproduza a súa música doadamente
Comment[he]=השמעת קובצי המוזיקה שלך בקלות
Comment[hu]=Játszd le zenefájljaid kényelmesen
Comment[id]=Putar musik kamu dengan mudah
@@ -80,6 +92,7 @@
Comment[pl]=Odtwarzaj swoje pliki muzyczne łatwiej
Comment[pt]=Reproduza facilmente as suas músicas
Comment[pt_BR]=Reproduza seus arquivos de música facilmente
+Comment[ru]=Проигрывай свою музыку играючи
Comment[sk]=Jednoduché prehrávanie hudobných súborov
Comment[sl]=Enostavno predvajanje vaših glasbenih datotek
Comment[sv]=Spela din musik enkelt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxmusic-0.4.3/po/bg.po new/lxmusic-0.4.4/po/bg.po
--- old/lxmusic-0.4.3/po/bg.po 2010-03-01 20:09:00.000000000 +0100
+++ new/lxmusic-0.4.4/po/bg.po 2010-04-11 02:14:33.000000000 +0200
@@ -8,33 +8,40 @@
"Project-Id-Version: lxmusic\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-01-06 16:08+0100\n"
-"PO-Revision-Date: 2009-10-08 11:59+0200\n"
-"Last-Translator: Rossen Karpuzov <gustav cointech net>\n"
-"Language-Team: Mandriva User Group - Bulgaria \n"
+"PO-Revision-Date: 2010-03-31 08:49+0200\n"
+"Last-Translator: Радослав \n"
+"Language-Team: MIME-Version: 1.0\n"
+"Language: bg\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.1\n"
"X-Poedit-Language: Bulgarian\n"
"X-Poedit-Country: BULGARIA\n"
#: ../src/lxmusic.c:278
msgid "Official icon of xmms2 by Arnaud DIDRY"
-msgstr ""
+msgstr "Стандартна икона на xmms2 от Arnaud DIDRY"
#: ../src/lxmusic.c:289
msgid ""
"Music Player for LXDE\n"
"Simple GUI XMMS2 client"
msgstr ""
+"Музикален плеър за LXDE\n"
+"Опростен GUI XMMS2 клиент"
#. default
-#: ../src/lxmusic.c:462 ../src/utils.c:98 ../data/lxmusic.ui.glade.h:14
+#: ../src/lxmusic.c:462
+#: ../src/utils.c:98
+#: ../data/lxmusic.ui.glade.h:14
msgid "LXMusic"
-msgstr ""
+msgstr "LXMusic"
#: ../src/lxmusic.c:625
msgid "Bitrate: "
-msgstr "Скорост:"
+msgstr "Плътност:"
#: ../src/lxmusic.c:927
msgid "Audio Files"
@@ -49,15 +56,19 @@
msgstr "Въведете URL"
#. metadata available
-#: ../src/lxmusic.c:1370 ../src/lxmusic.c:1771 ../data/lxmusic.ui.glade.h:7
+#: ../src/lxmusic.c:1370
+#: ../src/lxmusic.c:1771
+#: ../data/lxmusic.ui.glade.h:7
msgid "Artist"
msgstr "Изпълнител"
-#: ../src/lxmusic.c:1378 ../data/lxmusic.ui.glade.h:5
+#: ../src/lxmusic.c:1378
+#: ../data/lxmusic.ui.glade.h:5
msgid "Album"
msgstr "Албум"
-#: ../src/lxmusic.c:1386 ../src/lxmusic.c:1772
+#: ../src/lxmusic.c:1386
+#: ../src/lxmusic.c:1772
msgid "Title"
msgstr "Заглавие"
@@ -75,7 +86,7 @@
#: ../src/lxmusic.c:1696
msgid "Play"
-msgstr "Изпълнение"
+msgstr "Пусни"
#: ../src/lxmusic.c:1777
msgid "Now Playing:"
@@ -94,89 +105,88 @@
#. * to get list of possible config variables
#: ../src/lxmusic-plugin-config.c:17
msgid "Advanced Linux Sound Architecture"
-msgstr "ALSA — съвременна архитектура за звук на Линукс"
+msgstr "Основна архитектура за звук на Линукс (ALSA)"
-#: ../src/lxmusic-plugin-config.c:18 ../src/lxmusic-plugin-config.c:23
+#: ../src/lxmusic-plugin-config.c:18
+#: ../src/lxmusic-plugin-config.c:23
#: ../src/lxmusic-plugin-config.c:28
msgid "Device:"
msgstr "Устройство:"
-#: ../src/lxmusic-plugin-config.c:19 ../src/lxmusic-plugin-config.c:24
+#: ../src/lxmusic-plugin-config.c:19
+#: ../src/lxmusic-plugin-config.c:24
msgid "Mixer:"
msgstr "Миксер:"
#. oss
#: ../src/lxmusic-plugin-config.c:22
msgid "Open Sound System"
-msgstr "Отворена система за звук „OSS“"
+msgstr "Отворена звукова система (OSS)"
#. ao
#: ../src/lxmusic-plugin-config.c:27
msgid "Cross-platform audio output library"
-msgstr ""
+msgstr "Междуплатформена, изходяща аудио библиотека"
#. pulse
#: ../src/lxmusic-plugin-config.c:31
msgid "PulseAudio"
-msgstr "ПулсАудио"
+msgstr "Пулс Аудио"
#: ../src/lxmusic-plugin-config.c:32
msgid "Name:"
msgstr "Име:"
-#: ../src/lxmusic-plugin-config.c:33 ../src/lxmusic-plugin-config.c:38
+#: ../src/lxmusic-plugin-config.c:33
+#: ../src/lxmusic-plugin-config.c:38
msgid "Server:"
msgstr "Сървър:"
#: ../src/lxmusic-plugin-config.c:34
msgid "Sink:"
-msgstr ""
+msgstr "Потъване:"
#. airtunes
#: ../src/lxmusic-plugin-config.c:37
msgid "AirTunes"
-msgstr ""
+msgstr "Успокояващи Мелодии"
#. jack
#: ../src/lxmusic-plugin-config.c:41
msgid "JACK Audio Connection Kit"
-msgstr ""
+msgstr "JACK - Свързващ инструмент"
#: ../src/lxmusic-plugin-config.c:43
-#, fuzzy
msgid "Disk Writer"
msgstr "Конфигуриране на Disk Writer"
#: ../src/lxmusic-plugin-config.c:44
-#, fuzzy
msgid "Destination Directory:"
-msgstr "Домашна директория на потребител"
+msgstr "Домашна директория:"
#: ../data/lxmusic.desktop.in.h:1
msgid "Music Player"
-msgstr ""
+msgstr "Музикален Плейър"
#: ../data/lxmusic.desktop.in.h:2
msgid "Play your music files easily"
-msgstr ""
+msgstr "Изпълявай музиката по-бавно"
#: ../data/lxmusic.ui.glade.h:1
msgid "Add Files or Folders"
-msgstr "Добавяне файлове и папки"
+msgstr "Добави файлове и папки"
#: ../data/lxmusic.ui.glade.h:2
msgid "Add To Playlist"
-msgstr "Добавяне към списъка за изпълнение"
+msgstr "Добави към списъка за изпълнение"
#: ../data/lxmusic.ui.glade.h:3
-#, fuzzy
msgid "Add URL"
-msgstr "/Добавяне/URL"
+msgstr "Добави URL"
#: ../data/lxmusic.ui.glade.h:4
-#, fuzzy
msgid "Add files to the playlist"
-msgstr "Добавяне на видеото към списъка за изпълнение"
+msgstr "Добави видеото към списъка с песни"
#: ../data/lxmusic.ui.glade.h:6
msgid "All"
@@ -184,21 +194,22 @@
#: ../data/lxmusic.ui.glade.h:8
msgid "Create _New Playlist"
-msgstr "_Създаване на нов списък с песни"
+msgstr "Създайте _Нов списък с песни"
#: ../data/lxmusic.ui.glade.h:9
msgid "Current Playlist"
-msgstr "Текущ списък с песни"
+msgstr "Наличен списък с песни"
#: ../data/lxmusic.ui.glade.h:10
msgid "Enter keyword here"
-msgstr "Тук въведете термин за търсене тук"
+msgstr "Тук въведете термин за търсене"
#: ../data/lxmusic.ui.glade.h:11
msgid "Favorites"
msgstr "Любими"
-#: ../data/lxmusic.ui.glade.h:12 ../data/track-info.ui.glade.h:8
+#: ../data/lxmusic.ui.glade.h:12
+#: ../data/track-info.ui.glade.h:8
msgid "File Properties"
msgstr "Информация за файла"
@@ -208,7 +219,7 @@
#: ../data/lxmusic.ui.glade.h:15
msgid "Locate currently played track"
-msgstr ""
+msgstr "Открий текущото изпълнение"
#: ../data/lxmusic.ui.glade.h:16
msgid "Media Library"
@@ -224,7 +235,7 @@
#: ../data/lxmusic.ui.glade.h:19
msgid "Play/Pause"
-msgstr "Изпълнение/Пауза"
+msgstr "Пусни/Пауза"
#: ../data/lxmusic.ui.glade.h:20
msgid "Previous"
@@ -239,12 +250,10 @@
msgstr "Премахване от списъка"
#: ../data/lxmusic.ui.glade.h:23
-#, fuzzy
msgid "Remove Selected Items"
-msgstr "Премахване на маркирания цвят"
+msgstr "Премахване на маркираните елементи"
#: ../data/lxmusic.ui.glade.h:24
-#, fuzzy
msgid "Remove items from the playlist"
msgstr "Премахване на файл от списъка за изпълнение"
@@ -265,14 +274,12 @@
msgstr "Стоп"
#: ../data/lxmusic.ui.glade.h:29
-#, fuzzy
msgid "Track Name"
msgstr "Заглавие"
#: ../data/lxmusic.ui.glade.h:30
-#, fuzzy
msgid "_Delete Current Playlist"
-msgstr "| status . . . . . . . . . текущ статус на плейлиста"
+msgstr "_Изтрий наличния лист за изпълнение"
#: ../data/lxmusic.ui.glade.h:31
msgid "_File"
@@ -284,16 +291,15 @@
#: ../data/lxmusic.ui.glade.h:33
msgid "_Locate Currently Played"
-msgstr ""
+msgstr "_Открий изпълняваният"
#: ../data/lxmusic.ui.glade.h:34
msgid "_Playlist"
msgstr "_Списък с песни"
#: ../data/lxmusic.ui.glade.h:35
-#, fuzzy
msgid "_Switch To Playlist"
-msgstr "&Добавяне към списъка"
+msgstr "_Добавяне към списъка"
#: ../data/lxmusic.ui.glade.h:36
msgid "_Tools"
@@ -305,16 +311,15 @@
#: ../data/popup.ui.glade.h:1
msgid "_Show Main Window"
-msgstr "Показване на главния прозорец."
+msgstr "_Покажи главния прозорец."
#: ../data/pref-dlg.ui.glade.h:1
-#, fuzzy
msgid "<b>Audio CD</b>"
-msgstr "Звуково CD"
+msgstr "<b>Звуково CD</b>"
#: ../data/pref-dlg.ui.glade.h:2
msgid "<b>Output</b>"
-msgstr "<b>Изход</b>"
+msgstr "<b>Изходящ</b>"
#: ../data/pref-dlg.ui.glade.h:3
msgid "Audio"
@@ -322,20 +327,19 @@
#: ../data/pref-dlg.ui.glade.h:4
msgid "Buffer Size: "
-msgstr "Размер на буфера:"
+msgstr "Буфер:"
#: ../data/pref-dlg.ui.glade.h:5
-#, fuzzy
msgid "CD-ROM Device: "
-msgstr "Компактдиск &устройство"
+msgstr "Компактдискво устройство:"
#: ../data/pref-dlg.ui.glade.h:6
msgid "Continue playback in background after exiting LXMusic"
-msgstr ""
+msgstr "Продължи изпълнението след изход от LXDMusic"
#: ../data/pref-dlg.ui.glade.h:7
msgid "Default ID3 V1 Encoding: "
-msgstr ""
+msgstr "Разкодирай ID3 V1 по подразбиране:"
#: ../data/pref-dlg.ui.glade.h:8
msgid "General"
@@ -347,17 +351,15 @@
#: ../data/pref-dlg.ui.glade.h:10
msgid "Minimize to system tray on close"
-msgstr ""
+msgstr "Минимизирай в системния панел след затваряне"
#: ../data/pref-dlg.ui.glade.h:11
msgid "Misc"
msgstr "Разни"
#: ../data/pref-dlg.ui.glade.h:12
-msgid ""
-"Music files can be played without graphical user interface to save system "
-"resources"
-msgstr ""
+msgid "Music files can be played without graphical user interface to save system resources"
+msgstr "Музикалните файлове могат да бъдат изпълнявани без GUI, за минималистични системни изисквания"
#: ../data/pref-dlg.ui.glade.h:13
msgid "Plugin: "
@@ -365,43 +367,36 @@
#: ../data/pref-dlg.ui.glade.h:14
msgid "Preference"
-msgstr "Настройки"
+msgstr "Предпочитания"
#: ../data/pref-dlg.ui.glade.h:15
msgid "Show system tray icon"
msgstr "Показване на иконата в системния панел"
#: ../data/track-info.ui.glade.h:1
-#, fuzzy
msgid "<b>Album: </b>"
-msgstr "Албум"
+msgstr "<b>Албум: </b>"
#: ../data/track-info.ui.glade.h:2
-#, fuzzy
msgid "<b>Artist: </b>"
-msgstr "Изпълнител"
+msgstr "<b>Изпълнител: </b>"
#: ../data/track-info.ui.glade.h:3
-#, fuzzy
msgid "<b>Comment: </b>"
-msgstr "Коментар"
+msgstr "<b>Коментар: </b>"
#: ../data/track-info.ui.glade.h:4
-#, fuzzy
msgid "<b>File Type: </b>"
-msgstr "Тип файл"
+msgstr "<b>Тип файл: </b>"
#: ../data/track-info.ui.glade.h:5
-#, fuzzy
msgid "<b>File: </b>"
-msgstr "/_Файл"
+msgstr "<b>Файл: </b>"
#: ../data/track-info.ui.glade.h:6
-#, fuzzy
msgid "<b>Size: </b>"
-msgstr "Размер:"
+msgstr "<b>Размер: <b/>"
#: ../data/track-info.ui.glade.h:7
-#, fuzzy
msgid "<b>Title: </b>"
-msgstr "Заглавие"
+msgstr "<b>Заглавие: </b>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxmusic-0.4.3/po/bn_IN.po new/lxmusic-0.4.4/po/bn_IN.po
--- old/lxmusic-0.4.3/po/bn_IN.po 2010-03-01 20:09:00.000000000 +0100
+++ new/lxmusic-0.4.4/po/bn_IN.po 2010-04-11 02:14:33.000000000 +0200
@@ -8,13 +8,15 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-01-06 16:08+0100\n"
-"PO-Revision-Date: 2009-08-22 09:16+0200\n"
+"PO-Revision-Date: 2010-04-05 12:52+0200\n"
"Last-Translator: Sankarshan \n"
"Language-Team: LANGUAGE \n"
+"Language: bn_IN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.1\n"
#: ../src/lxmusic.c:278
msgid "Official icon of xmms2 by Arnaud DIDRY"
@@ -153,11 +155,11 @@
#: ../data/lxmusic.desktop.in.h:1
msgid "Music Player"
-msgstr ""
+msgstr "মিউজিক প্লেয়ার"
#: ../data/lxmusic.desktop.in.h:2
msgid "Play your music files easily"
-msgstr ""
+msgstr "আপনার মিউজিক ফাইলগুলি সহজে শুনুন"
#: ../data/lxmusic.ui.glade.h:1
msgid "Add Files or Folders"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxmusic-0.4.3/po/el.po new/lxmusic-0.4.4/po/el.po
--- old/lxmusic-0.4.3/po/el.po 2010-03-01 20:09:00.000000000 +0100
+++ new/lxmusic-0.4.4/po/el.po 2010-04-11 02:14:55.000000000 +0200
@@ -8,13 +8,15 @@
"Project-Id-Version: el\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-01-06 16:08+0100\n"
-"PO-Revision-Date: 2010-01-12 14:40+0100\n"
-"Last-Translator: George Vasilakos \n"
+"PO-Revision-Date: 2010-04-08 23:05+0200\n"
+"Last-Translator: \n"
"Language-Team: Greek\n"
+"Language: el\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.1\n"
"X-Poedit-Language: Greek\n"
"X-Poedit-Country: GREECE\n"
@@ -28,7 +30,7 @@
"Simple GUI XMMS2 client"
msgstr ""
"Αναπαραγωγέας μουσικής για το LXDE\n"
-"Απλό πρόγραμμα πελάτης για το XMMS2"
+"Απλό γραφικό πρόγραμμα πελάτης για το XMMS2"
#. default
#: ../src/lxmusic.c:462 ../src/utils.c:98 ../data/lxmusic.ui.glade.h:14
@@ -323,7 +325,7 @@
#: ../data/pref-dlg.ui.glade.h:6
msgid "Continue playback in background after exiting LXMusic"
-msgstr "Συνέχισε την αναπαραγωγή στο προσκήνιο μετά την έξοδο από το LXMusic"
+msgstr "Συνέχισε την αναπαραγωγή στο παρασκήνιο μετά την έξοδο από το LXMusic"
#: ../data/pref-dlg.ui.glade.h:7
msgid "Default ID3 V1 Encoding: "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxmusic-0.4.3/po/fr.po new/lxmusic-0.4.4/po/fr.po
--- old/lxmusic-0.4.3/po/fr.po 2010-03-01 20:09:00.000000000 +0100
+++ new/lxmusic-0.4.4/po/fr.po 2010-04-11 02:14:33.000000000 +0200
@@ -8,13 +8,15 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-01-06 16:08+0100\n"
-"PO-Revision-Date: 2009-12-29 20:44+0100\n"
-"Last-Translator: Pablo Martin-Gomez \n"
+"PO-Revision-Date: 2010-03-19 10:23+0200\n"
+"Last-Translator: Cilyan \n"
"Language-Team: LANGUAGE \n"
+"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.1\n"
#: ../src/lxmusic.c:278
msgid "Official icon of xmms2 by Arnaud DIDRY"
@@ -156,7 +158,6 @@
msgstr "Lecteur de musique"
#: ../data/lxmusic.desktop.in.h:2
-#, fuzzy
msgid "Play your music files easily"
msgstr "Lit vos fichiers de musique intuitivement"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxmusic-0.4.3/po/gl.po new/lxmusic-0.4.4/po/gl.po
--- old/lxmusic-0.4.3/po/gl.po 2010-03-01 20:09:00.000000000 +0100
+++ new/lxmusic-0.4.4/po/gl.po 2010-04-11 02:14:33.000000000 +0200
@@ -8,13 +8,15 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-01-06 16:08+0100\n"
-"PO-Revision-Date: 2009-10-27 15:18+0100\n"
-"Last-Translator: Indalecio Freiría Santos \n"
+"PO-Revision-Date: 2010-03-09 12:26+0200\n"
+"Last-Translator: Indalecio \n"
"Language-Team: Proxecto Trasno \n"
+"Language: gl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.1\n"
#: ../src/lxmusic.c:278
msgid "Official icon of xmms2 by Arnaud DIDRY"
@@ -153,11 +155,11 @@
#: ../data/lxmusic.desktop.in.h:1
msgid "Music Player"
-msgstr ""
+msgstr "Reprodutor de música"
#: ../data/lxmusic.desktop.in.h:2
msgid "Play your music files easily"
-msgstr ""
+msgstr "Reproduza a súa música doadamente"
#: ../data/lxmusic.ui.glade.h:1
msgid "Add Files or Folders"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxmusic-0.4.3/po/ru.po new/lxmusic-0.4.4/po/ru.po
--- old/lxmusic-0.4.3/po/ru.po 2010-03-01 20:09:00.000000000 +0100
+++ new/lxmusic-0.4.4/po/ru.po 2010-04-11 02:14:33.000000000 +0200
@@ -2,19 +2,22 @@
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR , YEAR.
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-06 16:08+0100\n"
-"PO-Revision-Date: 2009-09-17 06:22+0200\n"
-"Last-Translator: Tim Marinin \n"
+"POT-Creation-Date: 2010-03-18 04:09+0000\n"
+"PO-Revision-Date: 2010-04-06 16:31+0200\n"
+"Last-Translator: Max \n"
"Language-Team: LANGUAGE \n"
+"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.1\n"
#: ../src/lxmusic.c:278
msgid "Official icon of xmms2 by Arnaud DIDRY"
@@ -50,7 +53,7 @@
msgstr "Ввести URL"
#. metadata available
-#: ../src/lxmusic.c:1370 ../src/lxmusic.c:1771 ../data/lxmusic.ui.glade.h:7
+#: ../src/lxmusic.c:1370 ../src/lxmusic.c:1770 ../data/lxmusic.ui.glade.h:7
msgid "Artist"
msgstr "Исполнитель"
@@ -58,7 +61,7 @@
msgid "Album"
msgstr "Альбом"
-#: ../src/lxmusic.c:1386 ../src/lxmusic.c:1772
+#: ../src/lxmusic.c:1386 ../src/lxmusic.c:1771
msgid "Title"
msgstr "Название"
@@ -78,11 +81,11 @@
msgid "Play"
msgstr "Воспроизведение"
-#: ../src/lxmusic.c:1777
+#: ../src/lxmusic.c:1776
msgid "Now Playing:"
msgstr "Воспроизвести:"
-#: ../src/lxmusic.c:2242
+#: ../src/lxmusic.c:2241
msgid "Create new playlist"
msgstr "Создать новый список воспроизведения"
@@ -95,7 +98,7 @@
#. * to get list of possible config variables
#: ../src/lxmusic-plugin-config.c:17
msgid "Advanced Linux Sound Architecture"
-msgstr ""
+msgstr "Advanced Linux Sound Architecture (ALSA)"
#: ../src/lxmusic-plugin-config.c:18 ../src/lxmusic-plugin-config.c:23
#: ../src/lxmusic-plugin-config.c:28
@@ -103,63 +106,61 @@
msgstr "Устройство:"
#: ../src/lxmusic-plugin-config.c:19 ../src/lxmusic-plugin-config.c:24
-#, fuzzy
msgid "Mixer:"
-msgstr "Фильтр:"
+msgstr "Микшер:"
#. oss
#: ../src/lxmusic-plugin-config.c:22
msgid "Open Sound System"
-msgstr ""
+msgstr "Open Sound System (OSS)"
#. ao
#: ../src/lxmusic-plugin-config.c:27
msgid "Cross-platform audio output library"
-msgstr ""
+msgstr "Кроссплатформенная библиотека вывода звука"
#. pulse
#: ../src/lxmusic-plugin-config.c:31
-#, fuzzy
msgid "PulseAudio"
-msgstr "Аудио"
+msgstr "PulseAudio"
#: ../src/lxmusic-plugin-config.c:32
msgid "Name:"
-msgstr ""
+msgstr "Имя:"
#: ../src/lxmusic-plugin-config.c:33 ../src/lxmusic-plugin-config.c:38
msgid "Server:"
-msgstr ""
+msgstr "Сервер:"
#: ../src/lxmusic-plugin-config.c:34
msgid "Sink:"
-msgstr ""
+msgstr "Приемник:"
#. airtunes
#: ../src/lxmusic-plugin-config.c:37
msgid "AirTunes"
-msgstr ""
+msgstr "AirTunes"
#. jack
#: ../src/lxmusic-plugin-config.c:41
msgid "JACK Audio Connection Kit"
-msgstr ""
+msgstr "JACK Audio Connection Kit"
#: ../src/lxmusic-plugin-config.c:43
msgid "Disk Writer"
-msgstr ""
+msgstr "Запись на диск"
#: ../src/lxmusic-plugin-config.c:44
msgid "Destination Directory:"
-msgstr ""
+msgstr "Директория назначения:"
#: ../data/lxmusic.desktop.in.h:1
msgid "Music Player"
-msgstr ""
+msgstr "Музыкальный плейер"
#: ../data/lxmusic.desktop.in.h:2
msgid "Play your music files easily"
-msgstr ""
+msgstr "Проигрывай свою музыку играючи"
#: ../data/lxmusic.ui.glade.h:1
msgid "Add Files or Folders"
@@ -179,7 +180,7 @@
#: ../data/lxmusic.ui.glade.h:6
msgid "All"
-msgstr ""
+msgstr "Все"
#: ../data/lxmusic.ui.glade.h:8
msgid "Create _New Playlist"
@@ -207,10 +208,9 @@
#: ../data/lxmusic.ui.glade.h:15
msgid "Locate currently played track"
-msgstr ""
+msgstr "Найти текущую проигрываемую дорожку"
#: ../data/lxmusic.ui.glade.h:16
-#, fuzzy
msgid "Media Library"
msgstr "Медиа-библиотека"
@@ -220,7 +220,7 @@
#: ../data/lxmusic.ui.glade.h:18
msgid "No Repeat"
-msgstr ""
+msgstr "Не повторять"
#: ../data/lxmusic.ui.glade.h:19
msgid "Play/Pause"
@@ -248,11 +248,11 @@
#: ../data/lxmusic.ui.glade.h:25
msgid "Repeat All"
-msgstr ""
+msgstr "Повторять все"
#: ../data/lxmusic.ui.glade.h:26
msgid "Repeat Current"
-msgstr ""
+msgstr "Повторять текущую"
#: ../data/lxmusic.ui.glade.h:27
msgid "Show Playlist"
@@ -264,7 +264,7 @@
#: ../data/lxmusic.ui.glade.h:29
msgid "Track Name"
-msgstr ""
+msgstr "Имя дорожки"
#: ../data/lxmusic.ui.glade.h:30
msgid "_Delete Current Playlist"
@@ -280,7 +280,7 @@
#: ../data/lxmusic.ui.glade.h:33
msgid "_Locate Currently Played"
-msgstr ""
+msgstr "_Найти текущую композицию"
#: ../data/lxmusic.ui.glade.h:34
msgid "_Playlist"
@@ -339,7 +339,6 @@
msgstr "Кб"
#: ../data/pref-dlg.ui.glade.h:10
-#, fuzzy
msgid "Minimize to system tray on close"
msgstr "Сворачивать в док вместо закрытия"
@@ -348,12 +347,8 @@
msgstr "Разное"
#: ../data/pref-dlg.ui.glade.h:12
-msgid ""
-"Music files can be played without graphical user interface to save system "
-"resources"
-msgstr ""
-"Звуковые файлы должны быть воспроизведены без использования графического "
-"интерфейса пользователя (GUI) для экономии системных ресурсов."
+msgid "Music files can be played without graphical user interface to save system resources"
+msgstr "Звуковые файлы должны быть воспроизведены без использования графического интерфейса пользователя (GUI) для экономии системных ресурсов."
#: ../data/pref-dlg.ui.glade.h:13
msgid "Plugin: "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxmusic-0.4.3/po/tr.po new/lxmusic-0.4.4/po/tr.po
--- old/lxmusic-0.4.3/po/tr.po 2010-03-01 20:09:00.000000000 +0100
+++ new/lxmusic-0.4.4/po/tr.po 2010-04-11 02:14:33.000000000 +0200
@@ -8,7 +8,7 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-01-06 16:08+0100\n"
-"PO-Revision-Date: 2010-01-29 03:22+0200\n"
+"PO-Revision-Date: 2010-02-24 19:52+0200\n"
"Last-Translator: Kılıç \n"
"Language-Team: LANGUAGE \n"
"Language: tr\n"
@@ -58,7 +58,7 @@
#: ../src/lxmusic.c:1378 ../data/lxmusic.ui.glade.h:5
msgid "Album"
-msgstr ""
+msgstr "Uzunçalar"
#: ../src/lxmusic.c:1386 ../src/lxmusic.c:1772
msgid "Title"
@@ -97,7 +97,7 @@
#. * to get list of possible config variables
#: ../src/lxmusic-plugin-config.c:17
msgid "Advanced Linux Sound Architecture"
-msgstr ""
+msgstr "Gelişmiş Linux Ses Yapısı"
#: ../src/lxmusic-plugin-config.c:18 ../src/lxmusic-plugin-config.c:23
#: ../src/lxmusic-plugin-config.c:28
@@ -116,7 +116,7 @@
#. ao
#: ../src/lxmusic-plugin-config.c:27
msgid "Cross-platform audio output library"
-msgstr ""
+msgstr "İşletim sistemi geçişli ses çıktısı betikevi"
#. pulse
#: ../src/lxmusic-plugin-config.c:31
@@ -133,7 +133,7 @@
#: ../src/lxmusic-plugin-config.c:34
msgid "Sink:"
-msgstr ""
+msgstr "Alıcı:"
#. airtunes
#: ../src/lxmusic-plugin-config.c:37
@@ -143,7 +143,7 @@
#. jack
#: ../src/lxmusic-plugin-config.c:41
msgid "JACK Audio Connection Kit"
-msgstr ""
+msgstr "JACK Ses Bağlantı Kiti"
#: ../src/lxmusic-plugin-config.c:43
msgid "Disk Writer"
@@ -169,9 +169,10 @@
msgid "Add To Playlist"
msgstr "Parça Listesine Ekle"
+# BKB: Birörnek Kaynak Bulucu
#: ../data/lxmusic.ui.glade.h:3
msgid "Add URL"
-msgstr ""
+msgstr "BKB (URL) Ekle"
#: ../data/lxmusic.ui.glade.h:4
msgid "Add files to the playlist"
@@ -195,7 +196,7 @@
#: ../data/lxmusic.ui.glade.h:11
msgid "Favorites"
-msgstr ""
+msgstr "Sık kullanılanlar"
#: ../data/lxmusic.ui.glade.h:12 ../data/track-info.ui.glade.h:8
msgid "File Properties"
@@ -209,9 +210,10 @@
msgid "Locate currently played track"
msgstr "Çalınmakta olan izin konumunu bul"
+# Betikevi: kütüphane
#: ../data/lxmusic.ui.glade.h:16
msgid "Media Library"
-msgstr ""
+msgstr "Ortam Betikevi"
#: ../data/lxmusic.ui.glade.h:17
msgid "Next"
@@ -315,7 +317,7 @@
#: ../data/pref-dlg.ui.glade.h:4
msgid "Buffer Size: "
-msgstr ""
+msgstr "Arabellek Boyutu:"
#: ../data/pref-dlg.ui.glade.h:5
msgid "CD-ROM Device: "
@@ -327,7 +329,7 @@
#: ../data/pref-dlg.ui.glade.h:7
msgid "Default ID3 V1 Encoding: "
-msgstr ""
+msgstr "Öntanımlı ID3 V1 Kodlama:"
#: ../data/pref-dlg.ui.glade.h:8
msgid "General"
@@ -355,7 +357,7 @@
#: ../data/pref-dlg.ui.glade.h:13
msgid "Plugin: "
-msgstr ""
+msgstr "Takıntı: "
#: ../data/pref-dlg.ui.glade.h:14
msgid "Preference"
@@ -367,7 +369,7 @@
#: ../data/track-info.ui.glade.h:1
msgid "<b>Album: </b>"
-msgstr ""
+msgstr "<b>Uzunçalar: </b>"
#: ../data/track-info.ui.glade.h:2
msgid "<b>Artist: </b>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxmusic-0.4.3/src/lxmusic-plugin-config.c new/lxmusic-0.4.4/src/lxmusic-plugin-config.c
--- old/lxmusic-0.4.3/src/lxmusic-plugin-config.c 2010-03-01 20:09:00.000000000 +0100
+++ new/lxmusic-0.4.4/src/lxmusic-plugin-config.c 2010-04-11 02:15:13.000000000 +0200
@@ -74,7 +74,7 @@
plugin_config_init_translation();
/* get list of available plugins */
- res = xmmsc_plugin_list (con, XMMS_PLUGIN_TYPE_OUTPUT);
+ res = xmmsc_main_list_plugins (con, XMMS_PLUGIN_TYPE_OUTPUT);
/* we havn't entered async xmmsc_mainloop, so it's ok todo sync ops */
xmmsc_result_wait (res);
val = xmmsc_result_get_value (res);
@@ -107,7 +107,7 @@
xmmsc_result_unref (res);
/* get configuration options */
- res = xmmsc_configval_list (con );
+ res = xmmsc_config_list_values (con );
xmmsc_result_wait (res);
val = xmmsc_result_get_value (res);
xmmsv_dict_foreach( val, plugin_config_setup_parameter, NULL);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxmusic-0.4.3/src/lxmusic.c new/lxmusic-0.4.4/src/lxmusic.c
--- old/lxmusic-0.4.3/src/lxmusic.c 2010-03-01 22:44:38.000000000 +0100
+++ new/lxmusic-0.4.4/src/lxmusic.c 2010-04-11 02:15:13.000000000 +0200
@@ -68,11 +68,6 @@
FILTER_TITLE,
};
-typedef struct _UpdateTrack{
- uint32_t id;
- GtkTreeIter it;
-}UpdateTrack;
-
typedef struct _TrackProperties{
const char *artist;
const char *album;
@@ -87,6 +82,9 @@
}TrackProperties;
static void send_notifcation ( const gchar *artist, const gchar* title );
+static int update_track ( xmmsv_t *value, GtkTreeIter* it );
+static int on_coll_info_received ( xmmsv_t* value, void* user_data );
+
#ifdef HAVE_LIBNOTIFY
static LXMusic_Notification *lxmusic_notification = NULL;
@@ -114,9 +112,6 @@
static char* cur_playlist = NULL;
static GSList* all_playlists = NULL;
-/* to be updated by update_track */
-static GHashTable *update_tracks;
-
static GtkListStore* list_store = NULL;
static int32_t playback_status = 0;
@@ -204,11 +199,6 @@
}
}
-static void cancel_pending_update_tracks()
-{
- g_hash_table_remove_all( update_tracks );
-}
-
static int on_xmms_quit(xmmsv_t *value, void *user_data)
{
gtk_widget_destroy(main_win);
@@ -218,8 +208,6 @@
void on_quit(GtkAction* act, gpointer user_data)
{
- cancel_pending_update_tracks();
-
if( show_playlist )
gtk_window_get_size(GTK_WINDOW(main_win), &win_width, &win_height);
@@ -561,6 +549,69 @@
}
g_object_unref(builder);
}
+static int on_playlist_coll_received(xmmsv_t* value, void* user_data)
+{
+ /* list of attributes we wan't to query */
+ const gchar *properties[] = { "artist", "album", "title", "duration", "id", "url", NULL };
+ static xmmsv_t * p_list = NULL;
+ xmmsc_result_t* res;
+ xmmsv_coll_t* col;
+ int i;
+
+ /* Should be created just once */
+ if (p_list == NULL) {
+ p_list = xmmsv_new_list();
+ for ( i = 0; properties[i]; i++ )
+ {
+ xmmsv_t *p_string = xmmsv_new_string (properties[i]);
+ xmmsv_list_append ( p_list, p_string );
+ xmmsv_unref( p_string );
+ }
+ }
+ xmmsv_get_coll( value, &col );
+ res = xmmsc_coll_query_infos( con, col, NULL, 0, 0, p_list, NULL );
+ xmmsc_result_notifier_set_and_unref(res, on_coll_info_received, NULL );
+ return TRUE;
+}
+
+static int on_coll_info_received(xmmsv_t* value, void* user_data)
+{
+ xmmsv_list_iter_t *l_iter;
+ int32_t id;
+ const gchar *str;
+ GtkTreeModel* model = GTK_TREE_MODEL(list_store);
+ GtkTreeIter it;
+ int i = 0;
+
+ /* setup a hashmap ID -> xmmsv_list pos so we can access track info fast for each tree model row */
+ GHashTable* id_to_coll_info = g_hash_table_new( g_direct_hash, NULL );
+ for ( i = 0; i < xmmsv_list_get_size( value ); i++ )
+ {
+ xmmsv_t *track_info;
+ xmmsv_t *id_val;
+ int32_t id;
+ xmmsv_list_get (value, i, &track_info);
+ xmmsv_dict_get ( track_info, "id", &id_val );
+ xmmsv_get_int ( id_val, &id );
+ g_hash_table_insert( id_to_coll_info, GINT_TO_POINTER( id ), track_info );
+ }
+
+ gtk_tree_model_get_iter_first( model, &it );
+ i = 0;
+ while (gtk_list_store_iter_is_valid( list_store , &it ))
+ {
+ xmmsv_t *track_info;
+ TrackProperties track_properties;
+ gtk_tree_model_get( model, &it, COL_ID, &id, -1 );
+ /* find corressponding track info */
+ track_info = (xmmsv_t*) g_hash_table_lookup( id_to_coll_info, GINT_TO_POINTER( id ));
+ update_track( track_info, &it );
+ gtk_tree_model_iter_next( model, &it );
+ i++;
+ }
+ g_hash_table_unref( id_to_coll_info );
+}
+
static int on_track_info_received(xmmsv_t* value, void* user_data)
{
@@ -1145,37 +1196,31 @@
g_object_set( render, "text", buf, NULL );
}
-
-static int update_track( xmmsv_t *value, UpdateTrack* ut )
+static int update_track( xmmsv_t *value, GtkTreeIter* it )
{
TrackProperties track_properties;
gboolean current_track_updated;
char time_buf[32];
+ int32_t id;
gchar *guessed_title = NULL;
if( xmmsv_is_error ( value ) ) {
return FALSE;
}
- /* check if this update is valid: Maybe it was meanwhile canceled
- * (for example by switching a long loading playlist */
- if (!g_hash_table_lookup( update_tracks, ut ))
- return TRUE;
-
- /* valid update */
- g_hash_table_remove( update_tracks, ut );
-
if (!get_track_properties( value, &track_properties))
track_properties.title = guessed_title = guess_title_from_url( track_properties.url );
timeval_to_str( track_properties.duration/1000, time_buf, G_N_ELEMENTS(time_buf) );
- gtk_list_store_set( list_store, &ut->it,
+ gtk_list_store_set( list_store, it,
COL_ARTIST, track_properties.artist,
COL_ALBUM, track_properties.album,
COL_TITLE, track_properties.title,
COL_LEN, time_buf, -1 );
- current_track_updated = ut->id == cur_track_id;
- if ( current_track_updated )
+
+ gtk_tree_model_get( GTK_TREE_MODEL(list_store), it, COL_ID, &id, -1 );
+ current_track_updated = id == cur_track_id;
+ if ( current_track_updated )
{
/* send desktop notification if current track was updated */
send_notifcation( track_properties.artist, track_properties.title );
@@ -1187,7 +1232,6 @@
}
}
- g_slice_free(UpdateTrack, ut);
g_free( guessed_title );
return FALSE;
}
@@ -1239,16 +1283,28 @@
else if (strcmp( key, "size" ) == 0)
val_int = &(properties->size);
- if (xmmsv_get_dict_iter (child_value, &child_it) &&
- xmmsv_dict_iter_valid (child_it) && (val_int || val_str) &&
- xmmsv_dict_iter_pair (child_it, NULL, &child_value)) {
-
- if (val_int != NULL)
+ /* check if we got a dict_of_dict */
+ if (xmmsv_is_type (child_value, XMMSV_TYPE_DICT) )
+ {
+ if (xmmsv_get_dict_iter (child_value, &child_it) &&
+ xmmsv_dict_iter_valid (child_it) && (val_int || val_str) &&
+ xmmsv_dict_iter_pair (child_it, NULL, &child_value)) {
+
+ if (val_int != NULL)
+ xmmsv_get_int( child_value, val_int);
+ else
+ xmmsv_get_string( child_value, val_str );
+ }
+ }
+ /* primitive values */
+ else
+ {
+ if (val_int)
xmmsv_get_int( child_value, val_int);
- else
+ else
xmmsv_get_string( child_value, val_str );
}
- xmmsv_dict_iter_next (parent_it);
+ xmmsv_dict_iter_next (parent_it);
}
if ((properties->title == NULL) || g_str_equal( properties->title, "" ))
@@ -1263,23 +1319,20 @@
static void queue_update_track( uint32_t id, GtkTreeIter* it )
{
- UpdateTrack* ut;
- xmmsc_result_t *res;
- ut = g_slice_new(UpdateTrack);
- ut->id = id;
- ut->it = *it;
- g_hash_table_insert( update_tracks, ut, ut );
- res = xmmsc_medialib_get_info( con, id );
- xmmsc_result_notifier_set_full( res, (xmmsc_result_notifier_t)update_track, ut, NULL );
+ xmmsc_result_t *res = xmmsc_medialib_get_info( con, id );
+ xmmsc_result_notifier_set_full ( res, (xmmsc_result_notifier_t)update_track, it, (
+ xmmsc_user_data_free_func_t) gtk_tree_iter_free );
xmmsc_result_unref( res );
}
-static int on_playlist_content_received( xmmsv_t* value, GtkWidget* list_view )
+static int on_playlist_entries_received( xmmsv_t* value, GtkWidget* list_view )
{
GtkTreeModel* mf;
GtkTreeIter it;
- int pl_size = xmmsv_list_get_size( value );
+ xmmsv_coll_t *coll;
+ xmmsc_result_t *res;
int i;
+ int pl_size = xmmsv_list_get_size( value);;
/* free prev. model filter */
if ((mf = gtk_tree_view_get_model(GTK_TREE_VIEW(playlist_view))))
@@ -1291,29 +1344,18 @@
gtk_tree_view_set_search_equal_func( GTK_TREE_VIEW(playlist_view), playlist_search_func, NULL, NULL );
g_object_unref(list_store);
- /* invalidate pending track updates */
- cancel_pending_update_tracks();
-
for ( i = 0; i < pl_size; i++ )
{
int32_t id;
xmmsv_t *current_value;
- xmmsc_result_t *res;
- UpdateTrack* ut = g_slice_new(UpdateTrack);
-
xmmsv_list_get( value, i, ¤t_value );
xmmsv_get_int( current_value, &id );
gtk_list_store_insert_with_values ( list_store, &it, i, COL_ID, id, COL_WEIGHT, PANGO_WEIGHT_NORMAL, -1 );
-
- ut->id = id;
- ut->it = it;
- /* just insert dummy values so we can distinguish from NULL */
- g_hash_table_insert( update_tracks, ut, ut );
- res = xmmsc_medialib_get_info( con, ut->id );
- xmmsc_result_notifier_set_full( res, (xmmsc_result_notifier_t)update_track, ut, NULL );
- xmmsc_result_unref( res );
}
-
+ /* retrieve collection info */
+ res = xmmsc_coll_get( con, cur_playlist, "Playlists" );
+ xmmsc_result_notifier_set_and_unref(res, on_playlist_coll_received, NULL );
+
if( GTK_WIDGET_REALIZED( list_view ) )
gdk_window_set_cursor( list_view->window, NULL );
@@ -1350,8 +1392,9 @@
gdk_window_set_cursor( list_view->window, cur );
gdk_cursor_unref( cur );
}
+ /* get current playlist as id_list */
res = xmmsc_playlist_list_entries( con, cur_playlist );
- xmmsc_result_notifier_set_and_unref( res, (xmmsc_result_notifier_t)on_playlist_content_received, list_view );
+ xmmsc_result_notifier_set_and_unref( res, (xmmsc_result_notifier_t)on_playlist_entries_received, list_view );
}
static GtkWidget* init_playlist(GtkWidget* list_view)
@@ -1404,8 +1447,6 @@
if( gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(mi)) )
{
/* if there are pending requests to current playlist, cancel them */
- cancel_pending_update_tracks();
-
res = xmmsc_playlist_load(con, pl_name);
xmmsc_result_unref(res);
}
@@ -1446,9 +1487,6 @@
}
}
- /* if there are pending requests, cancel them */
- cancel_pending_update_tracks();
-
update_play_list( playlist_view );
}
return TRUE;
@@ -1613,7 +1651,7 @@
xmmsv_get_int( int_value, &id );
gtk_list_store_insert_with_values( list_store, &it, pos, COL_ID, id, -1 );
/* g_debug("playlist_added: %d", id); */
- queue_update_track( id, &it );
+ queue_update_track( id, gtk_tree_iter_copy( &it ));
}
break;
case XMMS_PLAYLIST_CHANGED_REMOVE:
@@ -2030,7 +2068,7 @@
if( _id == id )
{
/* g_debug("found! update: %d", id); */
- queue_update_track( id, &it );
+ queue_update_track( id, gtk_tree_iter_copy( &it ) );
break;
}
}while(gtk_tree_model_iter_next(model, &it));
@@ -2364,11 +2402,7 @@
gtk_init(&argc, &argv);
plugin_config_setup(con);
-
- update_tracks = g_hash_table_new( g_direct_hash, NULL );
-
xmmsc_mainloop_gmain_init(con);
-
load_config();
/* build the GUI */
@@ -2398,8 +2432,6 @@
gtk_main ();
- cancel_pending_update_tracks();
- g_hash_table_unref ( update_tracks );
save_config();
return 0;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org