mirror of
https://code.videolan.org/videolan/vlc
synced 2024-07-21 07:24:15 +02:00
* ./modules/gui/win32/Makefile: fixed the Win32 interface compilation.
* ./modules/gui/win32/win32.cpp: merged intfwin.cpp into this file.
This commit is contained in:
parent
302020cce3
commit
8252b141be
@ -4,7 +4,7 @@
|
||||
#
|
||||
win32_CUSTOM = yes
|
||||
|
||||
../win32.so: Makefile
|
||||
win32.so: Makefile
|
||||
rm -f win32.mak
|
||||
$(BCBUILDER)/Bin/bpr2mak win32.bpr -s | sed 's#^LIBPATH = .*#&;$$(RELEASELIBPATH)# ; s#^USERDEFINES = .*#& -DWIN32 -D__PLUGIN__ -D__VLC__ -DMODULE_NAME_IS_win32 -DMODULE_NAME=win32 -DMODULE_PATH=modules_gui_win32_win32#' > win32.mak
|
||||
$(BCBUILDER)/Bin/make -f win32.mak -b
|
||||
|
@ -1,239 +0,0 @@
|
||||
/*****************************************************************************
|
||||
* intfwin.cpp: Win32 interface plugin for vlc
|
||||
*****************************************************************************
|
||||
* Copyright (C) 2002 VideoLAN
|
||||
*
|
||||
* Authors: Olivier Teulière <ipkiss@via.ecp.fr>
|
||||
*
|
||||
* 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
|
||||
* (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.
|
||||
*
|
||||
* 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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
|
||||
*****************************************************************************/
|
||||
|
||||
/*****************************************************************************
|
||||
* Preamble
|
||||
*****************************************************************************/
|
||||
#include <vcl.h>
|
||||
#include <stdlib.h> /* malloc(), free() */
|
||||
#include <errno.h> /* ENOMEM */
|
||||
#include <string.h> /* strerror() */
|
||||
|
||||
#include <vlc/vlc.h>
|
||||
#include <vlc/intf.h>
|
||||
|
||||
#include "mainframe.h"
|
||||
#include "menu.h"
|
||||
#include "win32_common.h"
|
||||
|
||||
intf_thread_t *p_intfGlobal;
|
||||
|
||||
/*****************************************************************************
|
||||
* Local prototypes.
|
||||
*****************************************************************************/
|
||||
static void intf_Run ( intf_thread_t *p_intf );
|
||||
|
||||
int Win32Manage( void *p_data );
|
||||
|
||||
/*****************************************************************************
|
||||
* Open: initialize interface
|
||||
*****************************************************************************/
|
||||
int E_(Open)( vlc_object_t *p_this )
|
||||
{
|
||||
intf_thread_t *p_intf = (intf_thread_t *)p_this;
|
||||
|
||||
/* Allocate instance and initialize some members */
|
||||
p_intf->p_sys = (intf_sys_t *) malloc( sizeof( intf_sys_t ) );
|
||||
if( p_intf->p_sys == NULL )
|
||||
{
|
||||
msg_Err( p_intf, "out of memory" );
|
||||
return( 1 );
|
||||
};
|
||||
|
||||
p_intfGlobal = p_intf;
|
||||
p_intf->pf_run = intf_Run;
|
||||
|
||||
p_intf->p_sys->p_sub = msg_Subscribe( p_intf );
|
||||
|
||||
/* Initialize Win32 thread */
|
||||
p_intf->p_sys->b_playing = 0;
|
||||
p_intf->p_sys->b_popup_changed = 0;
|
||||
|
||||
p_intf->p_sys->p_input = NULL;
|
||||
p_intf->p_sys->i_playing = -1;
|
||||
p_intf->p_sys->b_slider_free = 1;
|
||||
|
||||
return( 0 );
|
||||
}
|
||||
|
||||
/*****************************************************************************
|
||||
* Close: destroy interface
|
||||
*****************************************************************************/
|
||||
void E_(Close)( vlc_object_t *p_this )
|
||||
{
|
||||
intf_thread_t *p_intf = (intf_thread_t *)p_this;
|
||||
|
||||
if( p_intf->p_sys->p_input )
|
||||
{
|
||||
vlc_object_release( p_intf->p_sys->p_input );
|
||||
}
|
||||
|
||||
msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub );
|
||||
|
||||
/* Destroy structure */
|
||||
free( p_intf->p_sys );
|
||||
}
|
||||
|
||||
/*****************************************************************************
|
||||
* intf_Run: main loop
|
||||
*****************************************************************************/
|
||||
static void intf_Run( intf_thread_t *p_intf )
|
||||
{
|
||||
p_intf->p_sys->p_window = new TMainFrameDlg( NULL );
|
||||
p_intf->p_sys->p_playwin = new TPlaylistDlg( NULL );
|
||||
p_intf->p_sys->p_messages = new TMessagesDlg( NULL );
|
||||
|
||||
/* show main window and wait until it is closed */
|
||||
p_intf->p_sys->p_window->ShowModal();
|
||||
|
||||
if( p_intf->p_sys->p_disc ) delete p_intf->p_sys->p_disc;
|
||||
if( p_intf->p_sys->p_network ) delete p_intf->p_sys->p_network;
|
||||
if( p_intf->p_sys->p_preferences ) delete p_intf->p_sys->p_preferences;
|
||||
delete p_intf->p_sys->p_messages;
|
||||
delete p_intf->p_sys->p_playwin;
|
||||
}
|
||||
|
||||
/*****************************************************************************
|
||||
* Win32Manage: manage main thread messages
|
||||
*****************************************************************************
|
||||
* In this function, called approx. 10 times a second, we check what the
|
||||
* main program wanted to tell us.
|
||||
*****************************************************************************/
|
||||
int Win32Manage( intf_thread_t *p_intf )
|
||||
{
|
||||
vlc_mutex_lock( &p_intf->change_lock );
|
||||
|
||||
/* If the "display popup" flag has changed */
|
||||
if( p_intf->b_menu_change )
|
||||
{
|
||||
/* FIXME: It would be nice to close the popup when the user left-clicks
|
||||
elsewhere, or to actualize the position when he right-clicks again,
|
||||
but i couldn't find a way to close it :-( */
|
||||
TPoint MousePos = Mouse->CursorPos;
|
||||
p_intf->p_sys->p_window->PopupMenuMain->Popup( MousePos.x, MousePos.y );
|
||||
p_intf->b_menu_change = 0;
|
||||
}
|
||||
|
||||
/* Update the log window */
|
||||
p_intf->p_sys->p_messages->UpdateLog();
|
||||
|
||||
/* Update the playlist */
|
||||
p_intf->p_sys->p_playwin->Manage( p_intf );
|
||||
|
||||
/* Update the input */
|
||||
if( p_intf->p_sys->p_input == NULL )
|
||||
{
|
||||
p_intf->p_sys->p_input = (input_thread_t *)
|
||||
vlc_object_find( p_intf, VLC_OBJECT_INPUT, FIND_ANYWHERE );
|
||||
}
|
||||
else if( p_intf->p_sys->p_input->b_dead )
|
||||
{
|
||||
vlc_object_release( p_intf->p_sys->p_input );
|
||||
p_intf->p_sys->p_input = NULL;
|
||||
}
|
||||
|
||||
if( p_intf->p_sys->p_input )
|
||||
{
|
||||
input_thread_t *p_input = p_intf->p_sys->p_input;
|
||||
|
||||
vlc_mutex_lock( &p_input->stream.stream_lock );
|
||||
|
||||
if( !p_input->b_die )
|
||||
{
|
||||
/* New input or stream map change */
|
||||
if( p_input->stream.b_changed )
|
||||
{
|
||||
p_intf->p_sys->p_window->ModeManage();
|
||||
SetupMenus( p_intf );
|
||||
p_intf->p_sys->b_playing = 1;
|
||||
}
|
||||
|
||||
/* Manage the slider */
|
||||
if( p_input->stream.b_seekable && p_intf->p_sys->b_playing )
|
||||
{
|
||||
TTrackBar * TrackBar = p_intf->p_sys->p_window->TrackBar;
|
||||
off_t NewValue = TrackBar->Position;
|
||||
|
||||
#define p_area p_input->stream.p_selected_area
|
||||
/* If the user hasn't touched the slider since the last time,
|
||||
* then the input can safely change it */
|
||||
if( NewValue == p_intf->p_sys->OldValue )
|
||||
{
|
||||
/* Update the value */
|
||||
TrackBar->Position = p_intf->p_sys->OldValue =
|
||||
( (off_t)SLIDER_MAX_VALUE * p_area->i_tell ) /
|
||||
p_area->i_size;
|
||||
}
|
||||
/* Otherwise, send message to the input if the user has
|
||||
* finished dragging the slider */
|
||||
else if( p_intf->p_sys->b_slider_free )
|
||||
{
|
||||
off_t i_seek = ( NewValue * p_area->i_size ) /
|
||||
(off_t)SLIDER_MAX_VALUE;
|
||||
|
||||
/* release the lock to be able to seek */
|
||||
vlc_mutex_unlock( &p_input->stream.stream_lock );
|
||||
input_Seek( p_input, i_seek, INPUT_SEEK_SET );
|
||||
vlc_mutex_lock( &p_input->stream.stream_lock );
|
||||
|
||||
/* Update the old value */
|
||||
p_intf->p_sys->OldValue = NewValue;
|
||||
}
|
||||
|
||||
/* Update the display */
|
||||
// TrackBar->Invalidate();
|
||||
|
||||
# undef p_area
|
||||
}
|
||||
|
||||
if( p_intf->p_sys->i_part !=
|
||||
p_input->stream.p_selected_area->i_part )
|
||||
{
|
||||
// p_intf->p_sys->b_chapter_update = 1;
|
||||
SetupMenus( p_intf );
|
||||
}
|
||||
}
|
||||
|
||||
vlc_mutex_unlock( &p_input->stream.stream_lock );
|
||||
}
|
||||
else if( p_intf->p_sys->b_playing && !p_intf->b_die )
|
||||
{
|
||||
p_intf->p_sys->p_window->ModeManage();
|
||||
p_intf->p_sys->b_playing = 0;
|
||||
}
|
||||
|
||||
if( p_intf->b_die )
|
||||
{
|
||||
vlc_mutex_unlock( &p_intf->change_lock );
|
||||
|
||||
/* Prepare to die, young Skywalker */
|
||||
p_intf->p_sys->p_window->ModalResult = mrOk;
|
||||
|
||||
/* Just in case */
|
||||
return( FALSE );
|
||||
}
|
||||
|
||||
vlc_mutex_unlock( &p_intf->change_lock );
|
||||
|
||||
return( TRUE );
|
||||
}
|
||||
|
@ -3,8 +3,8 @@
|
||||
<PROJECT>
|
||||
<MACROS>
|
||||
<VERSION value="BCB.05.03"/>
|
||||
<PROJECT value="..\intfwin.so"/>
|
||||
<OBJFILES value="win32.obj intf.obj mainframe.obj network.obj playlist.obj
|
||||
<PROJECT value="win32.so"/>
|
||||
<OBJFILES value="win32.obj mainframe.obj network.obj playlist.obj
|
||||
preferences.obj about.obj disc.obj control.obj menu.obj messages.obj"/>
|
||||
<RESFILES value=""/>
|
||||
<DEFFILE value=""/>
|
||||
@ -25,8 +25,8 @@
|
||||
<LINKER value="tlink32"/>
|
||||
<USERDEFINES value="_DEBUG"/>
|
||||
<SYSDEFINES value="NO_STRICT"/>
|
||||
<MAINSOURCE value="intfwin.bpf"/>
|
||||
<INCLUDEPATH value="..\..\win32;$(BCB)\include;$(BCB)\include\vcl;..\..\include;..\..\src\misc"/>
|
||||
<MAINSOURCE value="win32.bpf"/>
|
||||
<INCLUDEPATH value="..\..\win32;$(BCB)\include;$(BCB)\include\vcl;..\..\..\include;..\..\src\misc"/>
|
||||
<LIBPATH value="..\..\win32;$(BCB)\lib\obj;$(BCB)\lib"/>
|
||||
<WARNINGS value="-w-par"/>
|
||||
</MACROS>
|
||||
|
@ -23,18 +23,227 @@
|
||||
/*****************************************************************************
|
||||
* Preamble
|
||||
*****************************************************************************/
|
||||
#include <vcl.h>
|
||||
#include <stdlib.h> /* malloc(), free() */
|
||||
#include <errno.h> /* ENOMEM */
|
||||
#include <string.h>
|
||||
|
||||
#include <vlc/vlc.h>
|
||||
#include <vlc/intf.h>
|
||||
|
||||
#include "win32.h" /* Borland specific */
|
||||
#include "mainframe.h"
|
||||
#include "menu.h"
|
||||
#include "win32_common.h"
|
||||
|
||||
/*****************************************************************************
|
||||
* External prototypes
|
||||
* Exported interface functions.
|
||||
*****************************************************************************/
|
||||
int E_(Open) ( vlc_object_t * );
|
||||
void E_(Close) ( vlc_object_t * );
|
||||
extern "C" __declspec(dllexport)
|
||||
int __VLC_SYMBOL( vlc_entry ) ( module_t *p_module );
|
||||
|
||||
/*****************************************************************************
|
||||
* Local prototypes.
|
||||
*****************************************************************************/
|
||||
static int Open ( vlc_object_t * );
|
||||
static void Close ( vlc_object_t * );
|
||||
static void Run ( intf_thread_t * );
|
||||
|
||||
int Win32Manage( void *p_data );
|
||||
|
||||
intf_thread_t *p_intfGlobal;
|
||||
|
||||
/*****************************************************************************
|
||||
* Open: initialize interface
|
||||
*****************************************************************************/
|
||||
static int Open ( vlc_object_t *p_this )
|
||||
{
|
||||
intf_thread_t *p_intf = (intf_thread_t *)p_this;
|
||||
|
||||
/* Allocate instance and initialize some members */
|
||||
p_intf->p_sys = (intf_sys_t *) malloc( sizeof( intf_sys_t ) );
|
||||
if( p_intf->p_sys == NULL )
|
||||
{
|
||||
msg_Err( p_intf, "out of memory" );
|
||||
return( 1 );
|
||||
};
|
||||
|
||||
p_intfGlobal = p_intf;
|
||||
p_intf->pf_run = Run;
|
||||
|
||||
p_intf->p_sys->p_sub = msg_Subscribe( p_intf );
|
||||
|
||||
/* Initialize Win32 thread */
|
||||
p_intf->p_sys->b_playing = 0;
|
||||
p_intf->p_sys->b_popup_changed = 0;
|
||||
|
||||
p_intf->p_sys->p_input = NULL;
|
||||
p_intf->p_sys->i_playing = -1;
|
||||
p_intf->p_sys->b_slider_free = 1;
|
||||
|
||||
return( 0 );
|
||||
}
|
||||
|
||||
/*****************************************************************************
|
||||
* Close: destroy interface
|
||||
*****************************************************************************/
|
||||
static void Close ( vlc_object_t *p_this )
|
||||
{
|
||||
intf_thread_t *p_intf = (intf_thread_t *)p_this;
|
||||
|
||||
if( p_intf->p_sys->p_input )
|
||||
{
|
||||
vlc_object_release( p_intf->p_sys->p_input );
|
||||
}
|
||||
|
||||
msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub );
|
||||
|
||||
/* Destroy structure */
|
||||
free( p_intf->p_sys );
|
||||
}
|
||||
|
||||
/*****************************************************************************
|
||||
* Run: main loop
|
||||
*****************************************************************************/
|
||||
static void Run( intf_thread_t *p_intf )
|
||||
{
|
||||
p_intf->p_sys->p_window = new TMainFrameDlg( NULL );
|
||||
p_intf->p_sys->p_playwin = new TPlaylistDlg( NULL );
|
||||
p_intf->p_sys->p_messages = new TMessagesDlg( NULL );
|
||||
|
||||
/* show main window and wait until it is closed */
|
||||
p_intf->p_sys->p_window->ShowModal();
|
||||
|
||||
if( p_intf->p_sys->p_disc ) delete p_intf->p_sys->p_disc;
|
||||
if( p_intf->p_sys->p_network ) delete p_intf->p_sys->p_network;
|
||||
if( p_intf->p_sys->p_preferences ) delete p_intf->p_sys->p_preferences;
|
||||
delete p_intf->p_sys->p_messages;
|
||||
delete p_intf->p_sys->p_playwin;
|
||||
}
|
||||
|
||||
/*****************************************************************************
|
||||
* Win32Manage: manage main thread messages
|
||||
*****************************************************************************
|
||||
* In this function, called approx. 10 times a second, we check what the
|
||||
* main program wanted to tell us.
|
||||
*****************************************************************************/
|
||||
int Win32Manage( intf_thread_t *p_intf )
|
||||
{
|
||||
vlc_mutex_lock( &p_intf->change_lock );
|
||||
|
||||
/* If the "display popup" flag has changed */
|
||||
if( p_intf->b_menu_change )
|
||||
{
|
||||
/* FIXME: It would be nice to close the popup when the user left-clicks
|
||||
elsewhere, or to actualize the position when he right-clicks again,
|
||||
but i couldn't find a way to close it :-( */
|
||||
TPoint MousePos = Mouse->CursorPos;
|
||||
p_intf->p_sys->p_window->PopupMenuMain->Popup( MousePos.x, MousePos.y );
|
||||
p_intf->b_menu_change = 0;
|
||||
}
|
||||
|
||||
/* Update the log window */
|
||||
p_intf->p_sys->p_messages->UpdateLog();
|
||||
|
||||
/* Update the playlist */
|
||||
p_intf->p_sys->p_playwin->Manage( p_intf );
|
||||
|
||||
/* Update the input */
|
||||
if( p_intf->p_sys->p_input == NULL )
|
||||
{
|
||||
p_intf->p_sys->p_input = (input_thread_t *)
|
||||
vlc_object_find( p_intf, VLC_OBJECT_INPUT, FIND_ANYWHERE );
|
||||
}
|
||||
else if( p_intf->p_sys->p_input->b_dead )
|
||||
{
|
||||
vlc_object_release( p_intf->p_sys->p_input );
|
||||
p_intf->p_sys->p_input = NULL;
|
||||
}
|
||||
|
||||
if( p_intf->p_sys->p_input )
|
||||
{
|
||||
input_thread_t *p_input = p_intf->p_sys->p_input;
|
||||
|
||||
vlc_mutex_lock( &p_input->stream.stream_lock );
|
||||
|
||||
if( !p_input->b_die )
|
||||
{
|
||||
/* New input or stream map change */
|
||||
if( p_input->stream.b_changed )
|
||||
{
|
||||
p_intf->p_sys->p_window->ModeManage();
|
||||
SetupMenus( p_intf );
|
||||
p_intf->p_sys->b_playing = 1;
|
||||
}
|
||||
|
||||
/* Manage the slider */
|
||||
if( p_input->stream.b_seekable && p_intf->p_sys->b_playing )
|
||||
{
|
||||
TTrackBar * TrackBar = p_intf->p_sys->p_window->TrackBar;
|
||||
off_t NewValue = TrackBar->Position;
|
||||
|
||||
#define p_area p_input->stream.p_selected_area
|
||||
/* If the user hasn't touched the slider since the last time,
|
||||
* then the input can safely change it */
|
||||
if( NewValue == p_intf->p_sys->OldValue )
|
||||
{
|
||||
/* Update the value */
|
||||
TrackBar->Position = p_intf->p_sys->OldValue =
|
||||
( (off_t)SLIDER_MAX_VALUE * p_area->i_tell ) /
|
||||
p_area->i_size;
|
||||
}
|
||||
/* Otherwise, send message to the input if the user has
|
||||
* finished dragging the slider */
|
||||
else if( p_intf->p_sys->b_slider_free )
|
||||
{
|
||||
off_t i_seek = ( NewValue * p_area->i_size ) /
|
||||
(off_t)SLIDER_MAX_VALUE;
|
||||
|
||||
/* release the lock to be able to seek */
|
||||
vlc_mutex_unlock( &p_input->stream.stream_lock );
|
||||
input_Seek( p_input, i_seek, INPUT_SEEK_SET );
|
||||
vlc_mutex_lock( &p_input->stream.stream_lock );
|
||||
|
||||
/* Update the old value */
|
||||
p_intf->p_sys->OldValue = NewValue;
|
||||
}
|
||||
|
||||
/* Update the display */
|
||||
// TrackBar->Invalidate();
|
||||
|
||||
# undef p_area
|
||||
}
|
||||
|
||||
if( p_intf->p_sys->i_part !=
|
||||
p_input->stream.p_selected_area->i_part )
|
||||
{
|
||||
// p_intf->p_sys->b_chapter_update = 1;
|
||||
SetupMenus( p_intf );
|
||||
}
|
||||
}
|
||||
|
||||
vlc_mutex_unlock( &p_input->stream.stream_lock );
|
||||
}
|
||||
else if( p_intf->p_sys->b_playing && !p_intf->b_die )
|
||||
{
|
||||
p_intf->p_sys->p_window->ModeManage();
|
||||
p_intf->p_sys->b_playing = 0;
|
||||
}
|
||||
|
||||
if( p_intf->b_die )
|
||||
{
|
||||
vlc_mutex_unlock( &p_intf->change_lock );
|
||||
|
||||
/* Prepare to die, young Skywalker */
|
||||
p_intf->p_sys->p_window->ModalResult = mrOk;
|
||||
|
||||
/* Just in case */
|
||||
return( FALSE );
|
||||
}
|
||||
|
||||
vlc_mutex_unlock( &p_intf->change_lock );
|
||||
|
||||
return( TRUE );
|
||||
}
|
||||
|
||||
/*****************************************************************************
|
||||
* Module descriptor
|
||||
|
@ -1,27 +0,0 @@
|
||||
/*****************************************************************************
|
||||
* win32.h : Win32 interface plugin for vlc
|
||||
*****************************************************************************
|
||||
* Copyright (C) 2002 VideoLAN
|
||||
*
|
||||
* Authors: Olivier Teulière <ipkiss@via.ecp.fr>
|
||||
*
|
||||
* 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
|
||||
* (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.
|
||||
*
|
||||
* 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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
|
||||
*****************************************************************************/
|
||||
|
||||
/*****************************************************************************
|
||||
* Exported interface functions.
|
||||
*****************************************************************************/
|
||||
extern "C" __declspec(dllexport)
|
||||
int __VLC_SYMBOL( vlc_entry ) ( module_t *p_module );
|
Loading…
Reference in New Issue
Block a user