/*****************************************************************************
* mtp.c: mtp input (mtp: access plug-in)
*****************************************************************************
- * Copyright (C) 2001-2006 the VideoLAN team
+ * Copyright (C) 2001-2006 VLC authors and VideoLAN
* Copyright © 2006-2008 Rémi Denis-Courmont
*
* Authors: Fabio Ritrovato <exsephiroth87@gmail.com>
* Original file.c: Christophe Massiot <massiot@via.ecp.fr>
* Rémi Denis-Courmont <rem # videolan # 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
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
# include "config.h"
#endif
-#include <vlc_common.h>
-#include <vlc_plugin.h>
-#include <vlc_input.h>
-#include <vlc_access.h>
-#include <vlc_interface.h>
-
#include <assert.h>
#include <errno.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef HAVE_FCNTL_H
-# include <fcntl.h>
-#endif
-
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
#include <unistd.h>
-#include <poll.h>
-#include <vlc_charset.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_input.h>
+#include <vlc_access.h>
+#include <vlc_dialog.h>
+#include <vlc_fs.h>
#include "libmtp.h"
static int Open ( vlc_object_t * );
static void Close( vlc_object_t * );
-#define CACHING_TEXT N_("Caching value in ms")
-#define CACHING_LONGTEXT N_( \
- "Caching value for files. This " \
- "value should be set in milliseconds." )
-
vlc_module_begin()
set_description( N_("MTP input") )
set_shortname( N_("MTP") )
* Exported prototypes
*****************************************************************************/
-static int Seek( access_t *, int64_t );
+static int Seek( access_t *, uint64_t );
static ssize_t Read( access_t *, uint8_t *, size_t );
static int Control( access_t *, int, va_list );
struct access_sys_t
{
- unsigned int i_nb_reads;
int fd;
};
int i_numrawdevices;
int i_ret;
- /* Update default_pts to a suitable value for file access */
- var_Create( p_access, "file-caching", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
-
- if( sscanf( p_access->psz_path, "%"SCNu32":%"SCNu8":%"SCNu16":%d", &i_bus,
- &i_dev, &i_product_id, &i_track_id ) != 4 )
+ if( sscanf( p_access->psz_location, "%"SCNu32":%"SCNu8":%"SCNu16":%d",
+ &i_bus, &i_dev, &i_product_id, &i_track_id ) != 4 )
return VLC_EGENERIC;
i_ret = LIBMTP_Detect_Raw_Devices( &p_rawdevices, &i_numrawdevices );
if( i_ret != 0 || i_numrawdevices <= 0 || !p_rawdevices )
if( ( p_device = LIBMTP_Open_Raw_Device( &p_rawdevices[i] )
) != NULL )
{
- free( p_access->psz_path );
- if( ( p_access->psz_path = tempnam( NULL, "vlc" ) ) == NULL )
+ free( p_access->psz_filepath );
+#warning Oooh no! Not tempnam()!
+ p_access->psz_filepath = tempnam( NULL, "vlc" );
+ if( p_access->psz_filepath == NULL )
{
LIBMTP_Release_Device( p_device );
free( p_rawdevices );
}
else
{
- msg_Dbg( p_access, "About to write %s", p_access->psz_path );
+ msg_Dbg( p_access, "About to write %s",
+ p_access->psz_filepath );
LIBMTP_Get_File_To_File( p_device, i_track_id,
- p_access->psz_path, NULL, NULL );
+ p_access->psz_filepath, NULL,
+ NULL );
LIBMTP_Release_Device( p_device );
i = i_numrawdevices;
}
free( p_rawdevices );
STANDARD_READ_ACCESS_INIT;
- p_sys->i_nb_reads = 0;
int fd = p_sys->fd = -1;
/* Open file */
- msg_Dbg( p_access, "opening file `%s'", p_access->psz_path );
- fd = open_file( p_access, p_access->psz_path );
+ msg_Dbg( p_access, "opening file `%s'", p_access->psz_filepath );
+ fd = open_file( p_access, p_access->psz_filepath );
if( fd == -1 )
{
}
p_sys->fd = fd;
-#ifdef HAVE_SYS_STAT_H
- struct stat st;
- if( fstat( fd, &st ) )
- msg_Err( p_access, "fstat(%d): %m", fd );
- p_access->info.i_size = st.st_size;
-#else
-# warning File size not known!
-#endif
-
return VLC_SUCCESS;
}
access_sys_t *p_sys = p_access->p_sys;
close ( p_sys->fd );
- if( utf8_unlink( p_access->psz_path ) != 0 )
- msg_Err( p_access, "Error deleting file %s, %m", p_access->psz_path );
+ if( vlc_unlink( p_access->psz_filepath ) != 0 )
+ msg_Err( p_access, "Error deleting file %s, %s",
+ p_access->psz_filepath, vlc_strerror_c(errno) );
free( p_sys );
}
break;
default:
- msg_Err( p_access, "read failed (%m)" );
- intf_UserFatal( p_access, false, _( "File reading failed" ),
- _( "VLC could not read the file." ) );
+ msg_Err( p_access, "read failed: %s", vlc_strerror_c(errno) );
+ dialog_Fatal( p_access, _( "File reading failed" ),
+ _( "VLC could not read the file: %s" ),
+ vlc_strerror(errno) );
p_access->info.b_eof = true;
return 0;
}
else
p_access->info.b_eof = true;
- p_sys->i_nb_reads++;
-
return i_ret;
}
/*****************************************************************************
* Seek: seek to a specific location in a file
*****************************************************************************/
-static int Seek( access_t *p_access, int64_t i_pos )
+static int Seek( access_t *p_access, uint64_t i_pos )
{
p_access->info.i_pos = i_pos;
p_access->info.b_eof = false;
*****************************************************************************/
static int Control( access_t *p_access, int i_query, va_list args )
{
+ access_sys_t *sys = p_access->p_sys;
bool *pb_bool;
int64_t *pi_64;
switch( i_query )
{
- /* */
case ACCESS_CAN_SEEK:
case ACCESS_CAN_FASTSEEK:
pb_bool = ( bool* )va_arg( args, bool* );
*pb_bool = true;
break;
+ case ACCESS_GET_SIZE:
+ {
+ uint64_t *s = va_arg( args, uint64_t * );
+ struct stat st;
+ if( fstat( sys->fd, &st ) )
+ {
+ msg_Err( p_access, "fstat error: %s", vlc_strerror_c(errno) );
+ return VLC_EGENERIC;
+ }
+ *s = st.st_size;
+ break;
+ }
+
case ACCESS_GET_PTS_DELAY:
pi_64 = ( int64_t* )va_arg( args, int64_t * );
- *pi_64 = var_GetInteger( p_access, "file-caching" ) * INT64_C( 1000 );
+ *pi_64 = INT64_C(1000)
+ * var_InheritInteger( p_access, "file-caching" );
break;
- /* */
case ACCESS_SET_PAUSE_STATE:
/* Nothing to do */
break;
- case ACCESS_GET_TITLE_INFO:
- case ACCESS_SET_TITLE:
- case ACCESS_SET_SEEKPOINT:
- case ACCESS_SET_PRIVATE_ID_STATE:
- case ACCESS_GET_META:
- case ACCESS_GET_PRIVATE_ID_STATE:
- case ACCESS_GET_CONTENT_TYPE:
- return VLC_EGENERIC;
-
default:
- msg_Warn( p_access, "unimplemented query %d in control", i_query );
return VLC_EGENERIC;
}
*****************************************************************************/
static int open_file( access_t *p_access, const char *path )
{
- int fd = utf8_open( path, O_RDONLY | O_NONBLOCK /* O_LARGEFILE*/, 0666 );
+ int fd = vlc_open( path, O_RDONLY | O_NONBLOCK );
if( fd == -1 )
{
- msg_Err( p_access, "cannot open file %s (%m)", path );
- intf_UserFatal( p_access, false, _( "File reading failed" ),
- _( "VLC could not open the file \"%s\"." ), path );
+ msg_Err( p_access, "cannot open file %s: %s", path,
+ vlc_strerror_c(errno) );
+ dialog_Fatal( p_access, _( "File reading failed" ),
+ _( "VLC could not open the file \"%s\": %s" ), path,
+ vlc_strerror(errno) );
return -1;
}
-
-#if defined( HAVE_FCNTL )
- fcntl( fd, F_SETFD, fcntl( fd, F_GETFD ) | FD_CLOEXEC );
-
- /* We'd rather use any available memory for reading ahead
- * than for caching what we've already seen/heard */
-# if defined( F_RDAHEAD )
+#ifdef F_RDAHEAD
fcntl( fd, F_RDAHEAD, 1 );
-# endif
-# if defined( F_NOCACHE )
- fcntl( fd, F_NOCACHE, 1 );
-# endif
#endif
-
+#ifdef F_NOCACHE
+ fcntl( fd, F_NOCACHE, 0 );
+#endif
return fd;
}
projects / vlc / blobdiff