aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-10-02 16:52:26 +0200
committerMax Kellermann <max@duempel.org>2008-10-02 16:52:26 +0200
commit93c2a816ea59500f2bd5b800a54dc8add796ae7d (patch)
tree66399123e3e6fd8b4f3c75241b0c79c8aeded76c
parent75fa0c73ee4ee2648f587e2eb852316061fc1053 (diff)
downloadmpd-93c2a816ea59500f2bd5b800a54dc8add796ae7d.tar.gz
mpd-93c2a816ea59500f2bd5b800a54dc8add796ae7d.tar.xz
mpd-93c2a816ea59500f2bd5b800a54dc8add796ae7d.zip
removed the deprecated easy_download library
This library isn't being used anymore, delete it.
-rw-r--r--src/easy_download.c90
-rw-r--r--src/easy_download.h31
2 files changed, 0 insertions, 121 deletions
diff --git a/src/easy_download.c b/src/easy_download.c
deleted file mode 100644
index 1dff510a5..000000000
--- a/src/easy_download.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/* by Qball
- *
- * This program 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.
- *
- * 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 Public License for more details.
- *
- * You should have received a copy of the GNU 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.
- */
-
-#include "ncmpc.h"
-
-#ifdef ENABLE_LYRICS_SCREEN
-#include "easy_download.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <glib.h>
-
-#include <curl/curl.h>
-
-static size_t write_data(void *buffer, size_t size,
- size_t nmemb, void *data)
-{
- easy_download_struct *dld = data;
-
- if(dld->data == NULL)
- {
- dld->size = 0;
- }
- dld->data = g_realloc(dld->data,(gulong)(size*nmemb+dld->size));
-
- memset(&(dld->data)[dld->size], '\0', (size*nmemb));
- memcpy(&(dld->data)[dld->size], buffer, size*nmemb);
-
- dld->size += size*nmemb;
- if(dld->size >= dld->max_size && dld->max_size > 0)
- {
- return 0;
- }
- return size*nmemb;
-}
-
-int easy_download(char *url,easy_download_struct *dld,
- curl_progress_callback cb)
-{
- CURL *curl = NULL;
- int res;
- if(!dld) return 0;
- easy_download_clean(dld);
- /* initialize curl */
- curl = curl_easy_init();
- if(!curl) return 0;
- /* set uri */
- curl_easy_setopt(curl, CURLOPT_URL, url);
- /* set callback data */
- curl_easy_setopt(curl, CURLOPT_WRITEDATA, dld);
- /* set callback function */
- curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data);
- curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0);
- curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, cb);
- /* run */
- res = curl_easy_perform(curl);
- /* cleanup */
- curl_easy_cleanup(curl);
- if(!res)
- {
- return 1;
- }
- if(dld->data) g_free(dld->data);
- return 0;
-}
-
-void easy_download_clean(easy_download_struct *dld)
-{
- if(dld->data)g_free(dld->data);
- dld->data = NULL;
- dld->size = 0;
- dld->max_size = -1;
-}
-
-#endif
diff --git a/src/easy_download.h b/src/easy_download.h
deleted file mode 100644
index 92dc22e9e..000000000
--- a/src/easy_download.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * by Qball
- *
- * This program 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.
- *
- * 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 Public License for more details.
- *
- * You should have received a copy of the GNU 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.
- */
-
-#include <curl/curl.h>
-
-typedef struct _easy_download_struct{
- char *data;
- int size;
- int max_size;
-
-}easy_download_struct;
-
-
-int easy_download(char *url,easy_download_struct *dld,
- curl_progress_callback cb);
-void easy_download_clean(easy_download_struct *dld);