Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
f25dd402
Commit
f25dd402
authored
Dec 22, 2000
by
Sam Hocevar
Browse files
. no need to add "\n" at the end of intf_*Msg() messages anymore.
parent
174e0547
Changes
65
Hide whitespace changes
Inline
Side-by-side
plugins/alsa/aout_alsa.c
View file @
f25dd402
...
...
@@ -85,8 +85,8 @@ int aout_AlsaOpen( aout_thread_t *p_aout )
p_aout
->
p_sys
=
malloc
(
sizeof
(
aout_sys_t
)
);
if
(
p_aout
->
p_sys
==
NULL
)
{
intf_ErrMsg
(
"Alsa Plugin : Could not allocate memory
\n
"
);
intf_ErrMsg
(
"error: %s
\n
"
,
strerror
(
ENOMEM
)
);
intf_ErrMsg
(
"Alsa Plugin : Could not allocate memory"
);
intf_ErrMsg
(
"error: %s"
,
strerror
(
ENOMEM
)
);
return
(
1
);
}
...
...
@@ -105,13 +105,13 @@ int aout_AlsaOpen( aout_thread_t *p_aout )
p_aout
->
p_sys
->
s_alsa_device
.
i_num
,
SND_PCM_OPEN_PLAYBACK
)
)
)
{
intf_ErrMsg
(
"Could not open alsa device; exit = %i
\n
"
,
i_open_returns
);
intf_ErrMsg
(
"This means : %s
\n\n
"
,
snd_strerror
(
i_open_returns
)
);
intf_ErrMsg
(
"Could not open alsa device; exit = %i"
,
i_open_returns
);
intf_ErrMsg
(
"This means : %s"
,
snd_strerror
(
i_open_returns
)
);
return
(
1
);
}
intf_DbgMsg
(
"Alsa plugin : Alsa device successfully opened
\n
"
);
intf_DbgMsg
(
"Alsa plugin : Alsa device successfully opened"
);
return
(
0
);
}
...
...
@@ -169,9 +169,9 @@ int aout_AlsaSetFormat ( aout_thread_t *p_aout )
if
(
i_set_param_returns
)
{
intf_ErrMsg
(
"ALSA_PLUGIN : Unable to set parameters; exit = %i
\n
"
,
intf_ErrMsg
(
"ALSA_PLUGIN : Unable to set parameters; exit = %i"
,
i_set_param_returns
);
intf_ErrMsg
(
"This means : %s
\n\n
"
,
intf_ErrMsg
(
"This means : %s"
,
snd_strerror
(
i_set_param_returns
)
);
return
(
1
);
}
...
...
@@ -182,9 +182,9 @@ int aout_AlsaSetFormat ( aout_thread_t *p_aout )
if
(
i_prepare_playback_returns
)
{
intf_ErrMsg
(
"ALSA_PLUGIN : Unable to prepare channel : exit = %i
\n
"
,
intf_ErrMsg
(
"ALSA_PLUGIN : Unable to prepare channel : exit = %i"
,
i_prepare_playback_returns
);
intf_ErrMsg
(
"This means : %s
\n\n
"
,
intf_ErrMsg
(
"This means : %s"
,
snd_strerror
(
i_set_param_returns
)
);
return
(
1
);
...
...
@@ -196,8 +196,8 @@ int aout_AlsaSetFormat ( aout_thread_t *p_aout )
if
(
i_playback_go_returns
)
{
intf_ErrMsg
(
"ALSA_PLUGIN : Unable to prepare channel (bis) :
exit = %i
\n
"
,
i_playback_go_returns
);
intf_ErrMsg
(
"This means : %s
\n\n
"
,
exit = %i"
,
i_playback_go_returns
);
intf_ErrMsg
(
"This means : %s"
,
snd_strerror
(
i_set_param_returns
)
);
return
(
1
);
}
...
...
@@ -252,31 +252,31 @@ long aout_AlsaGetBufInfo ( aout_thread_t *p_aout, long l_buffer_limit )
if
(
i_alsa_get_status_returns
)
{
intf_ErrMsg
(
"Error getting alsa buffer info; exit=%i
\n
"
,
intf_ErrMsg
(
"Error getting alsa buffer info; exit=%i"
,
i_alsa_get_status_returns
);
intf_ErrMsg
(
"This means : %s
\n\n
"
,
intf_ErrMsg
(
"This means : %s"
,
snd_strerror
(
i_alsa_get_status_returns
)
);
return
(
1
);
}
switch
(
alsa_channel_status
.
status
)
{
case
SND_PCM_STATUS_NOTREADY
:
intf_ErrMsg
(
"Status NOT READY
\n
\n
"
);
case
SND_PCM_STATUS_NOTREADY
:
intf_ErrMsg
(
"Status NOT READY"
);
break
;
case
SND_PCM_STATUS_UNDERRUN
:
{
int
i_prepare_returns
;
intf_ErrMsg
(
"Status UNDERRUN ... reseting queue
\n
\n
"
);
"Status UNDERRUN ... reseting queue"
);
i_prepare_returns
=
snd_pcm_playback_prepare
(
p_aout
->
p_sys
->
p_alsa_handle
);
if
(
i_prepare_returns
)
{
intf_ErrMsg
(
"Error : could not flush : %i
\n
"
,
"Error : could not flush : %i"
,
i_prepare_returns
);
intf_ErrMsg
(
"This means : %s
\n
"
,
"This means : %s"
,
snd_strerror
(
i_prepare_returns
));
}
break
;
...
...
@@ -297,8 +297,8 @@ void aout_AlsaPlaySamples ( aout_thread_t *p_aout, byte_t *buffer, int i_size )
if
(
i_write_returns
<=
0
)
{
intf_ErrMsg
(
"Error writing blocks; exit=%i
\n
"
,
i_write_returns
);
intf_ErrMsg
(
"This means : %s
\n
"
,
snd_strerror
(
i_write_returns
)
);
intf_ErrMsg
(
"Error writing blocks; exit=%i"
,
i_write_returns
);
intf_ErrMsg
(
"This means : %s"
,
snd_strerror
(
i_write_returns
)
);
}
}
...
...
@@ -313,10 +313,10 @@ void aout_AlsaClose ( aout_thread_t *p_aout )
if
(
i_close_returns
)
{
intf_ErrMsg
(
"Error closing alsa device; exit=%i
\n
"
,
i_close_returns
);
intf_ErrMsg
(
"This means : %s
\n\n
"
,
snd_strerror
(
i_close_returns
)
);
intf_ErrMsg
(
"Error closing alsa device; exit=%i"
,
i_close_returns
);
intf_ErrMsg
(
"This means : %s"
,
snd_strerror
(
i_close_returns
)
);
}
free
(
p_aout
->
p_sys
);
intf_DbgMsg
(
"Alsa plugin : Alsa device closed
\n
"
);
intf_DbgMsg
(
"Alsa plugin : Alsa device closed"
);
}
plugins/beos/aout_beos.cpp
View file @
f25dd402
...
...
@@ -83,7 +83,7 @@ int aout_BeOpen( aout_thread_t *p_aout )
p_aout
->
p_sys
=
(
aout_sys_t
*
)
malloc
(
sizeof
(
aout_sys_t
)
);
if
(
p_aout
->
p_sys
==
NULL
)
{
intf_ErrMsg
(
"error: %s
\n
"
,
strerror
(
ENOMEM
)
);
intf_ErrMsg
(
"error: %s"
,
strerror
(
ENOMEM
)
);
return
(
1
);
}
...
...
@@ -92,7 +92,7 @@ int aout_BeOpen( aout_thread_t *p_aout )
if
(
p_aout
->
p_sys
->
p_format
==
NULL
)
{
free
(
p_aout
->
p_sys
);
intf_ErrMsg
(
"error: cannot allocate memory for gs_audio_format
\n
"
);
intf_ErrMsg
(
"error: cannot allocate memory for gs_audio_format"
);
return
(
1
);
}
...
...
@@ -117,7 +117,7 @@ int aout_BeOpen( aout_thread_t *p_aout )
{
free
(
p_aout
->
p_sys
->
p_format
);
free
(
p_aout
->
p_sys
);
intf_ErrMsg
(
"error: cannot allocate memory for BPushGameSound
\n
"
);
intf_ErrMsg
(
"error: cannot allocate memory for BPushGameSound"
);
return
(
1
);
}
...
...
@@ -125,7 +125,7 @@ int aout_BeOpen( aout_thread_t *p_aout )
{
free
(
p_aout
->
p_sys
->
p_format
);
free
(
p_aout
->
p_sys
);
intf_ErrMsg
(
"error: cannot allocate memory for BPushGameSound
\n
"
);
intf_ErrMsg
(
"error: cannot allocate memory for BPushGameSound"
);
return
(
1
);
}
...
...
plugins/beos/intf_beos.cpp
View file @
f25dd402
...
...
@@ -133,7 +133,7 @@ int intf_BeCreate( intf_thread_t *p_intf )
p_intf
->
p_sys
=
(
intf_sys_t
*
)
malloc
(
sizeof
(
intf_sys_t
)
);
if
(
p_intf
->
p_sys
==
NULL
)
{
intf_ErrMsg
(
"error: %s
\n
"
,
strerror
(
ENOMEM
));
intf_ErrMsg
(
"error: %s"
,
strerror
(
ENOMEM
));
return
(
1
);
}
p_intf
->
p_sys
->
i_key
=
-
1
;
...
...
@@ -144,7 +144,7 @@ int intf_BeCreate( intf_thread_t *p_intf )
if
(
p_intf
->
p_sys
->
p_window
==
0
)
{
free
(
p_intf
->
p_sys
);
intf_ErrMsg
(
"error: cannot allocate memory for InterfaceWindow
\n
"
);
intf_ErrMsg
(
"error: cannot allocate memory for InterfaceWindow"
);
return
(
1
);
}
...
...
@@ -154,7 +154,7 @@ int intf_BeCreate( intf_thread_t *p_intf )
p_intf
->
p_vout
=
vout_CreateThread
(
NULL
,
0
,
0
,
0
,
NULL
,
0
,
NULL
);
if
(
p_intf
->
p_vout
==
NULL
)
/* error */
{
intf_ErrMsg
(
"intf error: can't create output thread
\n
"
);
intf_ErrMsg
(
"intf error: can't create output thread"
);
return
(
1
);
}
}
...
...
plugins/beos/vout_beos.cpp
View file @
f25dd402
...
...
@@ -351,7 +351,7 @@ int vout_BeCreate( vout_thread_t *p_vout, char *psz_display,
p_vout
->
p_sys
=
(
vout_sys_t
*
)
malloc
(
sizeof
(
vout_sys_t
)
);
if
(
p_vout
->
p_sys
==
NULL
)
{
intf_ErrMsg
(
"error: %s
\n
"
,
strerror
(
ENOMEM
)
);
intf_ErrMsg
(
"error: %s"
,
strerror
(
ENOMEM
)
);
return
(
1
);
}
...
...
@@ -362,7 +362,7 @@ int vout_BeCreate( vout_thread_t *p_vout, char *psz_display,
/* Open and initialize device */
if
(
BeosOpenDisplay
(
p_vout
)
)
{
intf_ErrMsg
(
"vout error: can't open display
\n
"
);
intf_ErrMsg
(
"vout error: can't open display"
);
free
(
p_vout
->
p_sys
);
return
(
1
);
}
...
...
@@ -390,7 +390,7 @@ int vout_BeInit( vout_thread_t *p_vout )
p_vout
->
p_sys
->
pp_buffer
[
1
]
=
(
byte_t
*
)
malloc
(
i_page_size
);
if
(
p_vout
->
p_sys
->
pp_buffer
[
0
]
==
NULL
||
p_vout
->
p_sys
->
pp_buffer
[
0
]
==
NULL
)
{
intf_ErrMsg
(
"vout error: can't allocate video memory (%s)
\n
"
,
strerror
(
errno
)
);
intf_ErrMsg
(
"vout error: can't allocate video memory (%s)"
,
strerror
(
errno
)
);
if
(
p_vout
->
p_sys
->
pp_buffer
[
0
]
!=
NULL
)
free
(
p_vout
->
p_sys
->
pp_buffer
[
0
]
);
if
(
p_vout
->
p_sys
->
pp_buffer
[
1
]
!=
NULL
)
free
(
p_vout
->
p_sys
->
pp_buffer
[
1
]
);
p_win
->
locker
->
Unlock
();
...
...
@@ -443,7 +443,7 @@ int vout_BeManage( vout_thread_t *p_vout )
{
if
(
p_vout
->
i_changes
&
VOUT_SIZE_CHANGE
)
{
intf_DbgMsg
(
"resizing window
\n
"
);
intf_DbgMsg
(
"resizing window"
);
p_vout
->
i_changes
&=
~
VOUT_SIZE_CHANGE
;
/* Resize window */
...
...
@@ -455,14 +455,14 @@ int vout_BeManage( vout_thread_t *p_vout )
/* Recreate XImages. If SysInit failed, the thread can't go on. */
if
(
vout_BeInit
(
p_vout
)
)
{
intf_ErrMsg
(
"error: can't resize display
\n
"
);
intf_ErrMsg
(
"error: can't resize display"
);
return
(
1
);
}
/* Tell the video output thread that it will need to rebuild YUV
* tables. This is needed since convertion buffer size may have changed */
p_vout
->
i_changes
|=
VOUT_YUV_CHANGE
;
intf_Msg
(
"Video display resized (%dx%d)
\n
"
,
p_vout
->
i_width
,
p_vout
->
i_height
);
intf_Msg
(
"Video display resized (%dx%d)"
,
p_vout
->
i_width
,
p_vout
->
i_height
);
}
return
(
0
);
}
...
...
@@ -503,7 +503,7 @@ static int BeosOpenDisplay( vout_thread_t *p_vout )
if
(
p_vout
->
p_sys
->
p_window
==
0
)
{
free
(
p_vout
->
p_sys
);
intf_ErrMsg
(
"error: cannot allocate memory for VideoWindow
\n
"
);
intf_ErrMsg
(
"error: cannot allocate memory for VideoWindow"
);
return
(
1
);
}
VideoWindow
*
p_win
=
p_vout
->
p_sys
->
p_window
;
...
...
@@ -519,7 +519,7 @@ static int BeosOpenDisplay( vout_thread_t *p_vout )
switch
(
p_vout
->
i_screen_depth
)
{
case
8
:
intf_ErrMsg
(
"vout error: 8 bit mode not fully supported
\n
"
);
intf_ErrMsg
(
"vout error: 8 bit mode not fully supported"
);
break
;
case
15
:
p_vout
->
i_red_mask
=
0x7c00
;
...
...
plugins/dsp/aout_dsp.c
View file @
f25dd402
...
...
@@ -85,7 +85,7 @@ int aout_DspOpen( aout_thread_t *p_aout )
p_aout
->
p_sys
=
malloc
(
sizeof
(
aout_sys_t
)
);
if
(
p_aout
->
p_sys
==
NULL
)
{
intf_ErrMsg
(
"error: %s
\n
"
,
strerror
(
ENOMEM
)
);
intf_ErrMsg
(
"error: %s"
,
strerror
(
ENOMEM
)
);
return
(
1
);
}
...
...
@@ -98,7 +98,7 @@ int aout_DspOpen( aout_thread_t *p_aout )
/* Open the sound device */
if
(
(
p_aout
->
i_fd
=
open
(
p_aout
->
psz_device
,
O_WRONLY
|
O_NONBLOCK
))
<
0
)
{
intf_ErrMsg
(
"aout error: can't open audio device (%s)
\n
"
,
p_aout
->
psz_device
);
intf_ErrMsg
(
"aout error: can't open audio device (%s)"
,
p_aout
->
psz_device
);
return
(
-
1
);
}
...
...
@@ -112,7 +112,7 @@ int aout_DspReset( aout_thread_t *p_aout )
{
if
(
ioctl
(
p_aout
->
i_fd
,
SNDCTL_DSP_RESET
,
NULL
)
<
0
)
{
intf_ErrMsg
(
"aout error: can't reset audio device (%s)
\n
"
,
p_aout
->
psz_device
);
intf_ErrMsg
(
"aout error: can't reset audio device (%s)"
,
p_aout
->
psz_device
);
return
(
-
1
);
}
...
...
@@ -133,13 +133,13 @@ int aout_DspSetFormat( aout_thread_t *p_aout )
i_format
=
p_aout
->
i_format
;
if
(
ioctl
(
p_aout
->
i_fd
,
SNDCTL_DSP_SETFMT
,
&
i_format
)
<
0
)
{
intf_ErrMsg
(
"aout error: can't set audio output format (%i)
\n
"
,
p_aout
->
i_format
);
intf_ErrMsg
(
"aout error: can't set audio output format (%i)"
,
p_aout
->
i_format
);
return
(
-
1
);
}
if
(
i_format
!=
p_aout
->
i_format
)
{
intf_DbgMsg
(
"aout debug: audio output format not supported (%i)
\n
"
,
p_aout
->
i_format
);
intf_DbgMsg
(
"aout debug: audio output format not supported (%i)"
,
p_aout
->
i_format
);
p_aout
->
i_format
=
i_format
;
}
...
...
@@ -157,13 +157,13 @@ int aout_DspSetChannels( aout_thread_t *p_aout )
if
(
ioctl
(
p_aout
->
i_fd
,
SNDCTL_DSP_STEREO
,
&
b_stereo
)
<
0
)
{
intf_ErrMsg
(
"aout error: can't set number of audio channels (%i)
\n
"
,
p_aout
->
i_channels
);
intf_ErrMsg
(
"aout error: can't set number of audio channels (%i)"
,
p_aout
->
i_channels
);
return
(
-
1
);
}
if
(
b_stereo
!=
p_aout
->
b_stereo
)
{
intf_DbgMsg
(
"aout debug: number of audio channels not supported (%i)
\n
"
,
p_aout
->
i_channels
);
intf_DbgMsg
(
"aout debug: number of audio channels not supported (%i)"
,
p_aout
->
i_channels
);
p_aout
->
b_stereo
=
b_stereo
;
p_aout
->
i_channels
=
1
+
b_stereo
;
}
...
...
@@ -185,13 +185,13 @@ int aout_DspSetRate( aout_thread_t *p_aout )
l_rate
=
p_aout
->
l_rate
;
if
(
ioctl
(
p_aout
->
i_fd
,
SNDCTL_DSP_SPEED
,
&
l_rate
)
<
0
)
{
intf_ErrMsg
(
"aout error: can't set audio output rate (%li)
\n
"
,
p_aout
->
l_rate
);
intf_ErrMsg
(
"aout error: can't set audio output rate (%li)"
,
p_aout
->
l_rate
);
return
(
-
1
);
}
if
(
l_rate
!=
p_aout
->
l_rate
)
{
intf_DbgMsg
(
"aout debug: audio output rate not supported (%li)
\n
"
,
p_aout
->
l_rate
);
intf_DbgMsg
(
"aout debug: audio output rate not supported (%li)"
,
p_aout
->
l_rate
);
p_aout
->
l_rate
=
l_rate
;
}
...
...
plugins/dummy/intf_dummy.c
View file @
f25dd402
...
...
@@ -70,7 +70,7 @@ int intf_DummyCreate( intf_thread_t *p_intf )
p_intf
->
p_vout
=
vout_CreateThread
(
NULL
,
0
,
0
,
0
,
NULL
,
0
,
NULL
);
if
(
p_intf
->
p_vout
==
NULL
)
/* error */
{
intf_ErrMsg
(
"intf error: can't create output thread
\n
"
);
intf_ErrMsg
(
"intf error: can't create output thread"
);
return
(
1
);
}
}
...
...
plugins/dummy/vout_dummy.c
View file @
f25dd402
...
...
@@ -77,14 +77,14 @@ int vout_DummyCreate( vout_thread_t *p_vout, char *psz_display,
p_vout
->
p_sys
=
malloc
(
sizeof
(
vout_sys_t
)
);
if
(
p_vout
->
p_sys
==
NULL
)
{
intf_ErrMsg
(
"error: %s
\n
"
,
strerror
(
ENOMEM
)
);
intf_ErrMsg
(
"error: %s"
,
strerror
(
ENOMEM
)
);
return
(
1
);
}
/* Open and initialize device */
if
(
DummyOpenDisplay
(
p_vout
)
)
{
intf_ErrMsg
(
"vout error: can't open display
\n
"
);
intf_ErrMsg
(
"vout error: can't open display"
);
free
(
p_vout
->
p_sys
);
return
(
1
);
}
...
...
@@ -166,7 +166,7 @@ static int DummyOpenDisplay( vout_thread_t *p_vout )
p_vout
->
p_sys
->
p_video
=
malloc
(
p_vout
->
p_sys
->
i_page_size
*
2
);
if
(
(
int
)
p_vout
->
p_sys
->
p_video
==
-
1
)
{
intf_ErrMsg
(
"vout error: can't map video memory (%s)
\n
"
,
strerror
(
errno
)
);
intf_ErrMsg
(
"vout error: can't map video memory (%s)"
,
strerror
(
errno
)
);
return
(
1
);
}
...
...
plugins/esd/aout_esd.c
View file @
f25dd402
...
...
@@ -77,7 +77,7 @@ int aout_EsdOpen( aout_thread_t *p_aout )
p_aout
->
p_sys
=
malloc
(
sizeof
(
aout_sys_t
)
);
if
(
p_aout
->
p_sys
==
NULL
)
{
intf_ErrMsg
(
"error: %s
\n
"
,
strerror
(
ENOMEM
)
);
intf_ErrMsg
(
"error: %s"
,
strerror
(
ENOMEM
)
);
return
(
1
);
}
...
...
@@ -103,7 +103,7 @@ int aout_EsdOpen( aout_thread_t *p_aout )
p_aout
->
l_rate
,
NULL
,
"vlc"
))
<
0
)
{
intf_ErrMsg
(
"aout error: can't open esound socket"
" (format 0x%08x at %ld Hz)
\n
"
,
" (format 0x%08x at %ld Hz)"
,
p_aout
->
p_sys
->
esd_format
,
p_aout
->
l_rate
);
return
(
-
1
);
}
...
...
@@ -176,7 +176,7 @@ void aout_EsdPlaySamples( aout_thread_t *p_aout, byte_t *buffer, int i_size )
amount
=
(
2
*
44100
*
(
ESD_BUF_SIZE
+
256
))
/
p_aout
->
l_rate
;
}
intf_DbgMsg
(
"aout: latency is %i
\n
"
,
amount
);
intf_DbgMsg
(
"aout: latency is %i"
,
amount
);
write
(
p_aout
->
i_fd
,
buffer
,
i_size
);
}
...
...
plugins/fb/intf_fb.c
View file @
f25dd402
...
...
@@ -97,7 +97,6 @@ int intf_FBCreate( intf_thread_t *p_intf )
{
return
(
1
);
};
intf_DbgMsg
(
"0x%x
\n
"
,
p_intf
);
/* Set tty and fb devices */
p_intf
->
p_sys
->
i_tty_dev
=
0
;
/* 0 == /dev/tty0 == current console */
...
...
@@ -135,7 +134,7 @@ int intf_FBCreate( intf_thread_t *p_intf )
if
(
sigaction
(
SIGUSR1
,
&
sig_tty
,
&
p_intf
->
p_sys
->
sig_usr1
)
||
sigaction
(
SIGUSR2
,
&
sig_tty
,
&
p_intf
->
p_sys
->
sig_usr2
)
)
{
intf_ErrMsg
(
"intf error: can't set up signal handler (%s)
\n
"
,
intf_ErrMsg
(
"intf error: can't set up signal handler (%s)"
,
strerror
(
errno
)
);
tcsetattr
(
0
,
0
,
&
p_intf
->
p_sys
->
old_termios
);
FBTextMode
(
p_intf
->
p_sys
->
i_tty_dev
);
...
...
@@ -146,7 +145,7 @@ int intf_FBCreate( intf_thread_t *p_intf )
if
(
ioctl
(
p_intf
->
p_sys
->
i_tty_dev
,
VT_GETMODE
,
&
p_intf
->
p_sys
->
vt_mode
)
==
-
1
)
{
intf_ErrMsg
(
"intf error: cant get terminal mode (%s)
\n
"
,
intf_ErrMsg
(
"intf error: cant get terminal mode (%s)"
,
strerror
(
errno
)
);
sigaction
(
SIGUSR1
,
&
p_intf
->
p_sys
->
sig_usr1
,
NULL
);
sigaction
(
SIGUSR2
,
&
p_intf
->
p_sys
->
sig_usr2
,
NULL
);
...
...
@@ -162,7 +161,7 @@ int intf_FBCreate( intf_thread_t *p_intf )
if
(
ioctl
(
p_intf
->
p_sys
->
i_tty_dev
,
VT_SETMODE
,
&
vt_mode
)
==
-
1
)
{
intf_ErrMsg
(
"intf error: can't set terminal mode (%s)
\n
"
,
intf_ErrMsg
(
"intf error: can't set terminal mode (%s)"
,
strerror
(
errno
)
);
sigaction
(
SIGUSR1
,
&
p_intf
->
p_sys
->
sig_usr1
,
NULL
);
sigaction
(
SIGUSR2
,
&
p_intf
->
p_sys
->
sig_usr2
,
NULL
);
...
...
@@ -180,7 +179,7 @@ int intf_FBCreate( intf_thread_t *p_intf )
NULL
,
0
,
NULL
);
if
(
p_intf
->
p_vout
==
NULL
)
/* XXX?? error */
{
intf_ErrMsg
(
"intf error: can't create output thread
\n
"
);
intf_ErrMsg
(
"intf error: can't create output thread"
);
ioctl
(
p_intf
->
p_sys
->
i_tty_dev
,
VT_SETMODE
,
&
p_intf
->
p_sys
->
vt_mode
);
sigaction
(
SIGUSR1
,
&
p_intf
->
p_sys
->
sig_usr1
,
NULL
);
...
...
@@ -238,7 +237,7 @@ void intf_FBManage( intf_thread_t *p_intf )
{
if
(
intf_ProcessKey
(
p_intf
,
(
int
)
buf
[
0
])
)
{
intf_ErrMsg
(
"unhandled key '%c' (%i)
\n
"
,
(
char
)
buf
[
0
],
buf
[
0
]
);
intf_ErrMsg
(
"unhandled key '%c' (%i)"
,
(
char
)
buf
[
0
],
buf
[
0
]
);
}
}
}
...
...
@@ -281,7 +280,7 @@ static void FBTextMode( int i_tty_dev )
/* return to text mode */
if
(
-
1
==
ioctl
(
i_tty_dev
,
KDSETMODE
,
KD_TEXT
))
{
intf_ErrMsg
(
"intf error: ioctl KDSETMODE
\n
"
);
intf_ErrMsg
(
"intf error: ioctl KDSETMODE"
);
}
}
...
...
@@ -290,7 +289,7 @@ static void FBGfxMode( int i_tty_dev )
/* switch to graphic mode */
if
(
-
1
==
ioctl
(
i_tty_dev
,
KDSETMODE
,
KD_GRAPHICS
))
{
intf_ErrMsg
(
"intf error: ioctl KDSETMODE
\n
"
);
intf_ErrMsg
(
"intf error: ioctl KDSETMODE"
);
}
}
...
...
plugins/fb/vout_fb.c
View file @
f25dd402
...
...
@@ -86,14 +86,14 @@ int vout_FBCreate( vout_thread_t *p_vout, char *psz_display,
p_vout
->
p_sys
=
malloc
(
sizeof
(
vout_sys_t
)
);
if
(
p_vout
->
p_sys
==
NULL
)
{
intf_ErrMsg
(
"error: %s
\n
"
,
strerror
(
ENOMEM
)
);
intf_ErrMsg
(
"error: %s"
,
strerror
(
ENOMEM
)
);
return
(
1
);
}
/* Open and initialize device */
if
(
FBOpenDisplay
(
p_vout
)
)
{
intf_ErrMsg
(
"vout error: can't open display
\n
"
);
intf_ErrMsg
(
"vout error: can't open display"
);
free
(
p_vout
->
p_sys
);
return
(
1
);
}
...
...
@@ -141,7 +141,7 @@ int vout_FBManage( vout_thread_t *p_vout )
*/
if
(
p_vout
->
i_changes
&
VOUT_SIZE_CHANGE
)
{
intf_DbgMsg
(
"resizing window
\n
"
);
intf_DbgMsg
(
"resizing window"
);
p_vout
->
i_changes
&=
~
VOUT_SIZE_CHANGE
;
/* Destroy XImages to change their size */
...
...
@@ -150,7 +150,7 @@ int vout_FBManage( vout_thread_t *p_vout )
/* Recreate XImages. If SysInit failed, the thread can't go on. */
if
(
vout_FBInit
(
p_vout
)
)
{
intf_ErrMsg
(
"error: can't resize display
\n
"
);
intf_ErrMsg
(
"error: can't resize display"
);
return
(
1
);
}
...
...
@@ -158,7 +158,7 @@ int vout_FBManage( vout_thread_t *p_vout )
/* Tell the video output thread that it will need to rebuild YUV
* tables. This is needed since conversion buffer size may have changed */
p_vout
->
i_changes
|=
VOUT_YUV_CHANGE
;
intf_Msg
(
"Video display resized (%dx%d)
\n
"
,
p_vout
->
i_width
,
p_vout
->
i_height
);
intf_Msg
(
"Video display resized (%dx%d)"
,
p_vout
->
i_width
,
p_vout
->
i_height
);
#endif
}
...
...
@@ -226,14 +226,14 @@ static int FBOpenDisplay( vout_thread_t *p_vout )
p_vout
->
p_sys
->
i_fb_dev
=
open
(
psz_device
,
O_RDWR
);
if
(
p_vout
->
p_sys
->
i_fb_dev
==
-
1
)
{
intf_ErrMsg
(
"vout error: can't open %s (%s)
\n
"
,
psz_device
,
strerror
(
errno
)
);
intf_ErrMsg
(
"vout error: can't open %s (%s)"
,
psz_device
,
strerror
(
errno
)
);
return
(
1
);
}
/* Get framebuffer device informations */
if
(
ioctl
(
p_vout
->
p_sys
->
i_fb_dev
,
FBIOGET_VSCREENINFO
,
&
p_vout
->
p_sys
->
var_info
)
)
{
intf_ErrMsg
(
"vout error: can't get framebuffer informations (%s)
\n
"
,
strerror
(
errno
)
);
intf_ErrMsg
(
"vout error: can't get framebuffer informations (%s)"
,
strerror
(
errno
)
);
close
(
p_vout
->
p_sys
->
i_fb_dev
);
return
(
1
);
}
...
...
@@ -245,12 +245,12 @@ static int FBOpenDisplay( vout_thread_t *p_vout )
p_vout
->
p_sys
->
var_info
.
activate
=
FB_ACTIVATE_NXTOPEN
;
p_vout
->
p_sys
->
var_info
.
xoffset
=
0
;
p_vout
->
p_sys
->
var_info
.
yoffset
=
0
;
intf_ErrMsg
(
"vout: ypanstep is %i
\n
"
,
fix_info
.
ypanstep
);
intf_ErrMsg
(
"vout: ypanstep is %i"
,
fix_info
.
ypanstep
);
/* XXX?? ask sam p_vout->p_sys->mode_info.sync = FB_SYNC_VERT_HIGH_ACT; */
if
(
ioctl
(
p_vout
->
p_sys
->
i_fb_dev
,
FBIOPUT_VSCREENINFO
,
&
p_vout
->
p_sys
->
var_info
)
)
{
intf_ErrMsg
(
"vout error: can't set framebuffer informations (%s)
\n
"
,
strerror
(
errno
)
);
intf_ErrMsg
(
"vout error: can't set framebuffer informations (%s)"
,
strerror
(
errno
)
);
close
(
p_vout
->
p_sys
->
i_fb_dev
);
return
(
1
);
}
...
...
@@ -259,7 +259,7 @@ static int FBOpenDisplay( vout_thread_t *p_vout )
if
(
ioctl
(
p_vout
->
p_sys
->
i_fb_dev
,
FBIOGET_FSCREENINFO
,
&
fix_info
)
||
ioctl
(
p_vout
->
p_sys
->
i_fb_dev
,
FBIOGET_VSCREENINFO
,
&
p_vout
->
p_sys
->
var_info
)
)
{
intf_ErrMsg
(
"vout error: can't get framebuffer informations (%s)
\n
"
,
strerror
(
errno
)
);
intf_ErrMsg
(
"vout error: can't get framebuffer informations (%s)"
,
strerror
(
errno
)
);
/* FIXME: restore fb config ?? */
close
(
p_vout
->
p_sys
->
i_fb_dev
);
return
(
1
);
...
...
@@ -267,7 +267,7 @@ static int FBOpenDisplay( vout_thread_t *p_vout )
/* FIXME: if the image is full-size, it gets cropped on the left
* because of the xres / xres_virtual slight difference */
intf_Msg
(
"%ix%i (virtual %ix%i)
\n
"
,
p_vout
->
p_sys
->
var_info
.
xres
,
p_vout
->
p_sys
->
var_info
.
yres
,
p_vout
->
p_sys
->
var_info
.
xres_virtual
,
p_vout
->
p_sys
->
var_info
.
yres_virtual
);
intf_Msg
(
"%ix%i (virtual %ix%i)"
,
p_vout
->
p_sys
->
var_info
.
xres
,
p_vout
->
p_sys
->
var_info
.
yres
,
p_vout
->
p_sys
->
var_info
.
xres_virtual
,
p_vout
->
p_sys
->
var_info
.
yres_virtual
);
p_vout
->
i_width
=
p_vout
->
p_sys
->
var_info
.
xres_virtual
?
p_vout
->
p_sys
->
var_info
.
xres_virtual
:
p_vout
->
p_sys
->
var_info
.
xres
;
p_vout
->
i_height
=
p_vout
->
p_sys
->
var_info
.
yres
;
p_vout
->
i_screen_depth
=
p_vout
->
p_sys
->
var_info
.
bits_per_pixel
;
...
...
@@ -306,7 +306,7 @@ static int FBOpenDisplay( vout_thread_t *p_vout )
break
;
default:
/* unsupported screen depth */
intf_ErrMsg
(
"vout error: screen depth %d is not supported
\n
"
,
intf_ErrMsg
(
"vout error: screen depth %d is not supported"
,
p_vout
->
i_screen_depth
);
return
(
1
);
break
;
...
...
@@ -336,7 +336,7 @@ static int FBOpenDisplay( vout_thread_t *p_vout )
memset
(
p_vout
->
p_sys
->
p_video
,
0
,
p_vout
->
p_sys
->
i_page_size
*
2
);
if
(
(
int
)
p_vout
->
p_sys
->
p_video
==
-
1
)
/* according to man, it is -1. What about NULL ? */
{
intf_ErrMsg
(
"vout error: can't map video memory (%s)
\n
"
,
strerror
(
errno
)
);
intf_ErrMsg
(
"vout error: can't map video memory (%s)"
,
strerror
(
errno
)
);
/* FIXME: restore fb config ?? */
close
(
p_vout
->
p_sys
->
i_fb_dev
);
return
(
1
);
...
...
@@ -353,7 +353,7 @@ static int FBOpenDisplay( vout_thread_t *p_vout )
#endif
);
intf_DbgMsg
(
"framebuffer type=%d, visual=%d, ypanstep=%d, ywrap=%d, accel=%d
\n
"
,
intf_DbgMsg
(
"framebuffer type=%d, visual=%d, ypanstep=%d, ywrap=%d, accel=%d"
,
fix_info
.
type
,
fix_info
.
visual
,
fix_info
.
ypanstep
,
fix_info
.
ywrapstep
,
fix_info
.
accel
);
return
(
0
);
}
...
...
plugins/ggi/intf_ggi.c
View file @
f25dd402
...
...
@@ -80,7 +80,7 @@ int intf_GGICreate( intf_thread_t *p_intf )
/* Check that b_video is set */
if
(
!
p_main
->
b_video
)
{
intf_ErrMsg
(
"error: GGI interface require a video output thread
\n
"
);
intf_ErrMsg
(
"error: GGI interface require a video output thread"
);
return
(
1
);
}
...
...
@@ -88,7 +88,7 @@ int intf_GGICreate( intf_thread_t *p_intf )
p_intf
->
p_sys
=
malloc
(
sizeof
(
intf_sys_t
)
);
if
(
p_intf
->
p_sys
==
NULL
)
{
intf_ErrMsg
(
"error: %s
\n
"
,
strerror
(
ENOMEM
)
);
intf_ErrMsg
(
"error: %s"
,
strerror
(
ENOMEM
)
);
return
(
1
);
}
...
...
@@ -104,7 +104,7 @@ int intf_GGICreate( intf_thread_t *p_intf )
if
(
p_intf
->
p_vout
==
NULL
)
/* error */
{
intf_ErrMsg
(
"error: can't create video output thread
\n
"
);
intf_ErrMsg
(
"error: can't create video output thread"
);
free
(
p_intf
->
p_sys
);
return
(
1
);
}
...
...
@@ -151,7 +151,7 @@ void intf_GGIManage( intf_thread_t *p_intf )
i_key
=
ggiGetc
(
p_intf
->
p_sys
->
p_display
);
if
(
intf_ProcessKey
(
p_intf
,
i_key
)
)
{
intf_DbgMsg
(
"unhandled key '%c' (%i)
\n
"
,
(
char
)
i_key
,
i_key
);
intf_DbgMsg
(
"unhandled key '%c' (%i)"
,
(
char
)
i_key
,
i_key
);
}
}
}
...
...
plugins/ggi/vout_ggi.c
View file @
f25dd402
...
...
@@ -77,14 +77,14 @@ int vout_GGICreate( vout_thread_t *p_vout, char *psz_display, int i_root_window,
p_vout
->
p_sys
=
malloc
(
sizeof
(
vout_sys_t
)
);
if
(
p_vout
->
p_sys
==
NULL
)
{
intf_ErrMsg
(
"error: %s
\n
"
,
strerror
(
ENOMEM
)
);
intf_ErrMsg
(
"error: %s"
,
strerror
(
ENOMEM
)
);
return
(
1
);