* eyetv.c : Access module to connect to our plugin running within EyeTV
*****************************************************************************
* Copyright (C) 2006-2007 the VideoLAN team
- * $Id: eyetv.c 23509 2007-12-09 17:39:28Z courmisch $
+ * $Id$
*
* Author: Felix Kühne <fkuehne at videolan dot org>
*
* Preamble
*****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_access.h>
#include <vlc_network.h>
#import <Foundation/Foundation.h>
+#define MTU 65535
+
/* TODO:
* watch for PluginQuit or DeviceRemoved to stop output to VLC's core then */
#define CHANNEL_LONGTEXT N_( \
"EyeTV program number, or use 0 for last channel, " \
"-1 for S-Video input, -2 for Composite input" )
-vlc_module_begin();
- set_shortname( "EyeTV" );
- set_description( _("EyeTV access module") );
- set_category( CAT_INPUT );
- set_subcategory( SUBCAT_INPUT_ACCESS );
+
+#define CACHING_TEXT N_("Caching value in ms")
+#define CACHING_LONGTEXT N_( \
+ "Caching value for EyeTV captures. This " \
+ "value should be set in milliseconds." )
+
+vlc_module_begin ()
+ set_shortname( "EyeTV" )
+ set_description( N_("EyeTV input") )
+ set_category( CAT_INPUT )
+ set_subcategory( SUBCAT_INPUT_ACCESS )
add_integer( "eyetv-channel", 0, NULL,
- CHANNEL_TEXT, CHANNEL_LONGTEXT, VLC_FALSE );
+ CHANNEL_TEXT, CHANNEL_LONGTEXT, false )
- set_capability( "access2", 0 );
- add_shortcut( "eyetv" );
- set_callbacks( Open, Close );
-vlc_module_end();
+ set_capability( "access", 0 )
+ add_shortcut( "eyetv" )
+ set_callbacks( Open, Close )
+ add_integer( "eyetv-caching", DEFAULT_PTS_DELAY / 1000, NULL,
+ CACHING_TEXT, CACHING_LONGTEXT, true);
+vlc_module_end ()
/*****************************************************************************
* Access: local prototypes
struct access_sys_t
{
int eyetvSock;
+ int i_pts_delay;
};
-static ssize_t Read( access_t *, uint8_t *, size_t );
+static block_t *BlockRead( access_t *);
static int Control( access_t *, int, va_list );
static void selectChannel( vlc_object_t *p_this, int theChannelNum )
struct sockaddr_un publicAddr, peerAddr;
int publicSock;
- vlc_value_t val;
-
/* Init p_access */
- access_InitFields( p_access ); \
- ACCESS_SET_CALLBACKS( Read, NULL, Control, NULL ); \
- MALLOC_ERR( p_access->p_sys, access_sys_t ); \
- p_sys = p_access->p_sys; memset( p_sys, 0, sizeof( access_sys_t ) );
+ access_InitFields( p_access );
+ ACCESS_SET_CALLBACKS( NULL, BlockRead, Control, NULL );
+ p_sys = p_access->p_sys = calloc( 1, sizeof( access_sys_t ) );
+ if( !p_sys )
+ return VLC_ENOMEM;
- var_Create( p_access, "eyetv-channel", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_access, "eyetv-channel", &val);
+ p_sys->i_pts_delay = var_InheritInteger( p_access, "eyetv-caching" );
msg_Dbg( p_access, "coming up" );
-
- selectChannel(p_this, val.i_int);
+ selectChannel( p_this, var_InheritInteger( p_access, "eyetv-channel" ) );
/* socket */
memset(&publicAddr, 0, sizeof(publicAddr));
return VLC_EGENERIC;
}
- publicSock = socket(AF_UNIX, SOCK_STREAM, 0);
+ publicSock = socket(PF_UNIX, SOCK_STREAM, 0);
if( publicSock == -1 )
{
msg_Err( p_access, "create local socket failed (errno=%d)", errno );
}
/*****************************************************************************
-* Read: forwarding data from EyeTV plugin which was received above
+* BlockRead: forwarding data from EyeTV plugin which was received above
*****************************************************************************/
-static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len )
+static block_t *BlockRead( access_t *p_access )
{
access_sys_t *p_sys = p_access->p_sys;
- int i_read;
+ block_t *p_block;
+ ssize_t len;
if( p_access->info.b_eof )
- return 0;
+ return NULL;
- i_read = net_Read( p_access, p_sys->eyetvSock, NULL, p_buffer, i_len,
- VLC_FALSE );
- if( i_read == 0 )
- p_access->info.b_eof = VLC_TRUE;
- else if( i_read > 0 )
- p_access->info.i_pos += i_read;
+ /* Read data */
+ p_block = block_New( p_access, MTU );
+ len = net_Read( p_access, p_sys->eyetvSock, NULL,
+ p_block->p_buffer, MTU, false );
- return i_read;
+ if( len < 0 )
+ {
+ block_Release( p_block );
+ return NULL;
+ }
+
+ return block_Realloc( p_block, 0, p_block->i_buffer = len );
}
/*****************************************************************************
* Control:
*****************************************************************************/
static int Control( access_t *p_access, int i_query, va_list args )
-{/*
- vlc_bool_t *pb_bool;
+{
+ bool *pb_bool;
int *pi_int;
int64_t *pi_64;
+ access_sys_t *p_sys = (access_sys_t *) p_access->p_sys;
switch( i_query )
{
- * *
- case ACCESS_SET_PAUSE_STATE:
- * Nothing to do *
- break;
-
case ACCESS_CAN_SEEK:
case ACCESS_CAN_FASTSEEK:
+ pb_bool = (bool*)va_arg( args, bool* );
+ *pb_bool = false;
+ break;
case ACCESS_CAN_PAUSE:
+ pb_bool = (bool*)va_arg( args, bool* );
+ *pb_bool = false;
+ break;
case ACCESS_CAN_CONTROL_PACE:
- case ACCESS_GET_MTU:
+ pb_bool = (bool*)va_arg( args, bool* );
+ *pb_bool = false;
+ break;
+
+ /* */
case ACCESS_GET_PTS_DELAY:
+ pi_64 = (int64_t*)va_arg( args, int64_t * );
+ *pi_64 = (int64_t) p_sys->i_pts_delay * 1000;
+ break;
+
+ case ACCESS_SET_PAUSE_STATE:
case ACCESS_GET_TITLE_INFO:
case ACCESS_SET_TITLE:
case ACCESS_SET_SEEKPOINT:
return VLC_EGENERIC;
}
- return VLC_SUCCESS;*/
- return VLC_EGENERIC;
+ return VLC_SUCCESS;
}
projects / vlc / blobdiff