summaryrefslogtreecommitdiffstats
path: root/src/hal-common.h
diff options
context:
space:
mode:
authorjcsjcs <jcsjcs@f01d2545-417e-4e96-918e-98f8d0dbbcb6>2006-03-16 15:34:34 +0000
committerjcsjcs <jcsjcs@f01d2545-417e-4e96-918e-98f8d0dbbcb6>2006-03-16 15:34:34 +0000
commite00cb9a946a20386bf6995daccc87311b42f363b (patch)
treec5a18421b35013c3fcd1ac5dbe72daa649a30b2b /src/hal-common.h
parent4dda96c8f7323eda240d7439c712653dd9d951b0 (diff)
* itdb_device.[ch]: rewrote ipod-device.c, removed all hal-code,
removed all code irrelevant to writing the iTunesDB and ArtworkDB. * autodetect iControl directory now also works for ArtworkDB. * db-artwork-parser.c (ipod_db_get_artwork_db_path): create Artwork directory if not already present. * itdb.h: Itdb_iTunesDB: moved mountpoint and musicdirs into private Itdb_Device. Use itdb_set_mountpoint() and itdb_get_mountpoint() to access the mountpoint. git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1220 f01d2545-417e-4e96-918e-98f8d0dbbcb6
Diffstat (limited to 'src/hal-common.h')
-rw-r--r--src/hal-common.h95
1 files changed, 0 insertions, 95 deletions
diff --git a/src/hal-common.h b/src/hal-common.h
deleted file mode 100644
index 8cdbe2b..0000000
--- a/src/hal-common.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* Time-stamp: <2005-10-10 01:23:30 jcs>
-|
-| Copyright (C) 2005 Jorg Schuler <jcsjcs at users sourceforge net>
-| Part of the gtkpod project.
-|
-| URL: http://www.gtkpod.org/
-| URL: http://gtkpod.sourceforge.net/
-|
-|
-| The source is taken from libipoddevice, CVS version October 8 2005
-| (http://64.14.94.162/index.php/Libipoddevice).
-|
-| I decided not to make libgpod dependent on libipoddevice because
-| the latter depends on libraries not widely available yet (libhal >=
-| 0.5.2, glib >= 2.8). It is planned to replace these files with a
-| libipoddevice dependence at some later time.
-|
-| The following changes were done:
-|
-| - libhal becomes optional (see #if HAVE_LIBHAL sections)
-| - provide some dummy libhal functions to make libhal-independence
-| of ipod-device.c easier.
-|
-| Because of these changes only a limited amount of functionality is
-| available. See ipod-device.h for summary.
-|
-|
-|
-|
-| $Id$
-*/
-/* ex: set ts=4: */
-/***************************************************************************
-* hal-common.h
-* Copyright (C) 2005 Novell
-* Written by Aaron Bockover <aaron@aaronbock.net>
-****************************************************************************/
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2.1 of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
- *
- * This program 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 Lesser Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef HAL_COMMON_H
-#define HAL_COMMON_H
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <glib.h>
-#include <glib-object.h>
-
-#ifdef HAVE_LIBHAL
-
-#include <libhal.h>
-#include <dbus/dbus.h>
-#include <dbus/dbus-glib.h>
-
-dbus_bool_t hal_mainloop_integration(LibHalContext *ctx, DBusError *error);
-void ipod_device_set_global_main_context(GMainContext *ctx);
-
-#else
-typedef void LibHalContext;
-G_GNUC_INTERNAL gchar **libhal_manager_find_device_string_match (LibHalContext *hal_ctx,
- const gchar *dev,
- const gchar *str,
- gint *vol_count,
- void *error);
-G_GNUC_INTERNAL void libhal_free_string_array (gchar **volumes);
-G_GNUC_INTERNAL gboolean libhal_device_property_exists (LibHalContext *hal_ctx,
- const gchar *vol,
- const gchar *prop,
- void *error);
-G_GNUC_INTERNAL gboolean libhal_device_get_property_bool (LibHalContext *hal_ctx,
- const gchar *vol,
- const gchar *prop,
- void *error);
-G_GNUC_INTERNAL void libhal_ctx_shutdown (LibHalContext *hal_ctx, void *error);
-G_GNUC_INTERNAL void libhal_ctx_free (LibHalContext *hal_ctx);
-#endif
-
-
-#endif /* HAL_COMMON_H */