2004-05-04 21:08:46 +02:00
|
|
|
/* the Music Player Daemon (MPD)
|
2006-07-14 21:37:45 +02:00
|
|
|
* (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
|
2004-05-04 21:08:46 +02:00
|
|
|
* This project's homepage is: http://www.musicpd.org
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "inputStream.h"
|
|
|
|
|
2004-05-18 04:46:13 +02:00
|
|
|
#include "inputStream_file.h"
|
|
|
|
#include "inputStream_http.h"
|
|
|
|
|
2004-05-04 21:08:46 +02:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
|
sparse: ANSI-fy function declarations
These are just warnings from sparse, but it makes the output
easier to read. I ran this through a quick perl script, but
of course verified the output by looking at the diff and making
sure the thing still compiles.
here's the quick perl script I wrote to generate this patch:
----------- 8< -----------
use Tie::File;
defined(my $pid = open my $fh, '-|') or die $!;
if (!$pid) {
open STDERR, '>&STDOUT' or die $!;
exec 'sparse', @ARGV or die $!;
}
my $na = 'warning: non-ANSI function declaration of function';
while (<$fh>) {
print STDERR $_;
if (/^(.+?\.[ch]):(\d+):(\d+): $na '(\w+)'/o) {
my ($f, $l, $pos, $func) = ($1, $2, $3, $4);
$l--;
tie my @x, 'Tie::File', $f or die "$!: $f";
print '-', $x[$l], "\n";
$x[$l] =~ s/\b($func\s*)\(\s*\)/$1(void)/;
print '+', $x[$l], "\n";
untie @x;
}
}
git-svn-id: https://svn.musicpd.org/mpd/trunk@4378 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-07-17 02:15:34 +02:00
|
|
|
void initInputStream(void) {
|
2004-06-20 19:07:13 +02:00
|
|
|
inputStream_initFile();
|
|
|
|
inputStream_initHttp();
|
|
|
|
}
|
|
|
|
|
2004-05-18 04:46:13 +02:00
|
|
|
int openInputStream(InputStream * inStream, char * url) {
|
2004-06-07 07:00:56 +02:00
|
|
|
inStream->offset = 0;
|
|
|
|
inStream->size = 0;
|
|
|
|
inStream->error = 0;
|
|
|
|
inStream->mime = NULL;
|
|
|
|
inStream->seekable = 0;
|
|
|
|
inStream->metaName = NULL;
|
|
|
|
inStream->metaTitle = NULL;
|
|
|
|
|
2004-05-18 04:46:13 +02:00
|
|
|
if(inputStream_fileOpen(inStream,url) == 0) return 0;
|
|
|
|
if(inputStream_httpOpen(inStream,url) == 0) return 0;
|
2004-05-04 21:08:46 +02:00
|
|
|
|
2004-05-18 04:46:13 +02:00
|
|
|
return -1;
|
2004-05-04 21:08:46 +02:00
|
|
|
}
|
|
|
|
|
2004-05-04 21:49:29 +02:00
|
|
|
int seekInputStream(InputStream * inStream, long offset, int whence) {
|
2004-05-18 04:46:13 +02:00
|
|
|
return inStream->seekFunc(inStream,offset,whence);
|
2004-05-04 21:08:46 +02:00
|
|
|
}
|
|
|
|
|
2004-05-04 21:49:29 +02:00
|
|
|
size_t readFromInputStream(InputStream * inStream, void * ptr, size_t size,
|
|
|
|
size_t nmemb)
|
2004-05-04 21:08:46 +02:00
|
|
|
{
|
2004-05-18 04:46:13 +02:00
|
|
|
return inStream->readFunc(inStream,ptr,size,nmemb);
|
2004-05-04 21:08:46 +02:00
|
|
|
}
|
|
|
|
|
2004-05-04 21:49:29 +02:00
|
|
|
int closeInputStream(InputStream * inStream) {
|
2004-06-07 07:00:56 +02:00
|
|
|
if(inStream->mime) free(inStream->mime);
|
|
|
|
if(inStream->metaName) free(inStream->metaName);
|
|
|
|
if(inStream->metaTitle) free(inStream->metaTitle);
|
|
|
|
|
2004-05-18 04:46:13 +02:00
|
|
|
return inStream->closeFunc(inStream);
|
2004-05-04 21:08:46 +02:00
|
|
|
}
|
2004-05-05 01:39:02 +02:00
|
|
|
|
|
|
|
int inputStreamAtEOF(InputStream * inStream) {
|
2004-05-18 04:46:13 +02:00
|
|
|
return inStream->atEOFFunc(inStream);
|
2004-05-05 01:39:02 +02:00
|
|
|
}
|
2004-05-18 11:54:45 +02:00
|
|
|
|
|
|
|
int bufferInputStream(InputStream * inStream) {
|
|
|
|
return inStream->bufferFunc(inStream);
|
|
|
|
}
|