Commit cf09f019 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Use dialog_Fatal, fix a bunch (but not all) interaction crashes

parent bde4f0ba
......@@ -30,8 +30,8 @@
#include "cdda.h" /* private structures. Also #includes vlc things */
#include "info.h" /* headers for meta info retrieval */
#include "access.h"
#include "vlc_keys.h"
#include <vlc_interface.h>
#include <vlc_keys.h>
#include <vlc_dialog.h>
#include <cdio/cdio.h>
#include <cdio/logging.h>
......@@ -282,7 +282,7 @@ static block_t * CDDAReadBlocks( access_t * p_access )
{
msg_Err( p_access, "cannot get a new block of size: %i",
i_blocks * CDIO_CD_FRAMESIZE_RAW );
intf_UserFatal( p_access, false, _("CD reading failed"),
dialog_Fatal( p_access, _("CD reading failed"),
_("VLC could not get a new block of size: %i."),
i_blocks * CDIO_CD_FRAMESIZE_RAW );
return NULL;
......
......@@ -39,7 +39,7 @@
#include <vlc_access.h>
#include <vlc_demux.h>
#include <vlc_vout.h>
#include <vlc_interface.h>
#include <vlc_dialog.h>
#include "common.h"
#include "filter.h"
......@@ -975,7 +975,7 @@ static int OpenDevice( vlc_object_t *p_this, access_sys_t *p_sys,
{
msg_Err( p_this, "can't use device: %s, unsupported device type",
devicename.c_str() );
intf_UserFatal( p_this, false, _("Capturing failed"),
dialog_Fatal( p_this, _("Capture failed"),
_("VLC cannot use the device \"%s\", because its "
"type is not supported.") );
return VLC_EGENERIC;
......@@ -1028,7 +1028,7 @@ static int OpenDevice( vlc_object_t *p_this, access_sys_t *p_sys,
else {
/* capture device */
msg_Err( p_this, "capture device '%s' does not support required parameters !", devicename.c_str() );
intf_UserFatal( p_this, false, _("Capturing failed"),
dialog_Fatal( p_this, _("Capture failed"),
_("The capture device \"%s\" does not support the "
"required parameters."), devicename.c_str() );
p_device_filter->Release();
......
......@@ -36,6 +36,7 @@
#include <vlc_access.h>
#include <vlc_input.h>
#include <vlc_interface.h>
#include <vlc_dialog.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
......@@ -982,7 +983,7 @@ static int ParseMRL( access_t *p_access )
else
{
msg_Err( p_access, "illegal polarization %c", *psz_parser );
intf_UserFatal( p_access, false, _("Illegal Polarization"),
dialog_Fatal( p_access, _("Invalid polarization"),
_("The provided polarization \"%c\" is not valid."),
*psz_parser );
free( psz_dup );
......
......@@ -36,7 +36,7 @@
#include <vlc_demux.h>
#include <vlc_charset.h>
#include <vlc_interface.h>
#include <vlc_dialog.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
......@@ -308,7 +308,7 @@ static int Open( vlc_object_t *p_this )
if( dvdnav_title_play( p_sys->dvdnav, 1 ) != DVDNAV_STATUS_OK )
{
msg_Err( p_demux, "cannot set title (can't decrypt DVD?)" );
intf_UserFatal( p_demux, false, _("Playback failure"),
dialog_Fatal( p_demux, _("Playback failure"),
_("VLC cannot set the DVD's title. It possibly "
"cannot decrypt the entire disc.") );
dvdnav_close( p_sys->dvdnav );
......
......@@ -35,8 +35,8 @@
#include <vlc_input.h>
#include <vlc_access.h>
#include <vlc_charset.h>
#include <vlc_interface.h>
#include <vlc_dialog.h>
#include <vlc_iso_lang.h>
......@@ -248,7 +248,7 @@ static int Open( vlc_object_t *p_this )
if( !(p_dvdread = DVDOpen( psz_name )) )
{
msg_Err( p_demux, "DVDRead cannot open source: %s", psz_name );
intf_UserFatal( p_demux, false, _("Playback failure"),
dialog_Fatal( p_demux, _("Playback failure"),
_("DVDRead could not open the disc \"%s\"."), psz_name );
free( psz_name );
return VLC_EGENERIC;
......@@ -570,7 +570,7 @@ static int Demux( demux_t *p_demux )
{
msg_Err( p_demux, "read failed for %d/%d blocks at 0x%02x",
i_read, i_blocks_once, p_sys->i_cur_block );
intf_UserFatal( p_demux, false, _("Playback failure"),
dialog_Fatal( p_demux, _("Playback failure"),
_("DVDRead could not read %d/%d blocks at 0x%02x."),
i_read, i_blocks_once, p_sys->i_cur_block );
return -1;
......
......@@ -34,7 +34,7 @@
#include <vlc_plugin.h>
#include <vlc_input.h>
#include <vlc_access.h>
#include <vlc_interface.h>
#include <vlc_dialog.h>
#include <assert.h>
#include <errno.h>
......@@ -222,8 +222,8 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len )
default:
msg_Err (p_access, "failed to read (%m)");
intf_UserFatal (p_access, false, _("File reading failed"),
_("VLC could not read the file."));
dialog_Fatal (p_access, _("File reading failed"),
_("VLC could not read the file."));
p_access->info.b_eof = true;
return 0;
}
......@@ -342,8 +342,8 @@ static int open_file (access_t *p_access, const char *path)
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);
dialog_Fatal (p_access, _("File reading failed"),
_("VLC could not open the file \"%s\"."), path);
return -1;
}
......
......@@ -36,7 +36,7 @@
#include <assert.h>
#include <vlc_access.h>
#include <vlc_interface.h>
#include <vlc_dialog.h>
#include <vlc_network.h>
#include <vlc_url.h>
......@@ -133,7 +133,7 @@ static int Login( vlc_object_t *p_access, access_sys_t *p_sys )
if( fd == -1 )
{
msg_Err( p_access, "connection failed" );
intf_UserFatal( p_access, false, _("Network interaction failed"),
dialog_Fatal( p_access, _("Network interaction failed"),
_("VLC could not connect with the given server.") );
return -1;
}
......@@ -143,7 +143,7 @@ static int Login( vlc_object_t *p_access, access_sys_t *p_sys )
if( i_answer / 100 != 2 )
{
msg_Err( p_access, "connection rejected" );
intf_UserFatal( p_access, false, _("Network interaction failed"),
dialog_Fatal( p_access, _("Network interaction failed"),
_("VLC's connection to the given server was rejected.") );
return -1;
}
......@@ -207,7 +207,7 @@ static int Login( vlc_object_t *p_access, access_sys_t *p_sys )
if( i_answer / 100 != 2 )
{
msg_Err( p_access, "account rejected" );
intf_UserFatal( p_access, false,
dialog_Fatal( p_access,
_("Network interaction failed"),
_("Your account was rejected.") );
return -1;
......@@ -217,16 +217,14 @@ static int Login( vlc_object_t *p_access, access_sys_t *p_sys )
default:
msg_Err( p_access, "password rejected" );
intf_UserFatal( p_access, false,
_("Network interaction failed"),
dialog_Fatal( p_access, _("Network interaction failed"),
_("Your password was rejected.") );
return -1;
}
break;
default:
msg_Err( p_access, "user rejected" );
intf_UserFatal( p_access, false,
_("Network interaction failed"),
dialog_Fatal( p_access, _("Network interaction failed"),
_("Your connection attempt to the server was rejected.") );
return -1;
}
......
......@@ -28,7 +28,7 @@
#include <vlc_access.h>
#include <vlc_input.h>
#include <vlc_charset.h>
#include <vlc_interface.h>
#include <vlc_dialog.h>
#include <assert.h>
......@@ -226,7 +226,7 @@ static block_t *Block (access_t *p_access)
if (addr == MAP_FAILED)
{
msg_Err (p_access, "memory mapping failed (%m)");
intf_UserFatal (p_access, false, _("File reading failed"),
dialog_Fatal (p_access, _("File reading failed"),
_("VLC could not read the file."));
goto fatal;
}
......
......@@ -34,7 +34,7 @@
#include <vlc_plugin.h>
#include <vlc_input.h>
#include <vlc_access.h>
#include <vlc_interface.h>
#include <vlc_dialog.h>
#include <assert.h>
#include <errno.h>
......@@ -215,7 +215,7 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len )
default:
msg_Err( p_access, "read failed (%m)" );
intf_UserFatal( p_access, false, _( "File reading failed" ),
dialog_Fatal( p_access, _( "File reading failed" ),
_( "VLC could not read the file." ) );
p_access->info.b_eof = true;
return 0;
......@@ -303,7 +303,7 @@ static int open_file( access_t *p_access, const char *path )
if( fd == -1 )
{
msg_Err( p_access, "cannot open file %s (%m)", path );
intf_UserFatal( p_access, false, _( "File reading failed" ),
dialog_Fatal( p_access, _( "File reading failed" ),
_( "VLC could not open the file \"%s\"." ), path );
return -1;
}
......
......@@ -31,7 +31,7 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_access.h>
#include <vlc_interface.h>
#include <vlc_dialog.h>
#include <vlc_network.h>
#include "rtsp.h"
......@@ -95,7 +95,7 @@ static int RtspConnect( void *p_userdata, char *psz_server, int i_port )
if( p_sys->fd < 0 )
{
msg_Err( p_access, "cannot connect to %s:%d", psz_server, i_port );
intf_UserFatal( p_access, false, _("Connection failed"),
dialog_Fatal( p_access, _("Connection failed"),
_("VLC could not connect to \"%s:%d\"."), psz_server, i_port );
return VLC_EGENERIC;
}
......@@ -236,7 +236,7 @@ static int Open( vlc_object_t *p_this )
msg_Err( p_access, "rtsp session can not be established" );
intf_UserFatal( p_access, false, _("Session failed"),
dialog_Fatal( p_access, _("Session failed"),
_("The requested RTSP session could not be established.") );
goto error;
}
......
......@@ -35,7 +35,7 @@
#include <vlc_plugin.h>
#include <errno.h> /* ENOMEM */
#include <vlc_interface.h>
#include <vlc_dialog.h>
#include <vlc_aout.h>
......@@ -324,7 +324,7 @@ static int Open( vlc_object_t *p_this )
if( (psz_device = config_GetPsz( p_aout, "alsa-audio-device" )) == NULL )
{
msg_Err( p_aout, "no audio device given (maybe \"default\" ?)" );
intf_UserFatal( p_aout, false, _("No Audio Device"),
dialog_Fatal( p_aout, _("No Audio Device"),
_("No audio device name was given. You might want to " \
"enter \"default\".") );
free( p_sys );
......@@ -432,7 +432,7 @@ static int Open( vlc_object_t *p_this )
{
msg_Err( p_aout, "cannot open ALSA device `%s' (%s)",
psz_iec_device, snd_strerror( i_snd_rc ) );
intf_UserFatal( p_aout, false, _("Audio output failed"),
dialog_Fatal( p_aout, _("Audio output failed"),
_("VLC could not open the ALSA device \"%s\" (%s)."),
psz_iec_device, snd_strerror( i_snd_rc ) );
free( p_sys );
......@@ -471,7 +471,7 @@ static int Open( vlc_object_t *p_this )
{
msg_Err( p_aout, "audio device: %s is already in use",
psz_device );
intf_UserFatal( p_aout, false, _("Audio output failed"),
dialog_Fatal( p_aout, _("Audio output failed"),
_("The audio device \"%s\" is already in use."),
psz_device );
}
......@@ -483,7 +483,7 @@ static int Open( vlc_object_t *p_this )
{
msg_Err( p_aout, "cannot open ALSA device `%s' (%s)",
psz_device, snd_strerror( i_snd_rc ) );
intf_UserFatal( p_aout, false, _("Audio output failed"),
dialog_Fatal( p_aout, _("Audio output failed"),
_("VLC could not open the ALSA device \"%s\" (%s)."),
psz_device, snd_strerror( i_snd_rc ) );
free( p_sys );
......
......@@ -32,7 +32,7 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_interface.h>
#include <vlc_dialog.h>
#include <vlc_aout.h>
#include <CoreAudio/CoreAudio.h>
......@@ -243,7 +243,7 @@ static int Open( vlc_object_t * p_this )
if( p_sys->i_hog_pid != -1 && p_sys->i_hog_pid != getpid() )
{
msg_Err( p_aout, "Selected audio device is exclusively in use by another program." );
intf_UserFatal( p_aout, false, _("Audio output failed"),
dialog_Fatal( p_aout, _("Audio output failed"),
_("The selected audio output device is exclusively in "
"use by another program.") );
goto error;
......@@ -428,7 +428,7 @@ static int OpenAnalog( aout_instance_t *p_aout )
{
p_aout->output.output.i_physical_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT;
msg_Err( p_aout, "You should configure your speaker layout with Audio Midi Setup Utility in /Applications/Utilities. Now using Stereo mode." );
intf_UserFatal( p_aout, false, _("Audio device is not configured"),
dialog_Fatal( p_aout, _("Audio device is not configured"),
_("You should configure your speaker layout with "
"the \"Audio Midi Setup\" utility in /Applications/"
"Utilities. Stereo mode is being used now.") );
......
......@@ -37,7 +37,7 @@
#include <vlc_aout.h>
#include <vlc_sout.h>
#include <vlc_codec.h>
#include <vlc_interface.h>
#include <vlc_dialog.h>
/* ffmpeg header */
#define HAVE_MMX 1
......@@ -223,7 +223,7 @@ int OpenEncoder( vlc_object_t *p_this )
if( p_enc->fmt_out.i_cat == VIDEO_ES && i_cat != VIDEO_ES )
{
msg_Err( p_enc, "\"%s\" is not a video encoder", psz_namecodec );
intf_UserFatal( p_enc, false, _("Streaming / Transcoding failed"),
dialog_Fatal( p_enc, _("Streaming / Transcoding failed"),
_("\"%s\" is no video encoder."), psz_namecodec );
return VLC_EGENERIC;
}
......@@ -231,7 +231,7 @@ int OpenEncoder( vlc_object_t *p_this )
if( p_enc->fmt_out.i_cat == AUDIO_ES && i_cat != AUDIO_ES )
{
msg_Err( p_enc, "\"%s\" is not an audio encoder", psz_namecodec );
intf_UserFatal( p_enc, false, _("Streaming / Transcoding failed"),
dialog_Fatal( p_enc, _("Streaming / Transcoding failed"),
_("\"%s\" is no audio encoder."), psz_namecodec );
return VLC_EGENERIC;
}
......@@ -247,7 +247,7 @@ int OpenEncoder( vlc_object_t *p_this )
"*** Please check with your FFMPEG packager. ***\n"
"*** This is NOT a VLC media player issue. ***", psz_namecodec );
intf_UserFatal( p_enc, false, _("Streaming / Transcoding failed"), _(
dialog_Fatal( p_enc, _("Streaming / Transcoding failed"), _(
/* I have had enough of all these MPEG-3 transcoding bug reports.
* Downstream packager, you had better not patch this out, or I will be really
* annoyed. Think about it - you don't want to fork the VLC translation files,
......@@ -673,7 +673,7 @@ int OpenEncoder( vlc_object_t *p_this )
{
vlc_mutex_unlock( &avcodec_lock );
msg_Err( p_enc, "cannot open encoder" );
intf_UserFatal( p_enc, false,
dialog_Fatal( p_enc,
_("Streaming / Transcoding failed"),
_("VLC could not open the encoder.") );
free( p_sys );
......@@ -683,7 +683,7 @@ int OpenEncoder( vlc_object_t *p_this )
else
{
msg_Err( p_enc, "cannot open encoder" );
intf_UserFatal( p_enc, false, _("Streaming / Transcoding failed"),
dialog_Fatal( p_enc, _("Streaming / Transcoding failed"),
_("VLC could not open the encoder.") );
free( p_sys );
return VLC_EGENERIC;
......
......@@ -32,7 +32,7 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_demux.h>
#include <vlc_interface.h>
#include <vlc_dialog.h>
#include <vlc_meta.h>
#include <vlc_access.h> /* GET_PRIVATE_ID_STATE */
......@@ -175,7 +175,7 @@ static int Demux( demux_t *p_demux )
if( DemuxInit( p_demux ) )
{
msg_Err( p_demux, "failed to load the new header" );
intf_UserFatal( p_demux, false, _("Could not demux ASF stream"),
dialog_Fatal( p_demux, _("Could not demux ASF stream"),
_("VLC failed to load the ASF header.") );
return 0;
}
......
......@@ -42,6 +42,7 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_interface.h>
#include <vlc_dialog.h>
#include <vlc_meta.h>
#include <vlc_md5.h>
#include <vlc_stream.h>
......@@ -288,7 +289,7 @@ static void Run( intf_thread_t *p_intf )
case VLC_ENOVAR:
/* username not set */
intf_UserFatal( p_intf, false,
dialog_Fatal( p_intf,
_("Last.fm username not set"),
_("Please set a username or disable the "
"audioscrobbler plugin, and restart VLC.\n"
......@@ -807,7 +808,7 @@ static int Handshake( intf_thread_t *p_this )
if ( p_buffer_pos )
{
/* authentication failed, bad username/password combination */
intf_UserFatal( p_this, false,
dialog_Fatal( p_this,
_("last.fm: Authentication failed"),
_("last.fm username or password is incorrect. "
"Please verify your settings and relaunch VLC." ) );
......
......@@ -33,7 +33,7 @@
#include <vlc_plugin.h>
#include <vlc_input.h>
#include <vlc_sout.h>
#include <vlc_interface.h>
#include <vlc_dialog.h>
/*****************************************************************************
* Module descriptor
......@@ -369,7 +369,7 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
{
msg_Err( p_stream, "no suitable sout access module for `%s/%s://%s'",
psz_access, psz_mux, psz_dst );
intf_UserFatal( p_stream, false,
dialog_Fatal( p_stream,
_("Streaming / Transcoding failed"),
_("There is no suitable stream-output access module for \"%s/%s://%s\"."),
psz_access,
......@@ -384,7 +384,7 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
{
msg_Err( p_stream, "no suitable sout mux module for `%s/%s://%s'",
psz_access, psz_mux, psz_dst );
intf_UserFatal( p_stream, false,
dialog_Fatal( p_stream,
_("Streaming / Transcoding failed"),
_("There is no suitable stream-output access module "\
"for \"%s/%s://%s\"."),
......
......@@ -34,7 +34,7 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_vout.h>
#include <vlc_interface.h>
#include <vlc_dialog.h>
#include "filter_common.h"
......@@ -375,7 +375,7 @@ static int Init( vout_thread_t *p_vout )
if( p_vout->p_sys->p_vout == NULL )
{
msg_Err( p_vout, "failed to create vout" );
intf_UserFatal( p_vout, false, _("Cropping failed"),
dialog_Fatal( p_vout, _("Cropping failed"),
_("VLC could not open the video output module.") );
return VLC_EGENERIC;
}
......@@ -471,7 +471,7 @@ static int Manage( vout_thread_t *p_vout )
if( p_vout->p_sys->p_vout == NULL )
{
msg_Err( p_vout, "failed to create vout" );
intf_UserFatal( p_vout, false, _("Cropping failed"),
dialog_Fatal( p_vout, _("Cropping failed"),
_("VLC could not open the video output module.") );
return VLC_EGENERIC;
}
......
......@@ -29,7 +29,7 @@
#endif
#include <vlc_common.h>
#include <vlc_interface.h>
#include <vlc_dialog.h>
#ifdef HAVE_ALLOCA_H
# include <alloca.h>
......@@ -156,9 +156,9 @@ int aout_FiltersCreatePipeline( aout_instance_t * p_aout,
if( *pi_nb_filters + 1 > AOUT_MAX_FILTERS )
{
msg_Err( p_aout, "max filter reached (%d)", AOUT_MAX_FILTERS );
intf_UserFatal( p_aout, false, _("Audio filtering failed"),
_("The maximum number of filters (%d) was reached."),
AOUT_MAX_FILTERS );
dialog_Fatal( p_aout, _("Audio filtering failed"),
_("The maximum number of filters (%d) was reached."),
AOUT_MAX_FILTERS );
return -1;
}
......@@ -203,9 +203,9 @@ int aout_FiltersCreatePipeline( aout_instance_t * p_aout,
{
ReleaseFilter( pp_filters[0] );
msg_Err( p_aout, "max filter reached (%d)", AOUT_MAX_FILTERS );
intf_UserFatal( p_aout, false, _("Audio filtering failed"),
_("The maximum number of filters (%d) was reached."),
AOUT_MAX_FILTERS );
dialog_Fatal( p_aout, _("Audio filtering failed"),
_("The maximum number of filters (%d) was reached."),
AOUT_MAX_FILTERS );
return -1;
}
pp_filters[1] = FindFilter( p_aout, &pp_filters[0]->output,
......@@ -226,9 +226,9 @@ int aout_FiltersCreatePipeline( aout_instance_t * p_aout,
{
ReleaseFilter( pp_filters[0] );
msg_Err( p_aout, "max filter reached (%d)", AOUT_MAX_FILTERS );
intf_UserFatal( p_aout, false, _("Audio filtering failed"),
_("The maximum number of filters (%d) was reached."),
AOUT_MAX_FILTERS );
dialog_Fatal( p_aout, _("Audio filtering failed"),
_("The maximum number of filters (%d) was reached."),
AOUT_MAX_FILTERS );
return -1;
}
pp_filters[1] = FindFilter( p_aout, &pp_filters[0]->output,
......
......@@ -40,8 +40,8 @@
#include <vlc_codec.h>
#include <vlc_osd.h>
#include <vlc_meta.h>
#include <vlc_dialog.h>
#include <vlc_interface.h>
#include "audio_output/aout_internal.h"
#include "stream_output/stream_output.h"
#include "input_internal.h"
......@@ -274,8 +274,8 @@ decoder_t *input_DecoderNew( input_thread_t *p_input,
if( p_dec == NULL )
{
msg_Err( p_input, "could not create packetizer" );
intf_UserFatal( p_input, false, _("Streaming / Transcoding failed"),
_("VLC could not open the packetizer module.") );
dialog_Fatal( p_input, _("Streaming / Transcoding failed"),
_("VLC could not open the packetizer module.") );
return NULL;
}
}
......@@ -287,8 +287,8 @@ decoder_t *input_DecoderNew( input_thread_t *p_input,
if( p_dec == NULL )
{
msg_Err( p_input, "could not create decoder" );
intf_UserFatal( p_input, false, _("Streaming / Transcoding failed"),
_("VLC could not open the decoder module.") );
dialog_Fatal( p_input, _("Streaming / Transcoding failed"),
_("VLC could not open the decoder module.") );
return NULL;
}
}
......@@ -440,8 +440,8 @@ int input_DecoderSetCcState( decoder_t *p_dec, bool b_decode, int i_channel )
if( !p_cc )
{
msg_Err( p_dec, "could not create decoder" );
intf_UserFatal( p_dec, false, _("Streaming / Transcoding failed"),
_("VLC could not open the decoder module.") );
dialog_Fatal( p_dec, _("Streaming / Transcoding failed"),
_("VLC could not open the decoder module.") );
return VLC_EGENERIC;
}
else if( !p_cc->p_module )
......@@ -674,9 +674,10 @@ static void DecoderUnsupportedCodec( decoder_t *p_dec, vlc_fourcc_t codec )
msg_Err( p_dec, "no suitable decoder module for fourcc `%4.4s'.\n"
"VLC probably does not support this sound or video format.",
(char*)&codec );
intf_UserFatal( p_dec, false, _("No suitable decoder module"),
_("VLC does not support the audio or video format \"%4.4s\". "
"Unfortunately there is no way for you to fix this."), (char*)&codec );
dialog_Fatal( p_dec, _("No suitable decoder module"),
_("VLC does not support the audio or video format \"%4.4s\". "
"Unfortunately there is no way for you to fix this."),
(char*)&codec );
}
......
......@@ -48,7 +48,7 @@
#include <vlc_sout.h>
#include "../stream_output/stream_output.h"
#include <vlc_interface.h>
#include <vlc_dialog.h>
#include <vlc_url.h>
#include <vlc_charset.h>
#include <vlc_strings.h>
......@@ -2389,9 +2389,8 @@ static int InputSourceInit( input_thread_t *p_input,
{
msg_Err( p_input, "open of `%s' failed: %s", psz_mrl,
msg_StackMsg() );
intf_UserFatal( VLC_OBJECT( p_input), false,
_("Your input can't be opened"),
_("VLC is unable to open the MRL '%s'."
dialog_Fatal( p_input, _("Your input can't be opened"),
_("VLC is unable to open the MRL '%s'."
" Check the log for details."), psz_mrl );
goto error;
}
......@@ -2521,9 +2520,9 @@ static int InputSourceInit( input_thread_t *p_input,
{
msg_Err( p_input, "no suitable demux module for `%s/%s://%s'",
psz_access, psz_demux, psz_path );
intf_UserFatal( VLC_OBJECT( p_input ), false,
_("VLC can't recognize the input's format"),
_("The format of '%s' cannot be detected. "
dialog_Fatal( VLC_OBJECT( p_input ),
_("VLC can't recognize the input's format"),
_("The format of '%s' cannot be detected. "
"Have a look at the log for details."), psz_mrl );
goto error;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment