From: Clément Stenac Date: Thu, 25 May 2006 18:27:39 +0000 (+0000) Subject: Cumulative fix for BeOS - by Cian Duffy < myob87 4t gmail dot com > X-Git-Tag: 0.9.0-test0~11148 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=8e7484b4ff79cc0d22ee0a61ee372dee78431eed;p=vlc Cumulative fix for BeOS - by Cian Duffy < myob87 4t gmail dot com > --- diff --git a/configure.ac b/configure.ac index 465099a70e..4c95aa42b1 100644 --- a/configure.ac +++ b/configure.ac @@ -264,7 +264,9 @@ case "${target_os}" in VLC_ADD_CXXFLAGS([beos],[]) VLC_ADD_LDFLAGS([vlc logger],[-lbe]) 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 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]) diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile index 35ec4de416..32896af929 100644 --- a/extras/contrib/src/Makefile +++ b/extras/contrib/src/Makefile @@ -108,7 +108,7 @@ FFMPEGCONF+= --enable-mp3lame --enable-faac endif ifdef HAVE_BEOS -FFMPEGCONF+= --cpu=x86 +FFMPEGCONF+= --cpu=x86 --disable-debug --disable-audio-beos endif ifeq ($(HOST),i686-apple-darwin8) diff --git a/include/vlc_messages.h b/include/vlc_messages.h index 578f4cb1ec..6bd1d3bbd3 100644 --- a/include/vlc_messages.h +++ b/include/vlc_messages.h @@ -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, unsigned int i_counter, float *value ) { - vlc_value_t val;val.f_float = 0.0; - int i_ret = __stats_Get( p_obj, i_id, i_counter, &val ); + int i_ret; + vlc_value_t val; val.f_float = 0.0; + i_ret = __stats_Get( p_obj, i_id, i_counter, &val ); *value = val.f_float; return i_ret; } diff --git a/modules/access/directory.c b/modules/access/directory.c index 4ebb1a0bfc..9ab5f67bcc 100644 --- a/modules/access/directory.c +++ b/modules/access/directory.c @@ -198,6 +198,7 @@ static int Read( access_t *p_access, uint8_t *p_buffer, int i_len) { char *psz_name = NULL; char *psz; + char *ptr; int i_mode, i_activity; 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) goto end; } - char *ptr; psz_name = ToLocale( p_access->psz_path ); ptr = strdup( psz_name ); LocaleFree( psz_name ); diff --git a/modules/gui/beos/InterfaceWindow.cpp b/modules/gui/beos/InterfaceWindow.cpp index b2597202a0..2c1c7c10c4 100644 --- a/modules/gui/beos/InterfaceWindow.cpp +++ b/modules/gui/beos/InterfaceWindow.cpp @@ -227,11 +227,13 @@ InterfaceWindow::InterfaceWindow( intf_thread_t * _p_intf, BRect frame, screen_rect.top + 50, screen_rect.right - 150, screen_rect.top + 250 ); +#if 0 fPlaylistWindow = new PlayListWindow( window_rect, _("Playlist"), this, p_intf ); window_rect.Set( screen_rect.right - 550, screen_rect.top + 300, screen_rect.right - 150, screen_rect.top + 500 ); +#endif fMessagesWindow = new MessagesWindow( p_intf, window_rect, _("Messages") ); // the media control view @@ -323,8 +325,10 @@ InterfaceWindow::InterfaceWindow( intf_thread_t * _p_intf, BRect frame, fShowMenu->AddItem( new BMenuItem( psz_tmp, new BMessage( OPEN_PLAYLIST ), 'P') ); ADD_ELLIPSIS( _("Messages") ); fShowMenu->AddItem( new BMenuItem( psz_tmp, new BMessage( OPEN_MESSAGES ), 'M' ) ); +#if 0 ADD_ELLIPSIS( _("Preferences") ); fShowMenu->AddItem( new BMenuItem( psz_tmp, new BMessage( OPEN_PREFERENCES ), 'S' ) ); +#endif fMenuBar->AddItem( fShowMenu ); // add the media control view after the menubar is complete @@ -351,10 +355,12 @@ InterfaceWindow::~InterfaceWindow() { vlc_object_release( p_playlist ); } +#if 0 if( fPlaylistWindow ) { fPlaylistWindow->ReallyQuit(); } +#endif if( fMessagesWindow ) { fMessagesWindow->ReallyQuit(); @@ -409,7 +415,7 @@ void InterfaceWindow::MessageReceived( BMessage * p_message ) case LOAD_SUBFILE: _ShowFilePanel( SUBFILE_RECEIVED, _("VLC media player: Open Subtitle File") ); break; - +#if 0 case OPEN_PLAYLIST: if (fPlaylistWindow->Lock()) { @@ -420,7 +426,7 @@ void InterfaceWindow::MessageReceived( BMessage * p_message ) fPlaylistWindow->Unlock(); } break; - +#endif case OPEN_DVD: { const char * psz_device; @@ -430,7 +436,7 @@ void InterfaceWindow::MessageReceived( BMessage * p_message ) char psz_uri[1024]; memset( psz_uri, 0, 1024 ); 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 ); } UpdatePlaylist(); @@ -743,7 +749,7 @@ void InterfaceWindow::MessageReceived( BMessage * p_message ) 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 ); } } @@ -828,12 +834,14 @@ void InterfaceWindow::UpdateInterface() if( b_playlist_update ) { +#if 0 if( fPlaylistWindow->Lock() ) { fPlaylistWindow->UpdatePlaylist( true ); fPlaylistWindow->Unlock(); b_playlist_update = false; } +#endif p_mediaControl->SetEnabled( p_playlist->i_size ); } @@ -1064,8 +1072,10 @@ InterfaceWindow::_RestoreSettings() BRect frame; if ( fSettings->FindRect( "main frame", &frame ) == B_OK ) set_window_pos( this, frame ); +#if 0 if (fSettings->FindRect( "playlist frame", &frame ) == B_OK ) set_window_pos( fPlaylistWindow, frame ); +#endif if (fSettings->FindRect( "messages frame", &frame ) == B_OK ) set_window_pos( fMessagesWindow, frame ); if (fSettings->FindRect( "settings frame", &frame ) == B_OK ) @@ -1077,16 +1087,19 @@ InterfaceWindow::_RestoreSettings() } bool showing; +#if 0 if ( fSettings->FindBool( "playlist showing", &showing ) == B_OK ) launch_window( fPlaylistWindow, showing ); +#endif if ( fSettings->FindBool( "messages showing", &showing ) == B_OK ) launch_window( fMessagesWindow, showing ); if ( fSettings->FindBool( "settings showing", &showing ) == B_OK ) launch_window( fPreferencesWindow, showing ); - +#if 0 uint32 displayMode; if ( fSettings->FindInt32( "playlist display mode", (int32*)&displayMode ) == B_OK ) fPlaylistWindow->SetDisplayMode( displayMode ); +#endif } } @@ -1103,6 +1116,7 @@ InterfaceWindow::_StoreSettings() /* Save the windows positions */ if ( fSettings->ReplaceRect( "main frame", Frame() ) != B_OK ) fSettings->AddRect( "main frame", Frame() ); +#if 0 if ( fPlaylistWindow->Lock() ) { if (fSettings->ReplaceRect( "playlist frame", fPlaylistWindow->Frame() ) != B_OK) @@ -1111,6 +1125,7 @@ InterfaceWindow::_StoreSettings() fSettings->AddBool( "playlist showing", !fPlaylistWindow->IsHidden() ); fPlaylistWindow->Unlock(); } +#endif if ( fMessagesWindow->Lock() ) { if (fSettings->ReplaceRect( "messages frame", fMessagesWindow->Frame() ) != B_OK) @@ -1127,10 +1142,11 @@ InterfaceWindow::_StoreSettings() fSettings->AddBool( "settings showing", !fPreferencesWindow->IsHidden() ); fPreferencesWindow->Unlock(); } +#if 0 uint32 displayMode = fPlaylistWindow->DisplayMode(); if (fSettings->ReplaceInt32( "playlist display mode", displayMode ) != B_OK ) fSettings->AddInt32( "playlist display mode", displayMode ); - +#endif save_settings( fSettings, "interface_settings", "VideoLAN Client" ); } diff --git a/modules/gui/beos/InterfaceWindow.h b/modules/gui/beos/InterfaceWindow.h index ccb0855de5..1134495316 100644 --- a/modules/gui/beos/InterfaceWindow.h +++ b/modules/gui/beos/InterfaceWindow.h @@ -32,7 +32,9 @@ class BMenuBar; class MediaControlView; +#if 0 class PlayListWindow; +#endif class BFilePanel; class PreferencesWindow; class MessagesWindow; @@ -126,7 +128,9 @@ class InterfaceWindow : public BWindow bool b_playlist_update; BFilePanel* fFilePanel; - PlayListWindow* fPlaylistWindow; +#if 0 + PlayListWindow* fPlaylistWindow; +#endif PreferencesWindow* fPreferencesWindow; BMenuBar* fMenuBar; BMenuItem* fGotoMenuMI; diff --git a/modules/gui/beos/ListViews.cpp b/modules/gui/beos/ListViews.cpp index b91352f5fe..7b515cb3ff 100644 --- a/modules/gui/beos/ListViews.cpp +++ b/modules/gui/beos/ListViews.cpp @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#if 0 + #include #include @@ -1121,3 +1123,5 @@ PlaylistView::_SetPlayingIndex( BListItem* playingItem ) } } } + +#endif diff --git a/modules/gui/beos/PlayListWindow.cpp b/modules/gui/beos/PlayListWindow.cpp index 35d9bf3f02..66d2497311 100644 --- a/modules/gui/beos/PlayListWindow.cpp +++ b/modules/gui/beos/PlayListWindow.cpp @@ -24,7 +24,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ - +#if 0 /* System headers */ #include #include @@ -366,3 +366,4 @@ PlayListWindow::_SetMenuItemEnabled( BMenuItem* item, bool enabled ) const if ( item->IsEnabled() != enabled ) item->SetEnabled( enabled ); } +#endif diff --git a/modules/gui/beos/PlayListWindow.h b/modules/gui/beos/PlayListWindow.h index eb800d5e77..f104ce1ce0 100644 --- a/modules/gui/beos/PlayListWindow.h +++ b/modules/gui/beos/PlayListWindow.h @@ -23,7 +23,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ - +#if 0 #ifndef BEOS_PLAY_LIST_WINDOW_H #define BEOS_PLAY_LIST_WINDOW_H @@ -78,4 +78,5 @@ class PlayListWindow : public BWindow }; #endif // BEOS_PLAY_LIST_WINDOW_H +#endif diff --git a/src/playlist/item.c b/src/playlist/item.c index 4c6e761e86..5a3bfce1bb 100644 --- a/src/playlist/item.c +++ b/src/playlist/item.c @@ -62,8 +62,10 @@ playlist_item_t * playlist_ItemNewWithType( vlc_object_t *p_obj, int i_duration, int i_type ) { + input_item_t *p_input; + 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, i_duration, i_type ); return playlist_ItemNewFromInput( p_obj, p_input ); diff --git a/src/playlist/thread.c b/src/playlist/thread.c index 6efd8a8281..a7ca7e4437 100644 --- a/src/playlist/thread.c +++ b/src/playlist/thread.c @@ -188,9 +188,9 @@ static void EndPlaylist( playlist_t *p_playlist ) *****************************************************************************/ static void RunPreparse ( playlist_preparse_t *p_obj ) { + playlist_t *p_playlist = p_obj->p_parent; /* Tell above that we're ready */ vlc_thread_ready( p_obj ); - playlist_t *p_playlist = (playlist_t *)p_obj->p_parent; while( !p_playlist->b_die ) {