annotate src/curl/curl.c @ 625:fdae06cbebc9 trunk

[svn] - set CURLOPT_FOLLOWLOCATION to true, closes #771.
author nenolod
date Fri, 09 Feb 2007 19:38:32 -0800
parents cd730d42b2bd
children 88d78a61a9fb
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
1 /* Audacious
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
2 * Copyright (c) 2007 Daniel Barkalow
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
3 *
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
4 * This program is free software; you can redistribute it and/or modify
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
5 * it under the terms of the GNU General Public License as published by
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
6 * the Free Software Foundation; either version 2 of the License, or
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
7 * (at your option) any later version.
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
8 *
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
9 * This program is distributed in the hope that it will be useful,
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
12 * GNU General Public License for more details.
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
13 *
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
14 * You should have received a copy of the GNU General Public License
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
15 * along with this program; if not, write to the Free Software
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
16 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
17 */
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
18
556
cd730d42b2bd [svn] - User-Agent: Audacious/$version (curl transport)
nenolod
parents: 543
diff changeset
19 #ifdef HAVE_CONFIG_H
cd730d42b2bd [svn] - User-Agent: Audacious/$version (curl transport)
nenolod
parents: 543
diff changeset
20 # include "config.h"
cd730d42b2bd [svn] - User-Agent: Audacious/$version (curl transport)
nenolod
parents: 543
diff changeset
21 #endif
cd730d42b2bd [svn] - User-Agent: Audacious/$version (curl transport)
nenolod
parents: 543
diff changeset
22
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
23 #include <audacious/vfs.h>
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
24 #include <audacious/plugin.h>
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
25
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
26 #include <curl/curl.h>
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
27
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
28 #include <string.h>
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
29
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
30 #define BUFFER_SIZE 256 * 1024
460
cc7faecc7619 [svn] Time out curl connections eventually, and don't retry them on the same VFSFile.
iabervon
parents: 430
diff changeset
31 #define REVERSE_SEEK_SIZE 2048
cc7faecc7619 [svn] Time out curl connections eventually, and don't retry them on the same VFSFile.
iabervon
parents: 430
diff changeset
32
519
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
33 #define DEBUG_CONNECTION 0
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
34 #define DEBUG_OPEN_CLOSE 0
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
35 #define DEBUG_SEEK 0
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
36 #define DEBUG_READ 0
465
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
37 #define DEBUG_HEADERS 0
466
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
38 #define DEBUG_ICY 0
519
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
39 #define DEBUG_ICY_WRAP 0
466
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
40 #define DEBUG_ICY_VERBOSE 0
485
c257bcf92d90 [svn] - turn debugging back off
nenolod
parents: 483
diff changeset
41 #define DEBUG_METADATA_REPORT 0
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
42
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
43 typedef struct _CurlHandle CurlHandle;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
44
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
45 struct _CurlHandle {
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
46 CURL *curl;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
47
430
ed94145472df [svn] Support shoutcast (over TCP) with VFS HTTP code. mpg123 has to accept
iabervon
parents: 428
diff changeset
48 gssize length; // the length of the file
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
49 gsize rd_abs; // the absolute position for reading from the stream
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
50 gsize wr_abs; // the absolute position where the input connection is
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
51
466
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
52 gsize icy_left;
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
53 gsize icy_interval;
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
54 gint in_icy_meta; // 0=no, 1=before size, 2=in data
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
55 gsize meta_abs; // the absolute position where the metadata changes
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
56
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
57 gsize buffer_length;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
58 gchar *buffer;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
59
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
60 gsize rd_index;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
61 gsize wr_index;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
62
465
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
63 gsize hdr_index;
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
64
510
48e9efba7eb0 [svn] - written ungetc for curl vfs plugin (works along with getc, fread, ftell, feof, fseek)
giacomo
parents: 507
diff changeset
65 GSList *stream_stack; // stack for stream functions (getc, ungetc)
48e9efba7eb0 [svn] - written ungetc for curl vfs plugin (works along with getc, fread, ftell, feof, fseek)
giacomo
parents: 507
diff changeset
66
465
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
67 gboolean header; // true if we haven't finished the header yet
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
68 gboolean no_data; // true if we're only looking for length currently
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
69 gboolean cancel; // true if the thread should be cancelled
460
cc7faecc7619 [svn] Time out curl connections eventually, and don't retry them on the same VFSFile.
iabervon
parents: 430
diff changeset
70 gboolean failed; // true if we've tried and failed already
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
71 GThread *thread; // the thread that's reading from the connection
465
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
72
543
282bede45eef [svn] Support for writing downloaded data to a file (no UI provided yet).
iabervon
parents: 534
diff changeset
73 VFSFile *download; // file to write to as we download
282bede45eef [svn] Support for writing downloaded data to a file (no UI provided yet).
iabervon
parents: 534
diff changeset
74
465
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
75 gchar *name;
466
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
76 gchar *title;
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
77 };
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
78
483
1b48e9ce21e1 [svn] Set file->base
hansmi
parents: 482
diff changeset
79 VFSConstructor curl_const;
1b48e9ce21e1 [svn] Set file->base
hansmi
parents: 482
diff changeset
80
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
81 /* TODO:
430
ed94145472df [svn] Support shoutcast (over TCP) with VFS HTTP code. mpg123 has to accept
iabervon
parents: 428
diff changeset
82 * - Fix hang if the server closes the connection in the middle
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
83 * - Clever buffer stuff when you read a bit of the beginning and a bit of the
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
84 * end of a file
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
85 */
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
86
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
87 /* The goal here is to have a buffering system which handles the following:
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
88 * 1) open, seek, read (without fetching the beginning of the file)
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
89 * 2) open, seek END, tell (using HEAD only)
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
90 * 3) open, read, seek 0, read (without restarting fetch)
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
91 */
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
92
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
93 static size_t buf_space(CurlHandle *handle)
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
94 {
460
cc7faecc7619 [svn] Time out curl connections eventually, and don't retry them on the same VFSFile.
iabervon
parents: 430
diff changeset
95 size_t rd_edge = handle->rd_abs - REVERSE_SEEK_SIZE;
466
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
96 size_t buffer_limit;
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
97 size_t cont_limit;
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
98 if (rd_edge < 0)
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
99 rd_edge = 0;
466
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
100 buffer_limit = handle->buffer_length -
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
101 (handle->wr_abs - rd_edge);
466
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
102 cont_limit = handle->buffer_length - handle->wr_index;
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
103 if (cont_limit < buffer_limit)
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
104 buffer_limit = cont_limit;
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
105 if (handle->icy_interval)
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
106 {
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
107 if (handle->icy_left < buffer_limit)
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
108 buffer_limit = handle->icy_left;
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
109 }
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
110 return buffer_limit;
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
111 }
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
112
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
113 static size_t buf_available(CurlHandle *handle)
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
114 {
465
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
115 size_t buffer_limit;
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
116 size_t cont_limit;
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
117 if (handle->header)
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
118 return 0;
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
119 buffer_limit = handle->wr_abs - handle->rd_abs;
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
120 cont_limit = handle->buffer_length - handle->rd_index;
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
121 if (buffer_limit <= 0)
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
122 return 0;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
123 return buffer_limit < cont_limit ? buffer_limit : cont_limit;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
124 }
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
125
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
126 static void check(CurlHandle *handle)
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
127 {
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
128 if (!((handle->wr_abs - handle->wr_index) % handle->buffer_length ==
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
129 (handle->rd_abs - handle->rd_index) % handle->buffer_length))
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
130 printf("%p Not aligned! wr %d rd %d\n", handle,
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
131 (handle->wr_abs - handle->wr_index) % handle->buffer_length,
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
132 (handle->rd_abs - handle->rd_index) % handle->buffer_length);
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
133 }
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
134
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
135 static void update_length(CurlHandle *handle)
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
136 {
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
137 if (handle->length == -1)
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
138 {
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
139 double value;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
140 int retcode =
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
141 curl_easy_getinfo(handle->curl, CURLINFO_CONTENT_LENGTH_DOWNLOAD,
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
142 &value);
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
143 if (retcode == CURLE_OK)
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
144 {
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
145 handle->length = value;
430
ed94145472df [svn] Support shoutcast (over TCP) with VFS HTTP code. mpg123 has to accept
iabervon
parents: 428
diff changeset
146 if (handle->length == 0)
ed94145472df [svn] Support shoutcast (over TCP) with VFS HTTP code. mpg123 has to accept
iabervon
parents: 428
diff changeset
147 handle->length = -2;
ed94145472df [svn] Support shoutcast (over TCP) with VFS HTTP code. mpg123 has to accept
iabervon
parents: 428
diff changeset
148 //g_print("Length: %d\n", handle->length);
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
149 }
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
150 else
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
151 {
430
ed94145472df [svn] Support shoutcast (over TCP) with VFS HTTP code. mpg123 has to accept
iabervon
parents: 428
diff changeset
152 handle->length = -2;
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
153 g_print("getinfo gave error\n");
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
154 }
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
155 }
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
156 }
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
157
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
158 #define PROBE 262140
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
159
534
c00fd2a0736f [svn] - support ice-name: icecast2 header
nenolod
parents: 521
diff changeset
160 #define ICE_NAME "ice-name:"
465
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
161 #define ICY_NAME "icy-name:"
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
162 #define ICY_METAINT "icy-metaint:"
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
163
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
164 static gboolean match_header(CurlHandle *handle, size_t size,
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
165 const char *header)
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
166 {
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
167 if (strlen(header) > size)
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
168 return FALSE;
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
169 // XXXX wrapped headers
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
170 return !(strncmp(handle->buffer + handle->hdr_index,
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
171 header, strlen(header)));
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
172 }
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
173
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
174 static gchar *get_value(CurlHandle *handle, size_t size, const char *header)
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
175 {
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
176 // XXXX wrapped headers
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
177 return strdup(handle->buffer +
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
178 (handle->hdr_index + strlen(header)) % handle->buffer_length);
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
179 }
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
180
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
181 static void got_header(CurlHandle *handle, size_t size)
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
182 {
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
183 if (DEBUG_HEADERS)
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
184 g_print("Got header %d bytes\n", size);
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
185 if (match_header(handle, size, ICY_NAME))
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
186 {
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
187 handle->name = get_value(handle, size, ICY_NAME);
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
188 if (DEBUG_HEADERS)
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
189 {
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
190 g_print("Stream name: %s\n", handle->name);
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
191 }
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
192 }
534
c00fd2a0736f [svn] - support ice-name: icecast2 header
nenolod
parents: 521
diff changeset
193 if (match_header(handle, size, ICE_NAME))
c00fd2a0736f [svn] - support ice-name: icecast2 header
nenolod
parents: 521
diff changeset
194 {
c00fd2a0736f [svn] - support ice-name: icecast2 header
nenolod
parents: 521
diff changeset
195 handle->name = get_value(handle, size, ICE_NAME);
c00fd2a0736f [svn] - support ice-name: icecast2 header
nenolod
parents: 521
diff changeset
196 if (DEBUG_HEADERS)
c00fd2a0736f [svn] - support ice-name: icecast2 header
nenolod
parents: 521
diff changeset
197 {
c00fd2a0736f [svn] - support ice-name: icecast2 header
nenolod
parents: 521
diff changeset
198 g_print("Stream name: %s\n", handle->name);
c00fd2a0736f [svn] - support ice-name: icecast2 header
nenolod
parents: 521
diff changeset
199 }
c00fd2a0736f [svn] - support ice-name: icecast2 header
nenolod
parents: 521
diff changeset
200 }
465
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
201 if (match_header(handle, size, ICY_METAINT))
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
202 {
466
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
203 gchar *value = get_value(handle, size, ICY_METAINT);
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
204 handle->icy_interval = atoi(value);
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
205 free(value);
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
206 if (DEBUG_HEADERS)
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
207 g_print("Metadata interval: %d\n", handle->icy_interval);
465
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
208 }
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
209 }
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
210
466
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
211 #define TITLE_INLINE "StreamTitle="
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
212
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
213 static gboolean match_inline(CurlHandle *handle, size_t posn,
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
214 const char *name)
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
215 {
519
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
216 size_t len = strlen(name);
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
217 size_t i;
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
218 if (DEBUG_ICY_WRAP)
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
219 g_print("Posn=%d\n", posn);
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
220 if (DEBUG_ICY_WRAP && posn + len > handle->buffer_length)
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
221 g_print("Wrapped inline key\n");
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
222 if (((handle->wr_index - posn + handle->buffer_length) %
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
223 handle->buffer_length) <= len)
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
224 return FALSE;
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
225 for (i = 0; i < len; i++)
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
226 if (handle->buffer[(posn + i) % handle->buffer_length] != name[i])
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
227 {
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
228 return FALSE;
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
229 }
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
230 return TRUE;
466
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
231 }
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
232
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
233 static gchar *get_inline_value(CurlHandle *handle, size_t posn,
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
234 const char *name)
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
235 {
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
236 size_t end;
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
237 size_t sz;
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
238 gchar *ret;
519
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
239 posn = (posn + strlen(name) + 1) % handle->buffer_length;
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
240 end = posn;
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
241 while (handle->buffer[end % handle->buffer_length] != ';')
466
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
242 end++;
519
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
243 sz = (end - posn + handle->buffer_length) % handle->buffer_length;
466
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
244 ret = g_malloc(sz);
519
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
245 if (end % handle->buffer_length < posn % handle->buffer_length)
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
246 {
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
247 size_t prewrap = handle->buffer_length - posn;
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
248 memcpy(ret, handle->buffer + posn, prewrap);
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
249 memcpy(ret + prewrap, handle->buffer, sz - prewrap);
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
250 if (DEBUG_ICY_WRAP)
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
251 g_print("Wrapped inline metadata value\n");
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
252 }
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
253 else
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
254 {
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
255 memcpy(ret, handle->buffer + posn, sz);
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
256 }
466
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
257 ret[sz - 1] = '\0';
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
258 return ret;
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
259 }
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
260
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
261 static void got_inline_metadata(CurlHandle *handle)
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
262 {
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
263 size_t i = (handle->hdr_index + 1) % handle->buffer_length;
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
264 if (match_inline(handle, i, TITLE_INLINE))
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
265 {
519
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
266 if (handle->title)
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
267 free(handle->title);
466
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
268 handle->title = get_inline_value(handle, i, TITLE_INLINE);
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
269 if (DEBUG_ICY)
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
270 g_print("Title: '%s'\n", handle->title);
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
271 }
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
272 handle->meta_abs = handle->wr_abs;
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
273 }
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
274
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
275 static size_t curl_writecb(void *ptr, size_t size, size_t nmemb, void *stream)
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
276 {
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
277 CurlHandle *handle = stream;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
278 gint sz = size * nmemb;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
279 gint ret = 0;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
280 gint trans;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
281
465
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
282 if (!handle->header)
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
283 update_length(handle);
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
284
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
285 while (ret < sz)
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
286 {
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
287 while (!(trans = buf_space(handle)) && !handle->cancel)
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
288 {
543
282bede45eef [svn] Support for writing downloaded data to a file (no UI provided yet).
iabervon
parents: 534
diff changeset
289 //g_print("Wait for free space on %p\n", handle);
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
290 g_usleep(10000);
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
291 }
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
292 if (handle->cancel)
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
293 break;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
294 if (trans > sz - ret)
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
295 trans = sz - ret;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
296 memcpy(handle->buffer + handle->wr_index, ptr + ret, trans);
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
297
465
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
298 if (!handle->header)
466
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
299 {
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
300 if (handle->icy_interval)
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
301 handle->icy_left -= trans;
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
302 if (!handle->in_icy_meta)
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
303 {
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
304 handle->wr_abs += trans;
543
282bede45eef [svn] Support for writing downloaded data to a file (no UI provided yet).
iabervon
parents: 534
diff changeset
305 if (handle->download)
282bede45eef [svn] Support for writing downloaded data to a file (no UI provided yet).
iabervon
parents: 534
diff changeset
306 {
282bede45eef [svn] Support for writing downloaded data to a file (no UI provided yet).
iabervon
parents: 534
diff changeset
307 vfs_fwrite(ptr + ret, trans, 1, handle->download);
282bede45eef [svn] Support for writing downloaded data to a file (no UI provided yet).
iabervon
parents: 534
diff changeset
308 }
466
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
309 if (handle->icy_interval && !handle->icy_left)
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
310 {
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
311 if (DEBUG_ICY)
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
312 g_print("Metadata inline after %d\n", handle->wr_abs);
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
313 handle->in_icy_meta = 1;
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
314 handle->icy_left = 1;
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
315 }
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
316 }
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
317 else if (handle->in_icy_meta == 1)
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
318 {
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
319 // Track where the header insert starts
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
320 handle->hdr_index = handle->wr_index;
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
321 handle->icy_left =
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
322 ((unsigned char)(handle->buffer[handle->wr_index])) * 16;
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
323 if (DEBUG_ICY)
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
324 g_print("Metadata of size %d\n", handle->icy_left);
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
325 if (handle->icy_left)
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
326 {
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
327 handle->in_icy_meta = 2;
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
328 }
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
329 else
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
330 {
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
331 handle->in_icy_meta = 0;
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
332 handle->icy_left = handle->icy_interval;
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
333 handle->wr_index--;
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
334 }
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
335 }
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
336 else
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
337 {
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
338 if (!handle->icy_left)
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
339 {
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
340 handle->wr_index = (handle->wr_index + trans) %
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
341 handle->buffer_length;
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
342 if (DEBUG_ICY_VERBOSE)
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
343 {
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
344 if (handle->wr_index < handle->hdr_index)
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
345 {
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
346 // wrapped
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
347 fwrite(handle->buffer + handle->hdr_index + 1,
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
348 handle->buffer_length - handle->hdr_index - 1,
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
349 1, stdout);
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
350 fwrite(handle->buffer, handle->wr_index, 1, stdout);
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
351 }
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
352 else
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
353 {
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
354 fwrite(handle->buffer + handle->hdr_index,
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
355 handle->wr_index - handle->hdr_index, 1,
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
356 stdout);
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
357 }
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
358 g_print("\n");
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
359 }
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
360 got_inline_metadata(handle);
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
361
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
362 // Rewind the buffer usage to write over the
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
363 // metadata with content. -trans because we're about
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
364 // to add it.
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
365 handle->wr_index = handle->hdr_index - trans;
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
366 handle->in_icy_meta = 0;
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
367 handle->icy_left = handle->icy_interval;
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
368 }
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
369 }
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
370 }
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
371 handle->wr_index = (handle->wr_index + trans) % handle->buffer_length;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
372 ret += trans;
465
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
373
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
374 if (handle->header)
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
375 {
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
376 gsize i = handle->hdr_index;
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
377 while (1)
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
378 {
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
379 if ((i + 1) % handle->buffer_length == handle->wr_index)
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
380 break;
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
381 if (handle->buffer[i] == '\r' &&
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
382 handle->buffer[(i + 1) % handle->buffer_length] == '\n')
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
383 {
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
384 gsize size = (handle->buffer_length + i -
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
385 handle->hdr_index) % handle->buffer_length;
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
386 handle->buffer[i] = '\0';
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
387 got_header(handle, size);
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
388 if (i == handle->hdr_index)
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
389 {
543
282bede45eef [svn] Support for writing downloaded data to a file (no UI provided yet).
iabervon
parents: 534
diff changeset
390 size_t leftover;
465
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
391 // Empty header means the end of the headers
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
392 handle->header = 0;
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
393 handle->hdr_index = (i + 2) % handle->buffer_length;
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
394 // We read from the start of the data in the request
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
395 handle->rd_index = handle->hdr_index;
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
396 // We've already written the amount that's after
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
397 // the header.
543
282bede45eef [svn] Support for writing downloaded data to a file (no UI provided yet).
iabervon
parents: 534
diff changeset
398 leftover = (handle->wr_index - handle->hdr_index + handle->buffer_length) % handle->buffer_length;
282bede45eef [svn] Support for writing downloaded data to a file (no UI provided yet).
iabervon
parents: 534
diff changeset
399 handle->wr_abs += leftover;
282bede45eef [svn] Support for writing downloaded data to a file (no UI provided yet).
iabervon
parents: 534
diff changeset
400 if (handle->download)
282bede45eef [svn] Support for writing downloaded data to a file (no UI provided yet).
iabervon
parents: 534
diff changeset
401 {
282bede45eef [svn] Support for writing downloaded data to a file (no UI provided yet).
iabervon
parents: 534
diff changeset
402 // the data which has to go into the
282bede45eef [svn] Support for writing downloaded data to a file (no UI provided yet).
iabervon
parents: 534
diff changeset
403 // beginning of the file must be at the end
282bede45eef [svn] Support for writing downloaded data to a file (no UI provided yet).
iabervon
parents: 534
diff changeset
404 // of the input that we've dealt with.
282bede45eef [svn] Support for writing downloaded data to a file (no UI provided yet).
iabervon
parents: 534
diff changeset
405 vfs_fwrite(ptr + ret - leftover, leftover, 1,
282bede45eef [svn] Support for writing downloaded data to a file (no UI provided yet).
iabervon
parents: 534
diff changeset
406 handle->download);
282bede45eef [svn] Support for writing downloaded data to a file (no UI provided yet).
iabervon
parents: 534
diff changeset
407 }
466
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
408 handle->icy_left = handle->icy_interval;
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
409 if (handle->icy_interval)
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
410 {
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
411 handle->icy_left -=
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
412 (handle->wr_index - handle->hdr_index + handle->buffer_length) % handle->buffer_length;
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
413 }
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
414 if (DEBUG_ICY)
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
415 g_print("Left %d\n", handle->icy_left);
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
416 handle->in_icy_meta = 0;
465
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
417 break;
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
418 }
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
419 handle->hdr_index = (i + 2) % handle->buffer_length;
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
420 }
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
421 i = (i + 1) % handle->buffer_length;
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
422 }
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
423 }
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
424 }
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
425 return ret;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
426 }
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
427
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
428 static gpointer
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
429 curl_manage_request(gpointer arg)
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
430 {
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
431 CurlHandle *handle = arg;
430
ed94145472df [svn] Support shoutcast (over TCP) with VFS HTTP code. mpg123 has to accept
iabervon
parents: 428
diff changeset
432 CURLcode result;
460
cc7faecc7619 [svn] Time out curl connections eventually, and don't retry them on the same VFSFile.
iabervon
parents: 430
diff changeset
433 if (DEBUG_CONNECTION)
cc7faecc7619 [svn] Time out curl connections eventually, and don't retry them on the same VFSFile.
iabervon
parents: 430
diff changeset
434 g_print("Connect %p\n", handle);
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
435
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
436 if (handle->no_data)
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
437 curl_easy_setopt(handle->curl, CURLOPT_NOBODY, 1);
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
438 else
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
439 {
460
cc7faecc7619 [svn] Time out curl connections eventually, and don't retry them on the same VFSFile.
iabervon
parents: 430
diff changeset
440 if (DEBUG_CONNECTION)
cc7faecc7619 [svn] Time out curl connections eventually, and don't retry them on the same VFSFile.
iabervon
parents: 430
diff changeset
441 g_print("Start from %d\n", handle->wr_abs);
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
442 curl_easy_setopt(handle->curl, CURLOPT_RESUME_FROM, handle->wr_abs);
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
443
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
444 curl_easy_setopt(handle->curl, CURLOPT_NOBODY, 0);
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
445 curl_easy_setopt(handle->curl, CURLOPT_HTTPGET, 1);
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
446 }
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
447
465
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
448 handle->header = 1;
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
449 handle->hdr_index = 0;
466
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
450 handle->icy_interval = 0;
465
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
451
430
ed94145472df [svn] Support shoutcast (over TCP) with VFS HTTP code. mpg123 has to accept
iabervon
parents: 428
diff changeset
452 result = curl_easy_perform(handle->curl);
ed94145472df [svn] Support shoutcast (over TCP) with VFS HTTP code. mpg123 has to accept
iabervon
parents: 428
diff changeset
453 if (result == CURLE_OK)
ed94145472df [svn] Support shoutcast (over TCP) with VFS HTTP code. mpg123 has to accept
iabervon
parents: 428
diff changeset
454 update_length(handle);
460
cc7faecc7619 [svn] Time out curl connections eventually, and don't retry them on the same VFSFile.
iabervon
parents: 430
diff changeset
455 // We expect to get CURLE_WRITE_ERROR if we cancel.
cc7faecc7619 [svn] Time out curl connections eventually, and don't retry them on the same VFSFile.
iabervon
parents: 430
diff changeset
456 // We get CURLE_GOT_NOTHING if we send a HEAD request to a shoutcast server.
465
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
457 // We get CURLE_HTTP_RANGE_ERROR if we try to use range with shoutcast.
460
cc7faecc7619 [svn] Time out curl connections eventually, and don't retry them on the same VFSFile.
iabervon
parents: 430
diff changeset
458 if (result != CURLE_OK && result != CURLE_WRITE_ERROR &&
519
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
459 result != CURLE_GOT_NOTHING && result != CURLE_HTTP_RANGE_ERROR &&
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
460 result != CURLE_PARTIAL_FILE)
430
ed94145472df [svn] Support shoutcast (over TCP) with VFS HTTP code. mpg123 has to accept
iabervon
parents: 428
diff changeset
461 {
ed94145472df [svn] Support shoutcast (over TCP) with VFS HTTP code. mpg123 has to accept
iabervon
parents: 428
diff changeset
462 g_print("Got curl error %d\n", result);
460
cc7faecc7619 [svn] Time out curl connections eventually, and don't retry them on the same VFSFile.
iabervon
parents: 430
diff changeset
463 handle->failed = 1;
430
ed94145472df [svn] Support shoutcast (over TCP) with VFS HTTP code. mpg123 has to accept
iabervon
parents: 428
diff changeset
464 }
460
cc7faecc7619 [svn] Time out curl connections eventually, and don't retry them on the same VFSFile.
iabervon
parents: 430
diff changeset
465 if (DEBUG_CONNECTION)
cc7faecc7619 [svn] Time out curl connections eventually, and don't retry them on the same VFSFile.
iabervon
parents: 430
diff changeset
466 g_print("Done %p%s", handle, handle->cancel ? " (aborted)\n" : "\n");
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
467 handle->cancel = 1;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
468 return NULL;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
469 }
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
470
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
471 static void curl_req_xfer(CurlHandle *handle)
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
472 {
460
cc7faecc7619 [svn] Time out curl connections eventually, and don't retry them on the same VFSFile.
iabervon
parents: 430
diff changeset
473 if (handle->failed)
cc7faecc7619 [svn] Time out curl connections eventually, and don't retry them on the same VFSFile.
iabervon
parents: 430
diff changeset
474 {
cc7faecc7619 [svn] Time out curl connections eventually, and don't retry them on the same VFSFile.
iabervon
parents: 430
diff changeset
475 handle->cancel = 1;
cc7faecc7619 [svn] Time out curl connections eventually, and don't retry them on the same VFSFile.
iabervon
parents: 430
diff changeset
476 return;
cc7faecc7619 [svn] Time out curl connections eventually, and don't retry them on the same VFSFile.
iabervon
parents: 430
diff changeset
477 }
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
478 if (!handle->thread)
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
479 {
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
480 handle->cancel = 0;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
481 handle->wr_index = 0;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
482 handle->rd_index = 0;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
483 handle->wr_abs = handle->rd_abs;
460
cc7faecc7619 [svn] Time out curl connections eventually, and don't retry them on the same VFSFile.
iabervon
parents: 430
diff changeset
484 if (DEBUG_CONNECTION)
cc7faecc7619 [svn] Time out curl connections eventually, and don't retry them on the same VFSFile.
iabervon
parents: 430
diff changeset
485 g_print("Starting connection %p at %d\n", handle, handle->wr_abs);
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
486 handle->thread = g_thread_create(curl_manage_request, handle,
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
487 TRUE, NULL);
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
488 }
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
489 }
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
490
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
491 static void curl_req_sync_xfer(CurlHandle *handle, size_t old_rd_abs)
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
492 {
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
493 handle->rd_index = (handle->rd_index + handle->rd_abs - old_rd_abs +
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
494 handle->buffer_length) % handle->buffer_length;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
495 }
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
496
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
497 static void curl_req_no_xfer(CurlHandle *handle)
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
498 {
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
499 if (handle->thread)
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
500 {
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
501 handle->cancel = 1;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
502 g_thread_join(handle->thread);
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
503 handle->thread = NULL;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
504 handle->cancel = 0;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
505 }
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
506 }
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
507
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
508 VFSFile *
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
509 curl_vfs_fopen_impl(const gchar * path,
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
510 const gchar * mode)
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
511 {
519
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
512 gchar *url;
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
513 CurlHandle *handle;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
514 VFSFile *file;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
515 if (!path || !mode)
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
516 return NULL;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
517
519
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
518 url = g_strdup(path);
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
519
473
e1e98289c1ab [svn] - use g_new0
nenolod
parents: 469
diff changeset
520 file = g_new0(VFSFile, 1);
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
521
473
e1e98289c1ab [svn] - use g_new0
nenolod
parents: 469
diff changeset
522 handle = g_new0(CurlHandle, 1);
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
523 handle->curl = curl_easy_init();
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
524 handle->rd_index = 0;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
525 handle->wr_index = 0;
466
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
526 handle->meta_abs = 0;
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
527 handle->rd_abs = 0;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
528 handle->wr_abs = 0;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
529 handle->buffer_length = BUFFER_SIZE;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
530 handle->buffer = g_malloc(handle->buffer_length);
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
531 handle->thread = NULL;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
532 handle->length = -1;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
533 handle->cancel = 0;
460
cc7faecc7619 [svn] Time out curl connections eventually, and don't retry them on the same VFSFile.
iabervon
parents: 430
diff changeset
534 handle->failed = 0;
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
535 handle->no_data = 0;
510
48e9efba7eb0 [svn] - written ungetc for curl vfs plugin (works along with getc, fread, ftell, feof, fseek)
giacomo
parents: 507
diff changeset
536 handle->stream_stack = NULL;
465
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
537
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
538 curl_easy_setopt(handle->curl, CURLOPT_URL, url);
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
539 curl_easy_setopt(handle->curl, CURLOPT_WRITEFUNCTION, curl_writecb);
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
540 curl_easy_setopt(handle->curl, CURLOPT_WRITEDATA, handle);
465
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
541 curl_easy_setopt(handle->curl, CURLOPT_HEADERDATA, handle);
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
542
460
cc7faecc7619 [svn] Time out curl connections eventually, and don't retry them on the same VFSFile.
iabervon
parents: 430
diff changeset
543 curl_easy_setopt(handle->curl, CURLOPT_CONNECTTIMEOUT, 10);
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
544
519
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
545 curl_easy_setopt(handle->curl, CURLOPT_SSL_VERIFYPEER, 0);
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
546 curl_easy_setopt(handle->curl, CURLOPT_SSL_VERIFYHOST, 0);
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
547
625
fdae06cbebc9 [svn] - set CURLOPT_FOLLOWLOCATION to true, closes #771.
nenolod
parents: 556
diff changeset
548 curl_easy_setopt(handle->curl, CURLOPT_FOLLOWLOCATION, 1);
fdae06cbebc9 [svn] - set CURLOPT_FOLLOWLOCATION to true, closes #771.
nenolod
parents: 556
diff changeset
549
466
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
550 {
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
551 struct curl_slist *hdr = NULL;
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
552 hdr = curl_slist_append(hdr, "icy-metadata:1");
556
cd730d42b2bd [svn] - User-Agent: Audacious/$version (curl transport)
nenolod
parents: 543
diff changeset
553 hdr = curl_slist_append(hdr, "User-Agent: Audacious/" VERSION " (curl transport)");
466
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
554 curl_easy_setopt(handle->curl, CURLOPT_HTTPHEADER, hdr);
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
555 }
465
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
556
543
282bede45eef [svn] Support for writing downloaded data to a file (no UI provided yet).
iabervon
parents: 534
diff changeset
557 //handle->download = vfs_fopen(FILENAME, "wb");
282bede45eef [svn] Support for writing downloaded data to a file (no UI provided yet).
iabervon
parents: 534
diff changeset
558
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
559 file->handle = handle;
483
1b48e9ce21e1 [svn] Set file->base
hansmi
parents: 482
diff changeset
560 file->base = &curl_const;
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
561
460
cc7faecc7619 [svn] Time out curl connections eventually, and don't retry them on the same VFSFile.
iabervon
parents: 430
diff changeset
562 if (DEBUG_OPEN_CLOSE)
cc7faecc7619 [svn] Time out curl connections eventually, and don't retry them on the same VFSFile.
iabervon
parents: 430
diff changeset
563 g_print("Open %s with curl => %p\n", url, handle);
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
564
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
565 return file;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
566 }
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
567
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
568 gint
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
569 curl_vfs_fclose_impl(VFSFile * file)
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
570 {
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
571 gint ret = 0;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
572 if (file == NULL)
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
573 return -1;
460
cc7faecc7619 [svn] Time out curl connections eventually, and don't retry them on the same VFSFile.
iabervon
parents: 430
diff changeset
574 if (DEBUG_OPEN_CLOSE)
cc7faecc7619 [svn] Time out curl connections eventually, and don't retry them on the same VFSFile.
iabervon
parents: 430
diff changeset
575 g_print("Close %p\n", file->handle);
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
576 if (file->handle)
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
577 {
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
578 CurlHandle *handle = file->handle;
460
cc7faecc7619 [svn] Time out curl connections eventually, and don't retry them on the same VFSFile.
iabervon
parents: 430
diff changeset
579 if (DEBUG_CONNECTION)
cc7faecc7619 [svn] Time out curl connections eventually, and don't retry them on the same VFSFile.
iabervon
parents: 430
diff changeset
580 g_print("Cancel transfer\n");
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
581 curl_req_no_xfer(handle);
460
cc7faecc7619 [svn] Time out curl connections eventually, and don't retry them on the same VFSFile.
iabervon
parents: 430
diff changeset
582 if (DEBUG_CONNECTION)
cc7faecc7619 [svn] Time out curl connections eventually, and don't retry them on the same VFSFile.
iabervon
parents: 430
diff changeset
583 g_print("Okay\n");
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
584
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
585 g_free(handle->buffer);
465
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
586 if (handle->name)
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
587 g_free(handle->name);
510
48e9efba7eb0 [svn] - written ungetc for curl vfs plugin (works along with getc, fread, ftell, feof, fseek)
giacomo
parents: 507
diff changeset
588 if (handle->stream_stack != NULL)
48e9efba7eb0 [svn] - written ungetc for curl vfs plugin (works along with getc, fread, ftell, feof, fseek)
giacomo
parents: 507
diff changeset
589 g_slist_free(handle->stream_stack);
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
590 curl_easy_cleanup(handle->curl);
543
282bede45eef [svn] Support for writing downloaded data to a file (no UI provided yet).
iabervon
parents: 534
diff changeset
591
282bede45eef [svn] Support for writing downloaded data to a file (no UI provided yet).
iabervon
parents: 534
diff changeset
592 if (handle->download)
282bede45eef [svn] Support for writing downloaded data to a file (no UI provided yet).
iabervon
parents: 534
diff changeset
593 {
282bede45eef [svn] Support for writing downloaded data to a file (no UI provided yet).
iabervon
parents: 534
diff changeset
594 vfs_fclose(handle->download);
282bede45eef [svn] Support for writing downloaded data to a file (no UI provided yet).
iabervon
parents: 534
diff changeset
595 }
282bede45eef [svn] Support for writing downloaded data to a file (no UI provided yet).
iabervon
parents: 534
diff changeset
596
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
597 g_free(handle);
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
598 }
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
599 return ret;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
600 }
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
601
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
602 size_t
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
603 curl_vfs_fread_impl(gpointer ptr,
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
604 size_t size,
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
605 size_t nmemb,
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
606 VFSFile * file)
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
607 {
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
608 CurlHandle *handle = file->handle;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
609 ssize_t sz = size * nmemb;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
610 size_t ret = 0;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
611
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
612 if (sz < 0)
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
613 return 0;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
614
534
c00fd2a0736f [svn] - support ice-name: icecast2 header
nenolod
parents: 521
diff changeset
615 // g_print("Reading %d*%d=%d from %p\n", size, nmemb, sz, handle);
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
616
510
48e9efba7eb0 [svn] - written ungetc for curl vfs plugin (works along with getc, fread, ftell, feof, fseek)
giacomo
parents: 507
diff changeset
617 /* check if there are ungetted chars that should be picked before the real fread */
48e9efba7eb0 [svn] - written ungetc for curl vfs plugin (works along with getc, fread, ftell, feof, fseek)
giacomo
parents: 507
diff changeset
618 if ( handle->stream_stack != NULL )
48e9efba7eb0 [svn] - written ungetc for curl vfs plugin (works along with getc, fread, ftell, feof, fseek)
giacomo
parents: 507
diff changeset
619 {
48e9efba7eb0 [svn] - written ungetc for curl vfs plugin (works along with getc, fread, ftell, feof, fseek)
giacomo
parents: 507
diff changeset
620 guchar uc;
48e9efba7eb0 [svn] - written ungetc for curl vfs plugin (works along with getc, fread, ftell, feof, fseek)
giacomo
parents: 507
diff changeset
621 while ( (ret < sz) && (handle->stream_stack != NULL) )
48e9efba7eb0 [svn] - written ungetc for curl vfs plugin (works along with getc, fread, ftell, feof, fseek)
giacomo
parents: 507
diff changeset
622 {
48e9efba7eb0 [svn] - written ungetc for curl vfs plugin (works along with getc, fread, ftell, feof, fseek)
giacomo
parents: 507
diff changeset
623 uc = GPOINTER_TO_INT(handle->stream_stack->data);
48e9efba7eb0 [svn] - written ungetc for curl vfs plugin (works along with getc, fread, ftell, feof, fseek)
giacomo
parents: 507
diff changeset
624 handle->stream_stack = g_slist_delete_link( handle->stream_stack , handle->stream_stack );
48e9efba7eb0 [svn] - written ungetc for curl vfs plugin (works along with getc, fread, ftell, feof, fseek)
giacomo
parents: 507
diff changeset
625 memcpy( ptr + ret , &uc , 1 );
521
72515e5313cf [svn] - refinements for getc/ungetc in curl
giacomo
parents: 519
diff changeset
626 handle->rd_abs++;
510
48e9efba7eb0 [svn] - written ungetc for curl vfs plugin (works along with getc, fread, ftell, feof, fseek)
giacomo
parents: 507
diff changeset
627 ret++;
48e9efba7eb0 [svn] - written ungetc for curl vfs plugin (works along with getc, fread, ftell, feof, fseek)
giacomo
parents: 507
diff changeset
628 }
48e9efba7eb0 [svn] - written ungetc for curl vfs plugin (works along with getc, fread, ftell, feof, fseek)
giacomo
parents: 507
diff changeset
629 }
48e9efba7eb0 [svn] - written ungetc for curl vfs plugin (works along with getc, fread, ftell, feof, fseek)
giacomo
parents: 507
diff changeset
630
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
631 curl_req_xfer(handle);
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
632
465
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
633 if (DEBUG_SEEK)
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
634 check(handle);
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
635
534
c00fd2a0736f [svn] - support ice-name: icecast2 header
nenolod
parents: 521
diff changeset
636 memset(ptr, '\0', sz);
c00fd2a0736f [svn] - support ice-name: icecast2 header
nenolod
parents: 521
diff changeset
637
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
638 while (ret < sz)
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
639 {
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
640 size_t available;
430
ed94145472df [svn] Support shoutcast (over TCP) with VFS HTTP code. mpg123 has to accept
iabervon
parents: 428
diff changeset
641 while (!(available = buf_available(handle)) && !handle->cancel)
543
282bede45eef [svn] Support for writing downloaded data to a file (no UI provided yet).
iabervon
parents: 534
diff changeset
642 {
282bede45eef [svn] Support for writing downloaded data to a file (no UI provided yet).
iabervon
parents: 534
diff changeset
643 //g_print("Wait for data on %p\n", handle);
282bede45eef [svn] Support for writing downloaded data to a file (no UI provided yet).
iabervon
parents: 534
diff changeset
644 g_usleep(10000);
282bede45eef [svn] Support for writing downloaded data to a file (no UI provided yet).
iabervon
parents: 534
diff changeset
645 }
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
646 if (available > sz - ret)
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
647 available = sz - ret;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
648 memcpy(ptr + ret, handle->buffer + handle->rd_index, available);
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
649
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
650 handle->rd_index =
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
651 (handle->rd_index + available) % handle->buffer_length;
466
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
652 if (handle->rd_abs < handle->meta_abs &&
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
653 handle->rd_abs + available >= handle->meta_abs)
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
654 {
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
655 if (DEBUG_METADATA_REPORT)
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
656 g_print("New song: '%s'\n", handle->title);
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
657 }
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
658 handle->rd_abs += available;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
659 ret += available;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
660 if (!available)
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
661 {
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
662 //g_print("EOF reading from %p\n", handle);
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
663 break;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
664 }
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
665 }
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
666
534
c00fd2a0736f [svn] - support ice-name: icecast2 header
nenolod
parents: 521
diff changeset
667 // g_print("Read %d from %p\n", ret, handle);
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
668
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
669 return ret;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
670 }
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
671
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
672 size_t
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
673 curl_vfs_fwrite_impl(gconstpointer ptr,
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
674 size_t size,
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
675 size_t nmemb,
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
676 VFSFile * file)
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
677 {
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
678 return 0;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
679 }
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
680
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
681 gint
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
682 curl_vfs_getc_impl(VFSFile *stream)
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
683 {
519
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
684 CurlHandle *handle = (CurlHandle *) stream->handle;
510
48e9efba7eb0 [svn] - written ungetc for curl vfs plugin (works along with getc, fread, ftell, feof, fseek)
giacomo
parents: 507
diff changeset
685 guchar uc;
519
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
686
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
687 g_return_val_if_fail(handle != NULL, EOF);
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
688
510
48e9efba7eb0 [svn] - written ungetc for curl vfs plugin (works along with getc, fread, ftell, feof, fseek)
giacomo
parents: 507
diff changeset
689 if ( handle->stream_stack != NULL ) /* check if some char was ungetc'ed before */
494
631bd25d2380 [svn] - getc/ungetc emulation
nenolod
parents: 485
diff changeset
690 {
510
48e9efba7eb0 [svn] - written ungetc for curl vfs plugin (works along with getc, fread, ftell, feof, fseek)
giacomo
parents: 507
diff changeset
691 uc = GPOINTER_TO_INT(handle->stream_stack->data);
48e9efba7eb0 [svn] - written ungetc for curl vfs plugin (works along with getc, fread, ftell, feof, fseek)
giacomo
parents: 507
diff changeset
692 handle->stream_stack = g_slist_delete_link( handle->stream_stack , handle->stream_stack );
521
72515e5313cf [svn] - refinements for getc/ungetc in curl
giacomo
parents: 519
diff changeset
693 handle->rd_abs++;
510
48e9efba7eb0 [svn] - written ungetc for curl vfs plugin (works along with getc, fread, ftell, feof, fseek)
giacomo
parents: 507
diff changeset
694 return uc;
494
631bd25d2380 [svn] - getc/ungetc emulation
nenolod
parents: 485
diff changeset
695 }
510
48e9efba7eb0 [svn] - written ungetc for curl vfs plugin (works along with getc, fread, ftell, feof, fseek)
giacomo
parents: 507
diff changeset
696 else if (curl_vfs_fread_impl(&uc, 1, 1, stream) != 1)
519
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
697 return EOF;
510
48e9efba7eb0 [svn] - written ungetc for curl vfs plugin (works along with getc, fread, ftell, feof, fseek)
giacomo
parents: 507
diff changeset
698 return uc;
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
699 }
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
700
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
701 gint
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
702 curl_vfs_ungetc_impl(gint c, VFSFile *stream)
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
703 {
519
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
704 CurlHandle *handle = (CurlHandle *) stream->handle;
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
705
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
706 g_return_val_if_fail(handle != NULL, EOF);
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
707
510
48e9efba7eb0 [svn] - written ungetc for curl vfs plugin (works along with getc, fread, ftell, feof, fseek)
giacomo
parents: 507
diff changeset
708 handle->stream_stack = g_slist_prepend( handle->stream_stack , GINT_TO_POINTER(c) );
48e9efba7eb0 [svn] - written ungetc for curl vfs plugin (works along with getc, fread, ftell, feof, fseek)
giacomo
parents: 507
diff changeset
709 if ( handle->stream_stack != NULL )
521
72515e5313cf [svn] - refinements for getc/ungetc in curl
giacomo
parents: 519
diff changeset
710 {
72515e5313cf [svn] - refinements for getc/ungetc in curl
giacomo
parents: 519
diff changeset
711 handle->rd_abs--;
494
631bd25d2380 [svn] - getc/ungetc emulation
nenolod
parents: 485
diff changeset
712 return c;
521
72515e5313cf [svn] - refinements for getc/ungetc in curl
giacomo
parents: 519
diff changeset
713 }
510
48e9efba7eb0 [svn] - written ungetc for curl vfs plugin (works along with getc, fread, ftell, feof, fseek)
giacomo
parents: 507
diff changeset
714 else
519
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
715 return EOF;
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
716 }
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
717
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
718 gint
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
719 curl_vfs_fseek_impl(VFSFile * file,
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
720 glong offset,
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
721 gint whence)
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
722 {
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
723 size_t posn;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
724 CurlHandle *handle = file->handle;
510
48e9efba7eb0 [svn] - written ungetc for curl vfs plugin (works along with getc, fread, ftell, feof, fseek)
giacomo
parents: 507
diff changeset
725 /* when a seek is requested, trash the stack of ungetted chars */
48e9efba7eb0 [svn] - written ungetc for curl vfs plugin (works along with getc, fread, ftell, feof, fseek)
giacomo
parents: 507
diff changeset
726 if ( handle->stream_stack != NULL )
48e9efba7eb0 [svn] - written ungetc for curl vfs plugin (works along with getc, fread, ftell, feof, fseek)
giacomo
parents: 507
diff changeset
727 {
48e9efba7eb0 [svn] - written ungetc for curl vfs plugin (works along with getc, fread, ftell, feof, fseek)
giacomo
parents: 507
diff changeset
728 g_slist_free( handle->stream_stack );
48e9efba7eb0 [svn] - written ungetc for curl vfs plugin (works along with getc, fread, ftell, feof, fseek)
giacomo
parents: 507
diff changeset
729 handle->stream_stack = NULL;
48e9efba7eb0 [svn] - written ungetc for curl vfs plugin (works along with getc, fread, ftell, feof, fseek)
giacomo
parents: 507
diff changeset
730 }
460
cc7faecc7619 [svn] Time out curl connections eventually, and don't retry them on the same VFSFile.
iabervon
parents: 430
diff changeset
731 if (DEBUG_SEEK)
cc7faecc7619 [svn] Time out curl connections eventually, and don't retry them on the same VFSFile.
iabervon
parents: 430
diff changeset
732 g_print("Seek %p to %d %d\n", handle, offset, whence);
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
733 if (whence == SEEK_END && handle->length == -1)
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
734 {
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
735 if (!handle->thread)
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
736 {
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
737 // We need a HEAD to find out the length
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
738 handle->no_data = 1;
460
cc7faecc7619 [svn] Time out curl connections eventually, and don't retry them on the same VFSFile.
iabervon
parents: 430
diff changeset
739 if (DEBUG_CONNECTION)
cc7faecc7619 [svn] Time out curl connections eventually, and don't retry them on the same VFSFile.
iabervon
parents: 430
diff changeset
740 g_print("Request for head info\n");
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
741 curl_manage_request(handle);
460
cc7faecc7619 [svn] Time out curl connections eventually, and don't retry them on the same VFSFile.
iabervon
parents: 430
diff changeset
742 if (DEBUG_CONNECTION)
cc7faecc7619 [svn] Time out curl connections eventually, and don't retry them on the same VFSFile.
iabervon
parents: 430
diff changeset
743 g_print("Completed\n");
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
744 handle->no_data = 0;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
745 }
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
746 else
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
747 {
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
748 // Wait a bit?
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
749 }
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
750 }
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
751
430
ed94145472df [svn] Support shoutcast (over TCP) with VFS HTTP code. mpg123 has to accept
iabervon
parents: 428
diff changeset
752 if (whence == SEEK_END && handle->length < 0)
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
753 {
465
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
754 if (DEBUG_SEEK)
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
755 g_print("Tried to seek to the end of a file with unknown length\n");
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
756 // don't know how long it is...
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
757 return -1;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
758 }
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
759
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
760 posn = handle->rd_abs;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
761
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
762 if (whence == SEEK_SET)
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
763 handle->rd_abs = offset;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
764 else if (whence == SEEK_END)
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
765 handle->rd_abs = handle->length + offset;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
766 else
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
767 handle->rd_abs = handle->rd_abs + offset;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
768
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
769 // XXXX
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
770 // There's a race here between finding available space and
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
771 // allocating it and the check below.
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
772
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
773 if (handle->thread)
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
774 {
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
775 if (handle->rd_abs + handle->buffer_length < handle->wr_abs ||
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
776 handle->rd_abs > handle->wr_abs)
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
777 {
460
cc7faecc7619 [svn] Time out curl connections eventually, and don't retry them on the same VFSFile.
iabervon
parents: 430
diff changeset
778 if (DEBUG_CONNECTION)
cc7faecc7619 [svn] Time out curl connections eventually, and don't retry them on the same VFSFile.
iabervon
parents: 430
diff changeset
779 g_print("Stop transfer\n");
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
780 curl_req_no_xfer(handle);
460
cc7faecc7619 [svn] Time out curl connections eventually, and don't retry them on the same VFSFile.
iabervon
parents: 430
diff changeset
781 if (DEBUG_CONNECTION)
cc7faecc7619 [svn] Time out curl connections eventually, and don't retry them on the same VFSFile.
iabervon
parents: 430
diff changeset
782 g_print("Okay\n");
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
783 }
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
784 else
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
785 {
460
cc7faecc7619 [svn] Time out curl connections eventually, and don't retry them on the same VFSFile.
iabervon
parents: 430
diff changeset
786 if (DEBUG_CONNECTION)
cc7faecc7619 [svn] Time out curl connections eventually, and don't retry them on the same VFSFile.
iabervon
parents: 430
diff changeset
787 g_print("Continue transfer\n");
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
788 curl_req_sync_xfer(handle, posn);
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
789 }
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
790 }
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
791
460
cc7faecc7619 [svn] Time out curl connections eventually, and don't retry them on the same VFSFile.
iabervon
parents: 430
diff changeset
792 if (DEBUG_SEEK)
cc7faecc7619 [svn] Time out curl connections eventually, and don't retry them on the same VFSFile.
iabervon
parents: 430
diff changeset
793 g_print("Seeked %p from %d to %d\n", handle, posn, handle->rd_abs);
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
794 return 0;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
795 }
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
796
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
797 void
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
798 curl_vfs_rewind_impl(VFSFile * file)
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
799 {
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
800 curl_vfs_fseek_impl(file, 0, SEEK_SET);
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
801 }
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
802
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
803 glong
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
804 curl_vfs_ftell_impl(VFSFile * file)
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
805 {
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
806 CurlHandle *handle = file->handle;
521
72515e5313cf [svn] - refinements for getc/ungetc in curl
giacomo
parents: 519
diff changeset
807 return handle->rd_abs;
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
808 }
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
809
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
810 gboolean
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
811 curl_vfs_feof_impl(VFSFile * file)
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
812 {
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
813 CurlHandle *handle = file->handle;
521
72515e5313cf [svn] - refinements for getc/ungetc in curl
giacomo
parents: 519
diff changeset
814 return handle->rd_abs == handle->length;
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
815 }
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
816
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
817 gint
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
818 curl_vfs_truncate_impl(VFSFile * file, glong size)
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
819 {
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
820 return -1;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
821 }
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
822
465
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
823 gchar *
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
824 curl_vfs_metadata_impl(VFSFile * file, const gchar * field)
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
825 {
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
826 CurlHandle *handle = file->handle;
469
1256144d2a6e [svn] - fix crash
nenolod
parents: 466
diff changeset
827 if (!strcmp(field, "stream-name") && handle->name != NULL)
465
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
828 return strdup(handle->name);
469
1256144d2a6e [svn] - fix crash
nenolod
parents: 466
diff changeset
829 if (!strcmp(field, "track-name") && handle->title != NULL)
466
20657d994de8 [svn] Handle inline metadata. Parsing of tags needs work before it will not crash on
iabervon
parents: 465
diff changeset
830 return strdup(handle->title);
465
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
831 return NULL;
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
832 }
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
833
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
834 VFSConstructor curl_const = {
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
835 "http://",
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
836 curl_vfs_fopen_impl,
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
837 curl_vfs_fclose_impl,
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
838 curl_vfs_fread_impl,
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
839 curl_vfs_fwrite_impl,
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
840 curl_vfs_getc_impl,
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
841 curl_vfs_ungetc_impl,
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
842 curl_vfs_fseek_impl,
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
843 curl_vfs_rewind_impl,
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
844 curl_vfs_ftell_impl,
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
845 curl_vfs_feof_impl,
465
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
846 curl_vfs_truncate_impl,
ffa685855003 [svn] Provide "name" metadata when the url is a shoutcast stream.
iabervon
parents: 460
diff changeset
847 curl_vfs_metadata_impl
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
848 };
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
849
519
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
850 VFSConstructor curl_https_const = {
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
851 "https://",
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
852 curl_vfs_fopen_impl,
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
853 curl_vfs_fclose_impl,
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
854 curl_vfs_fread_impl,
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
855 curl_vfs_fwrite_impl,
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
856 curl_vfs_getc_impl,
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
857 curl_vfs_ungetc_impl,
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
858 curl_vfs_fseek_impl,
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
859 curl_vfs_rewind_impl,
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
860 curl_vfs_ftell_impl,
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
861 curl_vfs_feof_impl,
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
862 curl_vfs_truncate_impl,
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
863 curl_vfs_metadata_impl
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
864 };
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
865
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
866 static void init(void)
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
867 {
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
868 vfs_register_transport(&curl_const);
519
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
869 vfs_register_transport(&curl_https_const);
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
870 }
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
871
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
872 static void cleanup(void)
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
873 {
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
874 #if 0
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
875 vfs_unregister_transport(&curl_const);
519
bbc597d9875d [svn] - re-add code that was accidentally removed after merge of getc/ungetc implementation
giacomo
parents: 510
diff changeset
876 vfs_unregister_transport(&curl_https_const);
428
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
877 #endif
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
878 }
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
879
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
880 LowlevelPlugin llp_curl = {
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
881 NULL,
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
882 NULL,
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
883 "http:// URI Transport",
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
884 init,
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
885 cleanup,
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
886 };
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
887
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
888 LowlevelPlugin *get_lplugin_info(void)
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
889 {
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
890 return &llp_curl;
37b3f45b3a68 [svn] Add code for a plugin to use CURL for http. Needs some build-system
iabervon
parents:
diff changeset
891 }