Commit 8e7484b4 authored by Clément Stenac's avatar Clément Stenac

Cumulative fix for BeOS - by Cian Duffy < myob87 4t gmail dot com >

parent d4adc505
...@@ -264,7 +264,9 @@ case "${target_os}" in ...@@ -264,7 +264,9 @@ case "${target_os}" in
VLC_ADD_CXXFLAGS([beos],[]) VLC_ADD_CXXFLAGS([beos],[])
VLC_ADD_LDFLAGS([vlc logger],[-lbe]) VLC_ADD_LDFLAGS([vlc logger],[-lbe])
VLC_ADD_LDFLAGS([beos],[-lbe -lmedia -ltranslation -ltracker -lgame]) VLC_ADD_LDFLAGS([beos],[-lbe -lmedia -ltranslation -ltracker -lgame])
VLC_ADD_LDFLAGS([dvdnav dvdread],[-ldl])
VLC_ADD_LDFLAGS([access_file],[-lpoll])
LDFLAGS_save="${LDFLAGS_save} -lintl"; LDFLAGS="${CFLAGS_save}"
dnl Check for BONE dnl Check for BONE
if test -f /boot/beos/system/lib/libbind.so; then if test -f /boot/beos/system/lib/libbind.so; then
VLC_ADD_LDFLAGS([access_file access_ftp access_mms access_output_udp telnet netsync sap ipv4 vlc growl],[-lbind -lsocket]) VLC_ADD_LDFLAGS([access_file access_ftp access_mms access_output_udp telnet netsync sap ipv4 vlc growl],[-lbind -lsocket])
......
...@@ -108,7 +108,7 @@ FFMPEGCONF+= --enable-mp3lame --enable-faac ...@@ -108,7 +108,7 @@ FFMPEGCONF+= --enable-mp3lame --enable-faac
endif endif
ifdef HAVE_BEOS ifdef HAVE_BEOS
FFMPEGCONF+= --cpu=x86 FFMPEGCONF+= --cpu=x86 --disable-debug --disable-audio-beos
endif endif
ifeq ($(HOST),i686-apple-darwin8) ifeq ($(HOST),i686-apple-darwin8)
......
...@@ -301,8 +301,9 @@ static inline int __stats_GetInteger( vlc_object_t *p_obj, int i_id, ...@@ -301,8 +301,9 @@ static inline int __stats_GetInteger( vlc_object_t *p_obj, int i_id,
static inline int __stats_GetFloat( vlc_object_t *p_obj, int i_id, static inline int __stats_GetFloat( vlc_object_t *p_obj, int i_id,
unsigned int i_counter, float *value ) unsigned int i_counter, float *value )
{ {
vlc_value_t val;val.f_float = 0.0; int i_ret;
int i_ret = __stats_Get( p_obj, i_id, i_counter, &val ); vlc_value_t val; val.f_float = 0.0;
i_ret = __stats_Get( p_obj, i_id, i_counter, &val );
*value = val.f_float; *value = val.f_float;
return i_ret; return i_ret;
} }
......
...@@ -198,6 +198,7 @@ static int Read( access_t *p_access, uint8_t *p_buffer, int i_len) ...@@ -198,6 +198,7 @@ static int Read( access_t *p_access, uint8_t *p_buffer, int i_len)
{ {
char *psz_name = NULL; char *psz_name = NULL;
char *psz; char *psz;
char *ptr;
int i_mode, i_activity; int i_mode, i_activity;
playlist_item_t *p_item, *p_root_category; playlist_item_t *p_item, *p_root_category;
...@@ -213,7 +214,6 @@ static int Read( access_t *p_access, uint8_t *p_buffer, int i_len) ...@@ -213,7 +214,6 @@ static int Read( access_t *p_access, uint8_t *p_buffer, int i_len)
goto end; goto end;
} }
char *ptr;
psz_name = ToLocale( p_access->psz_path ); psz_name = ToLocale( p_access->psz_path );
ptr = strdup( psz_name ); ptr = strdup( psz_name );
LocaleFree( psz_name ); LocaleFree( psz_name );
......
...@@ -227,11 +227,13 @@ InterfaceWindow::InterfaceWindow( intf_thread_t * _p_intf, BRect frame, ...@@ -227,11 +227,13 @@ InterfaceWindow::InterfaceWindow( intf_thread_t * _p_intf, BRect frame,
screen_rect.top + 50, screen_rect.top + 50,
screen_rect.right - 150, screen_rect.right - 150,
screen_rect.top + 250 ); screen_rect.top + 250 );
#if 0
fPlaylistWindow = new PlayListWindow( window_rect, _("Playlist"), this, p_intf ); fPlaylistWindow = new PlayListWindow( window_rect, _("Playlist"), this, p_intf );
window_rect.Set( screen_rect.right - 550, window_rect.Set( screen_rect.right - 550,
screen_rect.top + 300, screen_rect.top + 300,
screen_rect.right - 150, screen_rect.right - 150,
screen_rect.top + 500 ); screen_rect.top + 500 );
#endif
fMessagesWindow = new MessagesWindow( p_intf, window_rect, _("Messages") ); fMessagesWindow = new MessagesWindow( p_intf, window_rect, _("Messages") );
// the media control view // the media control view
...@@ -323,8 +325,10 @@ InterfaceWindow::InterfaceWindow( intf_thread_t * _p_intf, BRect frame, ...@@ -323,8 +325,10 @@ InterfaceWindow::InterfaceWindow( intf_thread_t * _p_intf, BRect frame,
fShowMenu->AddItem( new BMenuItem( psz_tmp, new BMessage( OPEN_PLAYLIST ), 'P') ); fShowMenu->AddItem( new BMenuItem( psz_tmp, new BMessage( OPEN_PLAYLIST ), 'P') );
ADD_ELLIPSIS( _("Messages") ); ADD_ELLIPSIS( _("Messages") );
fShowMenu->AddItem( new BMenuItem( psz_tmp, new BMessage( OPEN_MESSAGES ), 'M' ) ); fShowMenu->AddItem( new BMenuItem( psz_tmp, new BMessage( OPEN_MESSAGES ), 'M' ) );
#if 0
ADD_ELLIPSIS( _("Preferences") ); ADD_ELLIPSIS( _("Preferences") );
fShowMenu->AddItem( new BMenuItem( psz_tmp, new BMessage( OPEN_PREFERENCES ), 'S' ) ); fShowMenu->AddItem( new BMenuItem( psz_tmp, new BMessage( OPEN_PREFERENCES ), 'S' ) );
#endif
fMenuBar->AddItem( fShowMenu ); fMenuBar->AddItem( fShowMenu );
// add the media control view after the menubar is complete // add the media control view after the menubar is complete
...@@ -351,10 +355,12 @@ InterfaceWindow::~InterfaceWindow() ...@@ -351,10 +355,12 @@ InterfaceWindow::~InterfaceWindow()
{ {
vlc_object_release( p_playlist ); vlc_object_release( p_playlist );
} }
#if 0
if( fPlaylistWindow ) if( fPlaylistWindow )
{ {
fPlaylistWindow->ReallyQuit(); fPlaylistWindow->ReallyQuit();
} }
#endif
if( fMessagesWindow ) if( fMessagesWindow )
{ {
fMessagesWindow->ReallyQuit(); fMessagesWindow->ReallyQuit();
...@@ -409,7 +415,7 @@ void InterfaceWindow::MessageReceived( BMessage * p_message ) ...@@ -409,7 +415,7 @@ void InterfaceWindow::MessageReceived( BMessage * p_message )
case LOAD_SUBFILE: case LOAD_SUBFILE:
_ShowFilePanel( SUBFILE_RECEIVED, _("VLC media player: Open Subtitle File") ); _ShowFilePanel( SUBFILE_RECEIVED, _("VLC media player: Open Subtitle File") );
break; break;
#if 0
case OPEN_PLAYLIST: case OPEN_PLAYLIST:
if (fPlaylistWindow->Lock()) if (fPlaylistWindow->Lock())
{ {
...@@ -420,7 +426,7 @@ void InterfaceWindow::MessageReceived( BMessage * p_message ) ...@@ -420,7 +426,7 @@ void InterfaceWindow::MessageReceived( BMessage * p_message )
fPlaylistWindow->Unlock(); fPlaylistWindow->Unlock();
} }
break; break;
#endif
case OPEN_DVD: case OPEN_DVD:
{ {
const char * psz_device; const char * psz_device;
...@@ -430,7 +436,7 @@ void InterfaceWindow::MessageReceived( BMessage * p_message ) ...@@ -430,7 +436,7 @@ void InterfaceWindow::MessageReceived( BMessage * p_message )
char psz_uri[1024]; char psz_uri[1024];
memset( psz_uri, 0, 1024 ); memset( psz_uri, 0, 1024 );
snprintf( psz_uri, 1024, "dvdnav:%s", psz_device ); snprintf( psz_uri, 1024, "dvdnav:%s", psz_device );
playlist_Add( p_playlist, psz_uri, psz_device, playlist_PlaylistAdd( p_playlist, psz_uri, psz_device,
PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END ); PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END );
} }
UpdatePlaylist(); UpdatePlaylist();
...@@ -743,7 +749,7 @@ void InterfaceWindow::MessageReceived( BMessage * p_message ) ...@@ -743,7 +749,7 @@ void InterfaceWindow::MessageReceived( BMessage * p_message )
if( p_playlist ) if( p_playlist )
{ {
playlist_Add( p_playlist, path.Path(), path.Path(), playlist_PlaylistAdd( p_playlist, path.Path(), path.Path(),
PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END ); PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END );
} }
} }
...@@ -828,12 +834,14 @@ void InterfaceWindow::UpdateInterface() ...@@ -828,12 +834,14 @@ void InterfaceWindow::UpdateInterface()
if( b_playlist_update ) if( b_playlist_update )
{ {
#if 0
if( fPlaylistWindow->Lock() ) if( fPlaylistWindow->Lock() )
{ {
fPlaylistWindow->UpdatePlaylist( true ); fPlaylistWindow->UpdatePlaylist( true );
fPlaylistWindow->Unlock(); fPlaylistWindow->Unlock();
b_playlist_update = false; b_playlist_update = false;
} }
#endif
p_mediaControl->SetEnabled( p_playlist->i_size ); p_mediaControl->SetEnabled( p_playlist->i_size );
} }
...@@ -1064,8 +1072,10 @@ InterfaceWindow::_RestoreSettings() ...@@ -1064,8 +1072,10 @@ InterfaceWindow::_RestoreSettings()
BRect frame; BRect frame;
if ( fSettings->FindRect( "main frame", &frame ) == B_OK ) if ( fSettings->FindRect( "main frame", &frame ) == B_OK )
set_window_pos( this, frame ); set_window_pos( this, frame );
#if 0
if (fSettings->FindRect( "playlist frame", &frame ) == B_OK ) if (fSettings->FindRect( "playlist frame", &frame ) == B_OK )
set_window_pos( fPlaylistWindow, frame ); set_window_pos( fPlaylistWindow, frame );
#endif
if (fSettings->FindRect( "messages frame", &frame ) == B_OK ) if (fSettings->FindRect( "messages frame", &frame ) == B_OK )
set_window_pos( fMessagesWindow, frame ); set_window_pos( fMessagesWindow, frame );
if (fSettings->FindRect( "settings frame", &frame ) == B_OK ) if (fSettings->FindRect( "settings frame", &frame ) == B_OK )
...@@ -1077,16 +1087,19 @@ InterfaceWindow::_RestoreSettings() ...@@ -1077,16 +1087,19 @@ InterfaceWindow::_RestoreSettings()
} }
bool showing; bool showing;
#if 0
if ( fSettings->FindBool( "playlist showing", &showing ) == B_OK ) if ( fSettings->FindBool( "playlist showing", &showing ) == B_OK )
launch_window( fPlaylistWindow, showing ); launch_window( fPlaylistWindow, showing );
#endif
if ( fSettings->FindBool( "messages showing", &showing ) == B_OK ) if ( fSettings->FindBool( "messages showing", &showing ) == B_OK )
launch_window( fMessagesWindow, showing ); launch_window( fMessagesWindow, showing );
if ( fSettings->FindBool( "settings showing", &showing ) == B_OK ) if ( fSettings->FindBool( "settings showing", &showing ) == B_OK )
launch_window( fPreferencesWindow, showing ); launch_window( fPreferencesWindow, showing );
#if 0
uint32 displayMode; uint32 displayMode;
if ( fSettings->FindInt32( "playlist display mode", (int32*)&displayMode ) == B_OK ) if ( fSettings->FindInt32( "playlist display mode", (int32*)&displayMode ) == B_OK )
fPlaylistWindow->SetDisplayMode( displayMode ); fPlaylistWindow->SetDisplayMode( displayMode );
#endif
} }
} }
...@@ -1103,6 +1116,7 @@ InterfaceWindow::_StoreSettings() ...@@ -1103,6 +1116,7 @@ InterfaceWindow::_StoreSettings()
/* Save the windows positions */ /* Save the windows positions */
if ( fSettings->ReplaceRect( "main frame", Frame() ) != B_OK ) if ( fSettings->ReplaceRect( "main frame", Frame() ) != B_OK )
fSettings->AddRect( "main frame", Frame() ); fSettings->AddRect( "main frame", Frame() );
#if 0
if ( fPlaylistWindow->Lock() ) if ( fPlaylistWindow->Lock() )
{ {
if (fSettings->ReplaceRect( "playlist frame", fPlaylistWindow->Frame() ) != B_OK) if (fSettings->ReplaceRect( "playlist frame", fPlaylistWindow->Frame() ) != B_OK)
...@@ -1111,6 +1125,7 @@ InterfaceWindow::_StoreSettings() ...@@ -1111,6 +1125,7 @@ InterfaceWindow::_StoreSettings()
fSettings->AddBool( "playlist showing", !fPlaylistWindow->IsHidden() ); fSettings->AddBool( "playlist showing", !fPlaylistWindow->IsHidden() );
fPlaylistWindow->Unlock(); fPlaylistWindow->Unlock();
} }
#endif
if ( fMessagesWindow->Lock() ) if ( fMessagesWindow->Lock() )
{ {
if (fSettings->ReplaceRect( "messages frame", fMessagesWindow->Frame() ) != B_OK) if (fSettings->ReplaceRect( "messages frame", fMessagesWindow->Frame() ) != B_OK)
...@@ -1127,10 +1142,11 @@ InterfaceWindow::_StoreSettings() ...@@ -1127,10 +1142,11 @@ InterfaceWindow::_StoreSettings()
fSettings->AddBool( "settings showing", !fPreferencesWindow->IsHidden() ); fSettings->AddBool( "settings showing", !fPreferencesWindow->IsHidden() );
fPreferencesWindow->Unlock(); fPreferencesWindow->Unlock();
} }
#if 0
uint32 displayMode = fPlaylistWindow->DisplayMode(); uint32 displayMode = fPlaylistWindow->DisplayMode();
if (fSettings->ReplaceInt32( "playlist display mode", displayMode ) != B_OK ) if (fSettings->ReplaceInt32( "playlist display mode", displayMode ) != B_OK )
fSettings->AddInt32( "playlist display mode", displayMode ); fSettings->AddInt32( "playlist display mode", displayMode );
#endif
save_settings( fSettings, "interface_settings", "VideoLAN Client" ); save_settings( fSettings, "interface_settings", "VideoLAN Client" );
} }
......
...@@ -32,7 +32,9 @@ ...@@ -32,7 +32,9 @@
class BMenuBar; class BMenuBar;
class MediaControlView; class MediaControlView;
#if 0
class PlayListWindow; class PlayListWindow;
#endif
class BFilePanel; class BFilePanel;
class PreferencesWindow; class PreferencesWindow;
class MessagesWindow; class MessagesWindow;
...@@ -126,7 +128,9 @@ class InterfaceWindow : public BWindow ...@@ -126,7 +128,9 @@ class InterfaceWindow : public BWindow
bool b_playlist_update; bool b_playlist_update;
BFilePanel* fFilePanel; BFilePanel* fFilePanel;
PlayListWindow* fPlaylistWindow; #if 0
PlayListWindow* fPlaylistWindow;
#endif
PreferencesWindow* fPreferencesWindow; PreferencesWindow* fPreferencesWindow;
BMenuBar* fMenuBar; BMenuBar* fMenuBar;
BMenuItem* fGotoMenuMI; BMenuItem* fGotoMenuMI;
......
...@@ -21,6 +21,8 @@ ...@@ -21,6 +21,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#if 0
#include <stdio.h> #include <stdio.h>
#include <malloc.h> #include <malloc.h>
...@@ -1121,3 +1123,5 @@ PlaylistView::_SetPlayingIndex( BListItem* playingItem ) ...@@ -1121,3 +1123,5 @@ PlaylistView::_SetPlayingIndex( BListItem* playingItem )
} }
} }
} }
#endif
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#if 0
/* System headers */ /* System headers */
#include <InterfaceKit.h> #include <InterfaceKit.h>
#include <StorageKit.h> #include <StorageKit.h>
...@@ -366,3 +366,4 @@ PlayListWindow::_SetMenuItemEnabled( BMenuItem* item, bool enabled ) const ...@@ -366,3 +366,4 @@ PlayListWindow::_SetMenuItemEnabled( BMenuItem* item, bool enabled ) const
if ( item->IsEnabled() != enabled ) if ( item->IsEnabled() != enabled )
item->SetEnabled( enabled ); item->SetEnabled( enabled );
} }
#endif
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#if 0
#ifndef BEOS_PLAY_LIST_WINDOW_H #ifndef BEOS_PLAY_LIST_WINDOW_H
#define BEOS_PLAY_LIST_WINDOW_H #define BEOS_PLAY_LIST_WINDOW_H
...@@ -78,4 +78,5 @@ class PlayListWindow : public BWindow ...@@ -78,4 +78,5 @@ class PlayListWindow : public BWindow
}; };
#endif // BEOS_PLAY_LIST_WINDOW_H #endif // BEOS_PLAY_LIST_WINDOW_H
#endif
...@@ -62,8 +62,10 @@ playlist_item_t * playlist_ItemNewWithType( vlc_object_t *p_obj, ...@@ -62,8 +62,10 @@ playlist_item_t * playlist_ItemNewWithType( vlc_object_t *p_obj,
int i_duration, int i_duration,
int i_type ) int i_type )
{ {
input_item_t *p_input;
if( psz_uri == NULL ) return NULL; if( psz_uri == NULL ) return NULL;
input_item_t *p_input = input_ItemNewWithType( p_obj, psz_uri, p_input = input_ItemNewWithType( p_obj, psz_uri,
psz_name, i_options, ppsz_options, psz_name, i_options, ppsz_options,
i_duration, i_type ); i_duration, i_type );
return playlist_ItemNewFromInput( p_obj, p_input ); return playlist_ItemNewFromInput( p_obj, p_input );
......
...@@ -188,9 +188,9 @@ static void EndPlaylist( playlist_t *p_playlist ) ...@@ -188,9 +188,9 @@ static void EndPlaylist( playlist_t *p_playlist )
*****************************************************************************/ *****************************************************************************/
static void RunPreparse ( playlist_preparse_t *p_obj ) static void RunPreparse ( playlist_preparse_t *p_obj )
{ {
playlist_t *p_playlist = p_obj->p_parent;
/* Tell above that we're ready */ /* Tell above that we're ready */
vlc_thread_ready( p_obj ); vlc_thread_ready( p_obj );
playlist_t *p_playlist = (playlist_t *)p_obj->p_parent;
while( !p_playlist->b_die ) while( !p_playlist->b_die )
{ {
......
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