Commit b38e99dd authored by Loïc Minier's avatar Loïc Minier

Merge branch 'master' of git.videolan.org:vlc

parents e40db6d8 2d5437ce
......@@ -924,7 +924,7 @@ static VLCOpen *_o_sharedMainInstance = nil;
- (IBAction)eyetvGetPlugin:(id)sender
{
[[NSWorkspace sharedWorkspace] openURL: [NSURL URLWithString: @"http://www.videolan.org/eyetv"]];
[[NSWorkspace sharedWorkspace] openURL: [NSURL URLWithString: @"http://www.videolan.org/vlc/eyetv"]];
}
- (void)eyetvChanged:(NSNotification *)o_notification
......
......@@ -222,7 +222,7 @@ ExtVideo::~ExtVideo()
void ExtVideo::cropChange()
{
p_vout = ( vout_thread_t * )vlc_object_find( p_intf,
VLC_OBJECT_VOUT, FIND_CHILD );
VLC_OBJECT_VOUT, FIND_ANYWHERE );
if( p_vout )
{
var_SetInteger( p_vout, "crop-top", ui.cropTopPx->value() );
......
......@@ -946,9 +946,19 @@ void PLModel::popupExplore()
char *psz_meta = input_item_GetURI( p_input );
if( psz_meta )
{
/* FIXME add a MRLSplit like function */
QFileInfo info( qfu( psz_meta ) );
QDesktopServices::openUrl( QUrl::fromLocalFile( info.absolutePath() ) );
const char *psz_access;
const char *psz_demux;
char *psz_path;
input_SplitMRL( &psz_access, &psz_demux, &psz_path, psz_meta );
if( EMPTY_STR( psz_access ) ||
!strncasecmp( psz_access, "file", 4 ) ||
!strncasecmp( psz_access, "dire", 4 ) )
{
QFileInfo info( qfu( psz_meta ) );
QDesktopServices::openUrl(
QUrl::fromLocalFile( info.absolutePath() ) );
}
free( psz_meta );
}
}
......
......@@ -713,8 +713,8 @@ void MainInterface::releaseVideoSlot( void *p_win )
bgWidget->show();
}
adjustSize();
videoIsActive = false;
if( !isFullScreen() ) adjustSize();
}
int MainInterface::controlVideo( void *p_window, int i_query, va_list args )
......
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