# We use $(mkdir_p).
# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
-# ${SHELL} /home/jporsini/work/psensor/install-sh does not start with $(SHELL), so we add it.
+# ${SHELL} /home/jporsini/work.local/psensor/install-sh does not start with $(SHELL), so we add it.
# In automake >= 1.10, /bin/mkdir -p is derived from ${MKDIR_P}, which is defined
# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
# versions, $(mkinstalldirs) and $(install_sh) are unused.
-mkinstalldirs = $(SHELL) ${SHELL} /home/jporsini/work/psensor/install-sh -d
-install_sh = $(SHELL) ${SHELL} /home/jporsini/work/psensor/install-sh
+mkinstalldirs = $(SHELL) ${SHELL} /home/jporsini/work.local/psensor/install-sh -d
+install_sh = $(SHELL) ${SHELL} /home/jporsini/work.local/psensor/install-sh
MKDIR_P = /bin/mkdir -p
mkdir_p = /bin/mkdir -p
msgstr ""
"Project-Id-Version: psensor 0.7.0.x\n"
"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-09-25 12:21+0200\n"
+"POT-Creation-Date: 2014-09-25 17:58+0200\n"
"PO-Revision-Date: 2014-09-20 11:25+0000\n"
"Last-Translator: Jean-Philippe Orsini <Unknown>\n"
"Language-Team: German\n"
msgid "Number of active AMD/ATI adapters: %d"
msgstr "Anzahl der aktiven AMD/ATI-Adapter: %d"
-#: src/lib/hdd_atasmart.c:60 src/lib/hdd_hddtemp.c:125
+#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125
msgid "Disk"
msgstr ""
-#: src/lib/hdd_atasmart.c:142
+#: src/lib/hdd_atasmart.c:153
#, c-format
msgid "%s: sk_disk_open() failure: %s."
msgstr "%s: sk_disk_open() gescheitert: %s."
msgstr ""
"Project-Id-Version: psensor\n"
"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-09-25 12:21+0200\n"
+"POT-Creation-Date: 2014-09-25 17:58+0200\n"
"PO-Revision-Date: 2014-09-20 11:26+0000\n"
"Last-Translator: Jean-Philippe Orsini <Unknown>\n"
"Language-Team: Spanish <es@li.org>\n"
msgid "Number of active AMD/ATI adapters: %d"
msgstr "Numero de adaptadores AMD/ATI: %d"
-#: src/lib/hdd_atasmart.c:60 src/lib/hdd_hddtemp.c:125
+#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125
msgid "Disk"
msgstr ""
-#: src/lib/hdd_atasmart.c:142
+#: src/lib/hdd_atasmart.c:153
#, c-format
msgid "%s: sk_disk_open() failure: %s."
msgstr "%s: sk_disk_open() Error: %s"
msgstr ""
"Project-Id-Version: psensor\n"
"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-09-25 12:21+0200\n"
+"POT-Creation-Date: 2014-09-25 17:58+0200\n"
"PO-Revision-Date: 2014-09-21 09:39+0000\n"
"Last-Translator: Jean-Philippe Orsini <Unknown>\n"
"Language-Team: French <>\n"
msgid "Number of active AMD/ATI adapters: %d"
msgstr ""
-#: src/lib/hdd_atasmart.c:60 src/lib/hdd_hddtemp.c:125
+#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125
msgid "Disk"
msgstr "Disque"
-#: src/lib/hdd_atasmart.c:142
+#: src/lib/hdd_atasmart.c:153
#, c-format
msgid "%s: sk_disk_open() failure: %s."
msgstr "%s : échec de sk_disk_open() : %s."
msgstr ""
"Project-Id-Version: psensor\n"
"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-09-25 12:21+0200\n"
+"POT-Creation-Date: 2014-09-25 17:58+0200\n"
"PO-Revision-Date: 2014-09-21 06:25+0000\n"
"Last-Translator: gogo <trebelnik2@gmail.com>\n"
"Language-Team: Croatian <hr@li.org>\n"
msgid "Number of active AMD/ATI adapters: %d"
msgstr "Broj aktivnih AMD/ATI adaptera: %d"
-#: src/lib/hdd_atasmart.c:60 src/lib/hdd_hddtemp.c:125
+#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125
msgid "Disk"
msgstr "Disk"
-#: src/lib/hdd_atasmart.c:142
+#: src/lib/hdd_atasmart.c:153
#, c-format
msgid "%s: sk_disk_open() failure: %s."
msgstr "%s: sk_disk_open() neuspjelo: %s."
msgstr ""
"Project-Id-Version: psensor\n"
"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-09-25 12:21+0200\n"
+"POT-Creation-Date: 2014-09-25 17:58+0200\n"
"PO-Revision-Date: 2014-09-20 11:26+0000\n"
"Last-Translator: Jean-Philippe Orsini <Unknown>\n"
"Language-Team: Hungarian <gnome-hu-list-request@gnome.org>\n"
msgid "Number of active AMD/ATI adapters: %d"
msgstr "Aktív ADM/ATI adapterek száma: %d"
-#: src/lib/hdd_atasmart.c:60 src/lib/hdd_hddtemp.c:125
+#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125
msgid "Disk"
msgstr "Lemez"
-#: src/lib/hdd_atasmart.c:142
+#: src/lib/hdd_atasmart.c:153
#, fuzzy, c-format
msgid "%s: sk_disk_open() failure: %s."
msgstr "%s: sk_disk_open() hiba: %s."
msgstr ""
"Project-Id-Version: psensor 0.7.0.x\n"
"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-09-25 12:21+0200\n"
+"POT-Creation-Date: 2014-09-25 17:58+0200\n"
"PO-Revision-Date: 2014-09-20 11:24+0000\n"
"Last-Translator: Jean-Philippe Orsini <Unknown>\n"
"Language-Team: Italian\n"
msgid "Number of active AMD/ATI adapters: %d"
msgstr ""
-#: src/lib/hdd_atasmart.c:60 src/lib/hdd_hddtemp.c:125
+#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125
msgid "Disk"
msgstr "Disco"
-#: src/lib/hdd_atasmart.c:142
+#: src/lib/hdd_atasmart.c:153
#, c-format
msgid "%s: sk_disk_open() failure: %s."
msgstr "%s: errore sk_disk_open(): %s."
msgstr ""
"Project-Id-Version: psensor\n"
"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-09-25 12:21+0200\n"
+"POT-Creation-Date: 2014-09-25 17:58+0200\n"
"PO-Revision-Date: 2014-09-20 11:26+0000\n"
"Last-Translator: Jean-Philippe Orsini <Unknown>\n"
"Language-Team: Latvian <lv@li.org>\n"
msgid "Number of active AMD/ATI adapters: %d"
msgstr "Aktīvo AMD/ATI adapteru skaits: %d"
-#: src/lib/hdd_atasmart.c:60 src/lib/hdd_hddtemp.c:125
+#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125
msgid "Disk"
msgstr "Disks"
-#: src/lib/hdd_atasmart.c:142
+#: src/lib/hdd_atasmart.c:153
#, fuzzy, c-format
msgid "%s: sk_disk_open() failure: %s."
msgstr "atasmart: sk_disk_open() atteice: %s."
msgstr ""
"Project-Id-Version: psensor\n"
"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-09-25 12:21+0200\n"
+"POT-Creation-Date: 2014-09-25 17:58+0200\n"
"PO-Revision-Date: 2014-09-20 11:25+0000\n"
"Last-Translator: Jean-Philippe Orsini <Unknown>\n"
"Language-Team: Dutch <nl@li.org>\n"
msgid "Number of active AMD/ATI adapters: %d"
msgstr "Aantal actieve AMD/ATI-videokaarten: %d"
-#: src/lib/hdd_atasmart.c:60 src/lib/hdd_hddtemp.c:125
+#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125
msgid "Disk"
msgstr ""
-#: src/lib/hdd_atasmart.c:142
+#: src/lib/hdd_atasmart.c:153
#, fuzzy, c-format
msgid "%s: sk_disk_open() failure: %s."
msgstr "atasmart: sk_disk_open() mislukking: %s."
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-09-25 12:21+0200\n"
+"POT-Creation-Date: 2014-09-25 17:58+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
msgid "Number of active AMD/ATI adapters: %d"
msgstr ""
-#: src/lib/hdd_atasmart.c:60 src/lib/hdd_hddtemp.c:125
+#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125
msgid "Disk"
msgstr ""
-#: src/lib/hdd_atasmart.c:142
+#: src/lib/hdd_atasmart.c:153
#, c-format
msgid "%s: sk_disk_open() failure: %s."
msgstr ""
msgstr ""
"Project-Id-Version: psensor 0.7.0.x\n"
"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-09-25 12:21+0200\n"
+"POT-Creation-Date: 2014-09-25 17:58+0200\n"
"PO-Revision-Date: 2014-09-11 21:22+0000\n"
"Last-Translator: Jean-Philippe Orsini <Unknown>\n"
"Language-Team: Brazilian Portuguese\n"
msgid "Number of active AMD/ATI adapters: %d"
msgstr "Número de adaptadores AMD/ATI ativos: %d"
-#: src/lib/hdd_atasmart.c:60 src/lib/hdd_hddtemp.c:125
+#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125
msgid "Disk"
msgstr ""
-#: src/lib/hdd_atasmart.c:142
+#: src/lib/hdd_atasmart.c:153
#, c-format
msgid "%s: sk_disk_open() failure: %s."
msgstr "%s: falha em sk_disk_open(): %s."
msgstr ""
"Project-Id-Version: psensor 0.7.0.x\n"
"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-09-25 12:21+0200\n"
+"POT-Creation-Date: 2014-09-25 17:58+0200\n"
"PO-Revision-Date: 2014-09-11 21:23+0000\n"
"Last-Translator: Jean-Philippe Orsini <Unknown>\n"
"Language-Team: Russian\n"
msgid "Number of active AMD/ATI adapters: %d"
msgstr ""
-#: src/lib/hdd_atasmart.c:60 src/lib/hdd_hddtemp.c:125
+#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125
msgid "Disk"
msgstr ""
-#: src/lib/hdd_atasmart.c:142
+#: src/lib/hdd_atasmart.c:153
#, fuzzy, c-format
msgid "%s: sk_disk_open() failure: %s."
msgstr "atasmart: ошибка sk_disk_open(): %s."
msgstr ""
"Project-Id-Version: psensor\n"
"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-09-25 12:21+0200\n"
+"POT-Creation-Date: 2014-09-25 17:58+0200\n"
"PO-Revision-Date: 2014-09-11 21:22+0000\n"
"Last-Translator: Jean-Philippe Orsini <Unknown>\n"
"Language-Team: Slovenian <sl@li.org>\n"
msgid "Number of active AMD/ATI adapters: %d"
msgstr ""
-#: src/lib/hdd_atasmart.c:60 src/lib/hdd_hddtemp.c:125
+#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125
msgid "Disk"
msgstr ""
-#: src/lib/hdd_atasmart.c:142
+#: src/lib/hdd_atasmart.c:153
#, c-format
msgid "%s: sk_disk_open() failure: %s."
msgstr ""
msgstr ""
"Project-Id-Version: psensor\n"
"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-09-25 12:21+0200\n"
+"POT-Creation-Date: 2014-09-25 17:58+0200\n"
"PO-Revision-Date: 2014-09-11 21:25+0000\n"
"Last-Translator: Jean-Philippe Orsini <Unknown>\n"
"Language-Team: Serbian <sr@li.org>\n"
msgid "Number of active AMD/ATI adapters: %d"
msgstr ""
-#: src/lib/hdd_atasmart.c:60 src/lib/hdd_hddtemp.c:125
+#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125
msgid "Disk"
msgstr ""
-#: src/lib/hdd_atasmart.c:142
+#: src/lib/hdd_atasmart.c:153
#, c-format
msgid "%s: sk_disk_open() failure: %s."
msgstr ""
msgstr ""
"Project-Id-Version: psensor 1.0.0.0\n"
"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-09-25 12:21+0200\n"
+"POT-Creation-Date: 2014-09-25 17:58+0200\n"
"PO-Revision-Date: 2014-09-20 11:26+0000\n"
"Last-Translator: Jean-Philippe Orsini <Unknown>\n"
"Language-Team: Swedish\n"
msgid "Number of active AMD/ATI adapters: %d"
msgstr "Antal aktiva AMD/ATI-adaptrar: %d"
-#: src/lib/hdd_atasmart.c:60 src/lib/hdd_hddtemp.c:125
+#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125
msgid "Disk"
msgstr "Disk"
-#: src/lib/hdd_atasmart.c:142
+#: src/lib/hdd_atasmart.c:153
#, c-format
msgid "%s: sk_disk_open() failure: %s."
msgstr "%s: sk_disk_open()-fel: %s."
msgstr ""
"Project-Id-Version: psensor\n"
"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-09-25 12:21+0200\n"
+"POT-Creation-Date: 2014-09-25 17:58+0200\n"
"PO-Revision-Date: 2014-09-20 11:27+0000\n"
"Last-Translator: Jean-Philippe Orsini <Unknown>\n"
"Language-Team: Turkish <tr@li.org>\n"
msgid "Number of active AMD/ATI adapters: %d"
msgstr "Etkin AMD/ATI bağdaştırıcı sayısı: %d"
-#: src/lib/hdd_atasmart.c:60 src/lib/hdd_hddtemp.c:125
+#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125
msgid "Disk"
msgstr "Disk"
-#: src/lib/hdd_atasmart.c:142
+#: src/lib/hdd_atasmart.c:153
#, c-format
msgid "%s: sk_disk_open() failure: %s."
msgstr "%s: sk_disk_open() hatası: %s."
msgstr ""
"Project-Id-Version: psensor\n"
"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-09-25 12:21+0200\n"
+"POT-Creation-Date: 2014-09-25 17:58+0200\n"
"PO-Revision-Date: 2014-09-11 21:23+0000\n"
"Last-Translator: Jean-Philippe Orsini <Unknown>\n"
"Language-Team: Ukrainian <uk@li.org>\n"
msgid "Number of active AMD/ATI adapters: %d"
msgstr ""
-#: src/lib/hdd_atasmart.c:60 src/lib/hdd_hddtemp.c:125
+#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125
msgid "Disk"
msgstr ""
-#: src/lib/hdd_atasmart.c:142
+#: src/lib/hdd_atasmart.c:153
#, fuzzy, c-format
msgid "%s: sk_disk_open() failure: %s."
msgstr "atasmart: помилка sk_disk_open(): %s."
msgstr ""
"Project-Id-Version: psensor\n"
"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-09-25 12:21+0200\n"
+"POT-Creation-Date: 2014-09-25 17:58+0200\n"
"PO-Revision-Date: 2014-09-11 21:24+0000\n"
"Last-Translator: Jean-Philippe Orsini <Unknown>\n"
"Language-Team: Chinese (simplified)\n"
msgid "Number of active AMD/ATI adapters: %d"
msgstr ""
-#: src/lib/hdd_atasmart.c:60 src/lib/hdd_hddtemp.c:125
+#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125
msgid "Disk"
msgstr ""
-#: src/lib/hdd_atasmart.c:142
+#: src/lib/hdd_atasmart.c:153
#, c-format
msgid "%s: sk_disk_open() failure: %s."
msgstr "%s:sk_disk_open() 失败:%s。"
return strlen(p) == 8 && !strncmp(p, "/dev/sd", 7);
}
+static void provider_data_free(void *data)
+{
+ sk_disk_free((SkDisk *)data);
+}
+
+static SkDisk *get_disk(struct psensor *s)
+{
+ return (SkDisk *)s->provider_data;
+}
+
static struct psensor *
create_sensor(char *id, char *name, SkDisk *disk, int values_max_length)
{
t,
values_max_length);
- s->disk = disk;
+ s->provider_data = disk;
+ s->provider_data_free_fct = &provider_data_free;
return s;
}
uint64_t kelvin;
int ret;
double c;
+ SkDisk *disk;
cur = sensors;
while (*cur) {
s = *cur;
if (!(s->type & SENSOR_TYPE_REMOTE)
&& s->type & SENSOR_TYPE_ATASMART) {
- ret = sk_disk_smart_read_data(s->disk);
+ disk = get_disk(s);
+
+ ret = sk_disk_smart_read_data(disk);
if (!ret) {
- ret = sk_disk_smart_get_temperature(s->disk,
+ ret = sk_disk_smart_get_temperature(disk,
&kelvin);
if (!ret) {
#include <config.h>
-#ifdef HAVE_ATASMART
-#include <atasmart.h>
-#endif
-
#include <bool.h>
#include <color.h>
#include <measure.h>
/* AMD id for the aticonfig */
int amd_id;
#endif
-#ifdef HAVE_ATASMART
- SkDisk *disk;
-#endif
void *provider_data;
void (*provider_data_free_fct)(void *);