--- /dev/null
+diff -ru mpeg2dec-original/libmpeg2/convert/convert_internal.h mpeg2dec/libmpeg2/convert/convert_internal.h
+--- mpeg2dec-original/libmpeg2/convert/convert_internal.h Fri Jan 23 10:07:50 2004
++++ mpeg2dec/libmpeg2/convert/convert_internal.h Thu Jul 22 23:40:41 2004
+@@ -34,8 +34,10 @@
+ typedef void mpeg2convert_copy_t (void * id, uint8_t * const * src,
+ unsigned int v_offset);
+
++#ifndef __BEOS__
+ mpeg2convert_copy_t * mpeg2convert_rgb_mmxext (int bpp, int mode,
+ const mpeg2_sequence_t * seq);
++#endif
+ mpeg2convert_copy_t * mpeg2convert_rgb_mmx (int bpp, int mode,
+ const mpeg2_sequence_t * seq);
+ mpeg2convert_copy_t * mpeg2convert_rgb_vis (int bpp, int mode,
+diff -ru mpeg2dec-original/libmpeg2/convert/rgb.c mpeg2dec/libmpeg2/convert/rgb.c
+--- mpeg2dec-original/libmpeg2/convert/rgb.c Fri Jan 23 10:07:56 2004
++++ mpeg2dec/libmpeg2/convert/rgb.c Thu Jul 22 23:41:21 2004
+@@ -500,10 +500,12 @@
+ int rgb_stride_min = ((bpp + 7) >> 3) * seq->width;
+
+ #ifdef ARCH_X86
++#ifndef __BEOS__
+ if (!copy && (accel & MPEG2_ACCEL_X86_MMXEXT)) {
+ convert420 = 0;
+ copy = mpeg2convert_rgb_mmxext (order, bpp, seq);
+ }
++#endif
+ if (!copy && (accel & MPEG2_ACCEL_X86_MMX)) {
+ convert420 = 0;
+ copy = mpeg2convert_rgb_mmx (order, bpp, seq);
+diff -ru mpeg2dec-original/libmpeg2/convert/rgb_mmx.c mpeg2dec/libmpeg2/convert/rgb_mmx.c
+--- mpeg2dec-original/libmpeg2/convert/rgb_mmx.c Fri Jan 23 10:07:58 2004
++++ mpeg2dec/libmpeg2/convert/rgb_mmx.c Thu Jul 22 23:39:27 2004
+@@ -272,6 +272,7 @@
+ } while (i);
+ }
+
++#ifndef __BEOS__
+ static void mmxext_rgb16 (void * id, uint8_t * const * src,
+ unsigned int v_offset)
+ {
+@@ -283,6 +284,7 @@
+ {
+ argb32 (id, src, v_offset, CPU_MMXEXT);
+ }
++#endif
+
+ static void mmx_rgb16 (void * id, uint8_t * const * src, unsigned int v_offset)
+ {
+@@ -295,6 +297,7 @@
+ argb32 (id, src, v_offset, CPU_MMX);
+ }
+
++#ifndef __BEOS__
+ mpeg2convert_copy_t * mpeg2convert_rgb_mmxext (int order, int bpp,
+ const mpeg2_sequence_t * seq)
+ {
+@@ -306,6 +309,7 @@
+ }
+ return NULL; /* Fallback to C */
+ }
++#endif
+
+ mpeg2convert_copy_t * mpeg2convert_rgb_mmx (int order, int bpp,
+ const mpeg2_sequence_t * seq)
+diff -ru mpeg2dec-original/libmpeg2/idct.c mpeg2dec/libmpeg2/idct.c
+--- mpeg2dec-original/libmpeg2/idct.c Fri Sep 19 09:26:42 2003
++++ mpeg2dec/libmpeg2/idct.c Thu Jul 22 19:11:53 2004
+@@ -236,11 +236,15 @@
+ void mpeg2_idct_init (uint32_t accel)
+ {
+ #ifdef ARCH_X86
++#ifndef __BEOS__
+ if (accel & MPEG2_ACCEL_X86_MMXEXT) {
+ mpeg2_idct_copy = mpeg2_idct_copy_mmxext;
+ mpeg2_idct_add = mpeg2_idct_add_mmxext;
+ mpeg2_idct_mmx_init ();
+ } else if (accel & MPEG2_ACCEL_X86_MMX) {
++#else
++ if (accel & MPEG2_ACCEL_X86_MMX) {
++#endif
+ mpeg2_idct_copy = mpeg2_idct_copy_mmx;
+ mpeg2_idct_add = mpeg2_idct_add_mmx;
+ mpeg2_idct_mmx_init ();
+diff -ru mpeg2dec-original/libmpeg2/idct_mmx.c mpeg2dec/libmpeg2/idct_mmx.c
+--- mpeg2dec-original/libmpeg2/idct_mmx.c Fri Sep 19 09:26:42 2003
++++ mpeg2dec/libmpeg2/idct_mmx.c Thu Jul 22 19:11:53 2004
+@@ -79,6 +79,7 @@
+ #endif
+
+
++#ifndef __BEOS__
+ /* MMXEXT row IDCT */
+
+ #define mmxext_table(c1,c2,c3,c4,c5,c6,c7) { c4, c2, -c4, -c2, \
+@@ -192,6 +193,7 @@
+ movq_m2r (*(table+4), mm4); /* mm4 = C6 C4 C6 C4 */
+ pshufw_r2r (mm2, mm2, 0x4e); /* mm2 = x2 x0 x6 x4 */
+ }
++#endif /* __BEOS__ */
+
+
+ /* MMX row IDCT */
+@@ -689,6 +691,7 @@
+ #define CPU_MMXEXT 0
+ #define CPU_MMX 1
+
++#ifndef __BEOS__
+ #define dup4(reg) \
+ do { \
+ if (cpu != CPU_MMXEXT) { \
+@@ -697,6 +700,13 @@
+ } else \
+ pshufw_r2r (reg, reg, 0x00); \
+ } while (0)
++#else
++#define dup4(reg) \
++do { \
++ punpcklwd_r2r (reg, reg); \
++ punpckldq_r2r (reg, reg); \
++} while (0)
++#endif
+
+ static inline void block_add_DC (int16_t * const block, uint8_t * dest,
+ const int stride, const int cpu)
+@@ -749,6 +759,7 @@
+ }
+
+
++#ifndef __BEOS__
+ declare_idct (mmxext_idct, mmxext_table,
+ mmxext_row_head, mmxext_row, mmxext_row_tail, mmxext_row_mid)
+
+@@ -770,6 +781,7 @@
+ } else
+ block_add_DC (block, dest, stride, CPU_MMXEXT);
+ }
++#endif /* __BEOS__ */
+
+
+ declare_idct (mmx_idct, mmx_table,
+diff -ru mpeg2dec-original/libmpeg2/motion_comp.c mpeg2dec/libmpeg2/motion_comp.c
+--- mpeg2dec-original/libmpeg2/motion_comp.c Mon Oct 6 02:31:52 2003
++++ mpeg2dec/libmpeg2/motion_comp.c Thu Jul 22 22:57:54 2004
+@@ -34,11 +34,15 @@
+ void mpeg2_mc_init (uint32_t accel)
+ {
+ #ifdef ARCH_X86
++#ifndef __BEOS__
+ if (accel & MPEG2_ACCEL_X86_MMXEXT)
+ mpeg2_mc = mpeg2_mc_mmxext;
+ else if (accel & MPEG2_ACCEL_X86_3DNOW)
+ mpeg2_mc = mpeg2_mc_3dnow;
+ else if (accel & MPEG2_ACCEL_X86_MMX)
++#else
++ if (accel & MPEG2_ACCEL_X86_MMX)
++#endif
+ mpeg2_mc = mpeg2_mc_mmx;
+ else
+ #endif
+diff -ru mpeg2dec-original/libmpeg2/motion_comp_mmx.c mpeg2dec/libmpeg2/motion_comp_mmx.c
+--- mpeg2dec-original/libmpeg2/motion_comp_mmx.c Thu Aug 21 08:00:58 2003
++++ mpeg2dec/libmpeg2/motion_comp_mmx.c Thu Jul 22 22:57:14 2004
+@@ -500,7 +500,7 @@
+
+
+
+-
++#ifndef __BEOS__
+
+ /* CPU_MMXEXT/CPU_3DNOW adaptation layer */
+
+@@ -1001,5 +1001,7 @@
+
+
+ MPEG2_MC_EXTERN (3dnow)
++
++#endif /* __BEOS__ */
+
+ #endif
+diff -ru mpeg2dec-original/libmpeg2/mpeg2_internal.h mpeg2dec/libmpeg2/mpeg2_internal.h
+--- mpeg2dec-original/libmpeg2/mpeg2_internal.h Tue Feb 10 05:43:54 2004
++++ mpeg2dec/libmpeg2/mpeg2_internal.h Thu Jul 22 23:43:36 2004
+@@ -255,9 +255,11 @@
+ void mpeg2_idct_init (uint32_t accel);
+
+ /* idct_mmx.c */
++#ifndef __BEOS__
+ void mpeg2_idct_copy_mmxext (int16_t * block, uint8_t * dest, int stride);
+ void mpeg2_idct_add_mmxext (int last, int16_t * block,
+ uint8_t * dest, int stride);
++#endif
+ void mpeg2_idct_copy_mmx (int16_t * block, uint8_t * dest, int stride);
+ void mpeg2_idct_add_mmx (int last, int16_t * block,
+ uint8_t * dest, int stride);
+@@ -295,8 +297,10 @@
+
+ extern mpeg2_mc_t mpeg2_mc_c;
+ extern mpeg2_mc_t mpeg2_mc_mmx;
++#ifndef __BEOS__
+ extern mpeg2_mc_t mpeg2_mc_mmxext;
+ extern mpeg2_mc_t mpeg2_mc_3dnow;
++#endif
+ extern mpeg2_mc_t mpeg2_mc_altivec;
+ extern mpeg2_mc_t mpeg2_mc_alpha;
+ extern mpeg2_mc_t mpeg2_mc_vis;
#include <vlc/vlc.h>
#include <vlc/intf.h>
#include <vlc/vout.h>
+#include <vlc/input.h>
extern "C"
{
- #include <input_ext-plugins.h> // needed here when compiling without plugins
#include <audio_output.h>
#include <aout_internal.h>
}
{
if( !p_input )
{
- return UNDEF_S;
+ return -1;
}
- vlc_value_t state;
- var_Get( p_input, "state", &state );
- return state.i_int;
+ return var_GetInteger( p_input, "state" );
}
int VlcWrapper::InputRate()
{
if( !p_input )
{
- return DEFAULT_RATE;
+ return INPUT_RATE_DEFAULT;
}
- return p_input->stream.control.i_rate;
+ return var_GetInteger( p_input, "rate" );
}
void VlcWrapper::InputSetRate( int rate )
return NULL;
}
+ BList *list = new BList();
+#if 0
vlc_mutex_lock( &p_input->stream.stream_lock );
/* find which track is currently playing */
}
/* build a list of all tracks */
- BList *list = new BList( p_input->stream.i_es_number );
BMenuItem *menuItem;
BMessage *message;
char *trackName;
}
vlc_mutex_unlock( &p_input->stream.stream_lock );
+#endif
return list;
}
void VlcWrapper::ToggleSubtitle( int i_subtitle )
{
- if( i_language < 0 )
+ if( i_subtitle < 0 )
var_SetInteger( p_input, "spu-es", -1 ); /* Disable SPU */
else
var_SetInteger( p_input, "spu-es", i_subtitle );
bool VlcWrapper::IsPlaying()
{
- bool playing = false;
- if( p_input )
- {
- switch( p_input->stream.control.i_status )
- {
- case PLAYING_S:
- case FORWARD_S:
- case BACKWARD_S:
- playing = true;
- break;
- case PAUSE_S:
- case UNDEF_S:
- default:
- break;
- }
- }
- return playing;
-
+ bool playing = false;
+ if( p_input )
+ {
+ switch( var_GetInteger( p_input, "state" ) )
+ {
+ case INIT_S:
+ case PLAYING_S:
+ playing = true;
+ break;
+ default:
+ break;
+ }
+ }
+ return playing;
}
/************
void VlcWrapper::OpenFiles( BList* o_files, bool replace, int32 index )
{
- if ( o_files && o_files->CountItems() > 0)
- {
- int size = PlaylistSize();
- bool wasEmpty = ( size < 1 );
- if ( index == -1 )
- index = PLAYLIST_END;
- int mode = index == PLAYLIST_END ? PLAYLIST_APPEND : PLAYLIST_INSERT;
-
- /* delete current playlist */
- if( replace )
- {
- for( int i = 0; i < size; i++ )
- {
- playlist_Delete( p_playlist, 0 );
- }
- }
-
- /* insert files */
- int32 count = o_files->CountItems();
- for ( int32 i = count - 1; i >= 0; i-- )
- {
- if ( BString* o_file = (BString *)o_files->RemoveItem( i ) )
- {
- playlist_Add( p_playlist, o_file->String(),
- o_file->String(), mode, index );
- if ( mode == PLAYLIST_INSERT )
- index++;
- delete o_file;
- }
- }
- // TODO: implement a user setting
- // if to start automatically
- /* eventually restart playing */
- if( replace || wasEmpty )
- {
- playlist_Stop( p_playlist );
- playlist_Play( p_playlist );
- }
- }
+ if ( o_files && o_files->CountItems() > 0)
+ {
+ int size = PlaylistSize();
+ bool wasEmpty = ( size < 1 );
+ if ( index == -1 )
+ index = PLAYLIST_END;
+ int mode = index == PLAYLIST_END ? PLAYLIST_APPEND : PLAYLIST_INSERT;
+
+ /* delete current playlist */
+ if( replace )
+ {
+ for( int i = 0; i < size; i++ )
+ {
+ playlist_Delete( p_playlist, 0 );
+ }
+ }
+
+ /* insert files */
+ int32 count = o_files->CountItems();
+ for ( int32 i = count - 1; i >= 0; i-- )
+ {
+ if ( BString* o_file = (BString *)o_files->RemoveItem( i ) )
+ {
+ playlist_Add( p_playlist, o_file->String(),
+ o_file->String(), mode, index );
+ if ( mode == PLAYLIST_INSERT )
+ index++;
+ delete o_file;
+ }
+ }
+ // TODO: implement a user setting
+ // if to start automatically
+ /* eventually restart playing */
+ if( replace || wasEmpty )
+ {
+ playlist_Stop( p_playlist );
+ playlist_Play( p_playlist );
+ }
+ }
}
void VlcWrapper::OpenDisc(BString o_type, BString o_device, int i_title, int i_chapter)
void VlcWrapper::GetPlaylistInfo( int32& currentIndex, int32& maxIndex )
{
- currentIndex = -1;
- maxIndex = -1;
- if ( p_playlist )
- {
- vlc_mutex_lock( &p_playlist->object_lock );
+ currentIndex = -1;
+ maxIndex = -1;
+ if ( p_playlist )
+ {
+ vlc_mutex_lock( &p_playlist->object_lock );
- maxIndex = p_playlist->i_size;
- if ( maxIndex > 0 )
- currentIndex = p_playlist->i_index/* + 1 -> why?!?*/;
- else
- maxIndex = -1;
+ maxIndex = p_playlist->i_size;
+ if ( maxIndex > 0 )
+ currentIndex = p_playlist->i_index/* + 1 -> why?!?*/;
+ else
+ maxIndex = -1;
- vlc_mutex_unlock( &p_playlist->object_lock );
- }
+ vlc_mutex_unlock( &p_playlist->object_lock );
+ }
}
void VlcWrapper::PlaylistJumpTo( int pos )
void VlcWrapper::GetNavCapabilities( bool *canSkipPrev, bool *canSkipNext )
{
- if ( canSkipPrev && canSkipNext )
- {
- // init the parameters
- *canSkipPrev = false;
- *canSkipNext = false;
- // get playlist info
- int pos = PlaylistCurrent();
- int size = PlaylistSize();
-
- // see if we have got a stream going
- if ( p_input )
- {
- vlc_mutex_lock( &p_input->stream.stream_lock );
-
- bool hasTitles = p_input->stream.i_area_nb > 1;
- int numChapters = p_input->stream.p_selected_area->i_part_nb;
- bool hasChapters = numChapters > 1;
- // first, look for chapters
- if ( hasChapters )
- {
- *canSkipPrev = p_input->stream.p_selected_area->i_part > 0;
- *canSkipNext = p_input->stream.p_selected_area->i_part <
- p_input->stream.p_selected_area->i_part_nb - 1;
- }
- // if one of the skip capabilities is false,
- // make it depend on titles instead
- if ( !*canSkipPrev && hasTitles )
- *canSkipPrev = p_input->stream.p_selected_area->i_id > 1;
- if ( !*canSkipNext && hasTitles )
- *canSkipNext = p_input->stream.p_selected_area->i_id <
- p_input->stream.i_area_nb - 1;
-
- vlc_mutex_unlock( &p_input->stream.stream_lock );
- }
- // last but not least, make capabilities depend on playlist
- if ( !*canSkipPrev )
- *canSkipPrev = pos > 0;
- if ( !*canSkipNext )
- *canSkipNext = pos < size - 1;
- }
+ if ( canSkipPrev && canSkipNext )
+ {
+ // init the parameters
+ *canSkipPrev = false;
+ *canSkipNext = false;
+ // get playlist info
+ int pos = PlaylistCurrent();
+ int size = PlaylistSize();
+
+ // see if we have got a stream going
+ if ( p_input )
+ {
+#if 0
+ vlc_mutex_lock( &p_input->stream.stream_lock );
+
+ bool hasTitles = p_input->stream.i_area_nb > 1;
+ int numChapters = p_input->stream.p_selected_area->i_part_nb;
+ bool hasChapters = numChapters > 1;
+ // first, look for chapters
+ if ( hasChapters )
+ {
+ *canSkipPrev = p_input->stream.p_selected_area->i_part > 0;
+ *canSkipNext = p_input->stream.p_selected_area->i_part <
+ p_input->stream.p_selected_area->i_part_nb - 1;
+ }
+ // if one of the skip capabilities is false,
+ // make it depend on titles instead
+ if ( !*canSkipPrev && hasTitles )
+ *canSkipPrev = p_input->stream.p_selected_area->i_id > 1;
+ if ( !*canSkipNext && hasTitles )
+ *canSkipNext = p_input->stream.p_selected_area->i_id <
+ p_input->stream.i_area_nb - 1;
+
+ vlc_mutex_unlock( &p_input->stream.stream_lock );
+#endif
+ }
+ // last but not least, make capabilities depend on playlist
+ if ( !*canSkipPrev )
+ *canSkipPrev = pos > 0;
+ if ( !*canSkipNext )
+ *canSkipNext = pos < size - 1;
+ }
}
void VlcWrapper::NavigatePrev()
{
- bool hasSkiped = false;
-
- // see if we have got a stream going
- if ( p_input )
- {
- // get information from stream (lock it while looking at it)
- vlc_mutex_lock( &p_input->stream.stream_lock );
-
- int currentTitle = p_input->stream.p_selected_area->i_id;
- int currentChapter = p_input->stream.p_selected_area->i_part;
- int numTitles = p_input->stream.i_area_nb;
- bool hasTitles = numTitles > 1;
- int numChapters = p_input->stream.p_selected_area->i_part_nb;
- bool hasChapters = numChapters > 1;
-
- vlc_mutex_unlock( &p_input->stream.stream_lock );
-
- // first, look for chapters
- if ( hasChapters )
- {
- // skip to the previous chapter
- currentChapter--;
-
- if ( currentChapter >= 0 )
- {
- ToggleChapter( currentChapter );
- hasSkiped = true;
- }
- }
- // if we couldn't skip chapters, try titles instead
- if ( !hasSkiped && hasTitles )
- {
- // skip to the previous title
- currentTitle--;
- // disallow area 0 since it is used for video_ts.vob
- if( currentTitle > 0 )
- {
- ToggleTitle(currentTitle);
- hasSkiped = true;
- }
- }
-
- }
- // last but not least, skip to previous file
- if ( !hasSkiped )
- PlaylistPrev();
+ bool hasSkiped = false;
+
+ // see if we have got a stream going
+ if ( p_input )
+ {
+#if 0
+ // get information from stream (lock it while looking at it)
+ vlc_mutex_lock( &p_input->stream.stream_lock );
+
+ int currentTitle = p_input->stream.p_selected_area->i_id;
+ int currentChapter = p_input->stream.p_selected_area->i_part;
+ int numTitles = p_input->stream.i_area_nb;
+ bool hasTitles = numTitles > 1;
+ int numChapters = p_input->stream.p_selected_area->i_part_nb;
+ bool hasChapters = numChapters > 1;
+
+ vlc_mutex_unlock( &p_input->stream.stream_lock );
+
+ // first, look for chapters
+ if ( hasChapters )
+ {
+ // skip to the previous chapter
+ currentChapter--;
+
+ if ( currentChapter >= 0 )
+ {
+ ToggleChapter( currentChapter );
+ hasSkiped = true;
+ }
+ }
+ // if we couldn't skip chapters, try titles instead
+ if ( !hasSkiped && hasTitles )
+ {
+ // skip to the previous title
+ currentTitle--;
+ // disallow area 0 since it is used for video_ts.vob
+ if( currentTitle > 0 )
+ {
+ ToggleTitle(currentTitle);
+ hasSkiped = true;
+ }
+ }
+#endif
+ }
+ // last but not least, skip to previous file
+ if ( !hasSkiped )
+ PlaylistPrev();
}
void VlcWrapper::NavigateNext()
{
- bool hasSkiped = false;
-
- // see if we have got a stream going
- if ( p_input )
- {
- // get information from stream (lock it while looking at it)
- vlc_mutex_lock( &p_input->stream.stream_lock );
-
- int currentTitle = p_input->stream.p_selected_area->i_id;
- int currentChapter = p_input->stream.p_selected_area->i_part;
- int numTitles = p_input->stream.i_area_nb;
- bool hasTitles = numTitles > 1;
- int numChapters = p_input->stream.p_selected_area->i_part_nb;
- bool hasChapters = numChapters > 1;
-
- vlc_mutex_unlock( &p_input->stream.stream_lock );
-
- // first, look for chapters
- if ( hasChapters )
- {
- // skip to the next chapter
- currentChapter++;
- if ( currentChapter < numChapters )
- {
- ToggleChapter( currentChapter );
- hasSkiped = true;
- }
- }
- // if we couldn't skip chapters, try titles instead
- if ( !hasSkiped && hasTitles )
- {
- // skip to the next title
- currentTitle++;
- // disallow area 0 since it is used for video_ts.vob
- if ( currentTitle < numTitles - 1 )
- {
- ToggleTitle(currentTitle);
- hasSkiped = true;
- }
- }
-
- }
- // last but not least, skip to next file
- if ( !hasSkiped )
- PlaylistNext();
+ bool hasSkiped = false;
+
+ // see if we have got a stream going
+ if ( p_input )
+ {
+#if 0
+ // get information from stream (lock it while looking at it)
+ vlc_mutex_lock( &p_input->stream.stream_lock );
+
+ int currentTitle = p_input->stream.p_selected_area->i_id;
+ int currentChapter = p_input->stream.p_selected_area->i_part;
+ int numTitles = p_input->stream.i_area_nb;
+ bool hasTitles = numTitles > 1;
+ int numChapters = p_input->stream.p_selected_area->i_part_nb;
+ bool hasChapters = numChapters > 1;
+
+ vlc_mutex_unlock( &p_input->stream.stream_lock );
+
+ // first, look for chapters
+ if ( hasChapters )
+ {
+ // skip to the next chapter
+ currentChapter++;
+ if ( currentChapter < numChapters )
+ {
+ ToggleChapter( currentChapter );
+ hasSkiped = true;
+ }
+ }
+ // if we couldn't skip chapters, try titles instead
+ if ( !hasSkiped && hasTitles )
+ {
+ // skip to the next title
+ currentTitle++;
+ // disallow area 0 since it is used for video_ts.vob
+ if ( currentTitle < numTitles - 1 )
+ {
+ ToggleTitle(currentTitle);
+ hasSkiped = true;
+ }
+ }
+#endif
+ }
+ // last but not least, skip to next file
+ if ( !hasSkiped )
+ PlaylistNext();
}
/*************************
{
// TODO: search and destroy -> deadlock!
return true;
- if ( p_playlist )
- {
- vlc_mutex_lock( &p_playlist->object_lock );
- return true;
- }
- return false;
+ if ( p_playlist )
+ {
+ vlc_mutex_lock( &p_playlist->object_lock );
+ return true;
+ }
+ return false;
}
// PlaylistUnlock
{
// TODO: search and destroy -> deadlock!
return;
- vlc_mutex_unlock( &p_playlist->object_lock );
+ vlc_mutex_unlock( &p_playlist->object_lock );
}
// PlaylistItemAt
void*
VlcWrapper::PlaylistItemAt( int index ) const
{
- playlist_item_t* item = NULL;
- if ( index >= 0 && index < p_playlist->i_size )
- item = p_playlist->pp_items[index];
- return (void*)item;
+ playlist_item_t* item = NULL;
+ if ( index >= 0 && index < p_playlist->i_size )
+ item = p_playlist->pp_items[index];
+ return (void*)item;
}
// PlaylistRemoveItem
void*
VlcWrapper::PlaylistRemoveItem( int index ) const
{
- playlist_item_t* copy = NULL;
- // check if item exists at the provided index
- if ( index >= 0 && index < p_playlist->i_size )
- {
- playlist_item_t* item = p_playlist->pp_items[index];
- if ( item )
- {
- // make a copy of the removed item
- copy = (playlist_item_t*)PlaylistCloneItem( (void*)item );
- // remove item from playlist (unfortunately, this frees it)
- playlist_Delete( p_playlist, index );
- }
- }
- return (void*)copy;
+ playlist_item_t* copy = NULL;
+ // check if item exists at the provided index
+ if ( index >= 0 && index < p_playlist->i_size )
+ {
+ playlist_item_t* item = p_playlist->pp_items[index];
+ if ( item )
+ {
+ // make a copy of the removed item
+ copy = (playlist_item_t*)PlaylistCloneItem( (void*)item );
+ // remove item from playlist (unfortunately, this frees it)
+ playlist_Delete( p_playlist, index );
+ }
+ }
+ return (void*)copy;
}
// PlaylistRemoveItem
void*
VlcWrapper::PlaylistRemoveItem( void* item ) const
{
- playlist_item_t* copy = NULL;
- for ( int32 i = 0; i < p_playlist->i_size; i++ )
- {
- if ( p_playlist->pp_items[i] == item )
- {
- copy = (playlist_item_t*)PlaylistRemoveItem( i );
- break;
- }
- }
- return (void*)copy;
+ playlist_item_t* copy = NULL;
+ for ( int32 i = 0; i < p_playlist->i_size; i++ )
+ {
+ if ( p_playlist->pp_items[i] == item )
+ {
+ copy = (playlist_item_t*)PlaylistRemoveItem( i );
+ break;
+ }
+ }
+ return (void*)copy;
}
// PlaylistAddItem
bool
VlcWrapper::PlaylistAddItem( void* item, int index ) const
{
- if ( item )
- {
- playlist_AddItem( p_playlist, (playlist_item_t*)item,
- PLAYLIST_INSERT, index );
- }
- // TODO: once playlist is returning useful info, return that instead
- return true;
+ if ( item )
+ {
+ playlist_AddItem( p_playlist, (playlist_item_t*)item,
+ PLAYLIST_INSERT, index );
+ }
+ // TODO: once playlist is returning useful info, return that instead
+ return true;
}
// PlaylistCloneItem
void*
VlcWrapper::PlaylistCloneItem( void* castToItem ) const
{
- playlist_item_t* copy = NULL;
- playlist_item_t* item = (playlist_item_t*)castToItem;
- if ( item )
- {
- copy = (playlist_item_t*)malloc( sizeof( playlist_item_t ) );
- if ( copy )
- {
- // make a copy of the item at index
+ playlist_item_t* copy = NULL;
+ playlist_item_t* item = (playlist_item_t*)castToItem;
+ if ( item )
+ {
+ copy = (playlist_item_t*)malloc( sizeof( playlist_item_t ) );
+ if ( copy )
+ {
+ // make a copy of the item at index
*copy = *item;
- copy->input.psz_name = strdup( item->input.psz_name );
- copy->input.psz_uri = strdup( item->input.psz_uri );
- }
- }
- return (void*)copy;
+ copy->input.psz_name = strdup( item->input.psz_name );
+ copy->input.psz_uri = strdup( item->input.psz_uri );
+ }
+ }
+ return (void*)copy;
}
// Careful! You need to know what you're doing here!
void
VlcWrapper::PlaylistSetPlaying( int index ) const
{
- if ( index < 0 )
- index = 0;
- if ( index >= p_playlist->i_size )
- index = p_playlist->i_size - 1;
- p_playlist->i_index = index;
+ if ( index < 0 )
+ index = 0;
+ if ( index >= p_playlist->i_size )
+ index = p_playlist->i_size - 1;
+ p_playlist->i_index = index;
}
if( !p_input )
return false;
- return ( p_input->stream.i_area_nb > 1 );
+ /* FIXME */
+ return false;
}
BList * VlcWrapper::GetTitles()
{
if( p_input )
{
+ BList *list = new BList();
+#if 0
vlc_mutex_lock( &p_input->stream.stream_lock );
- BList *list = new BList( p_input->stream.i_area_nb );
BMenuItem *menuItem;
BMessage *message;
}
vlc_mutex_unlock( &p_input->stream.stream_lock );
-
+#endif
return list;
}
return NULL;
void VlcWrapper::PrevTitle()
{
- int i_id;
- i_id = p_input->stream.p_selected_area->i_id - 1;
- if( i_id > 0 )
- {
- ToggleTitle(i_id);
- }
+ var_SetVoid( p_input, "prev-title" );
}
void VlcWrapper::NextTitle()
{
- unsigned int i_id;
- i_id = p_input->stream.p_selected_area->i_id + 1;
- if( i_id < p_input->stream.i_area_nb )
- {
- ToggleTitle(i_id);
- }
+ var_SetVoid( p_input, "next-title" );
}
void VlcWrapper::ToggleTitle(int i_title)
void VlcWrapper::TitleInfo( int32 ¤tIndex, int32 &maxIndex )
{
- currentIndex = -1;
- maxIndex = -1;
- if ( p_input )
- {
- vlc_mutex_lock( &p_input->stream.stream_lock );
+ currentIndex = -1;
+ maxIndex = -1;
+ if ( p_input )
+ {
+#if 0
+ vlc_mutex_lock( &p_input->stream.stream_lock );
- maxIndex = p_input->stream.i_area_nb - 1;
- if ( maxIndex > 0)
- currentIndex = p_input->stream.p_selected_area->i_id;
- else
- maxIndex = -1;
+ maxIndex = p_input->stream.i_area_nb - 1;
+ if ( maxIndex > 0)
+ currentIndex = p_input->stream.p_selected_area->i_id;
+ else
+ maxIndex = -1;
- vlc_mutex_unlock( &p_input->stream.stream_lock );
- }
+ vlc_mutex_unlock( &p_input->stream.stream_lock );
+#endif
+ }
}
bool VlcWrapper::HasChapters()
{
return false;
}
- return ( p_input->stream.p_selected_area->i_part_nb > 1 );
+ /* FIXME */
+ return false;
}
BList * VlcWrapper::GetChapters()
{
if( p_input )
{
+ BList *list = new BList();
+#if 0
vlc_mutex_lock( &p_input->stream.stream_lock );
- BList *list = new BList( p_input->stream.p_selected_area->i_part_nb );
BMenuItem *menuItem;
BMessage *message;
}
vlc_mutex_unlock( &p_input->stream.stream_lock );
-
+#endif
return list;
}
return NULL;
void VlcWrapper::PrevChapter()
{
- int i_id;
- i_id = p_input->stream.p_selected_area->i_part - 1;
- if( i_id >= 0 )
- {
- ToggleChapter(i_id);
- }
+ var_SetVoid( p_input, "prev-chapter" );
}
void VlcWrapper::NextChapter()
{
- int i_id;
- i_id = p_input->stream.p_selected_area->i_part + 1;
- if( i_id >= 0 )
- {
- ToggleChapter(i_id);
- }
+ var_SetVoid( p_input, "next-chapter" );
}
void VlcWrapper::ToggleChapter(int i_chapter)
void VlcWrapper::ChapterInfo( int32 ¤tIndex, int32 &maxIndex )
{
- currentIndex = -1;
- maxIndex = -1;
- if ( p_input )
- {
- vlc_mutex_lock( &p_input->stream.stream_lock );
+ currentIndex = -1;
+ maxIndex = -1;
+ if ( p_input )
+ {
+#if 0
+ vlc_mutex_lock( &p_input->stream.stream_lock );
- maxIndex = p_input->stream.p_selected_area->i_part_nb - 1;
- if ( maxIndex > 0)
- currentIndex = p_input->stream.p_selected_area->i_part;
- else
- maxIndex = -1;
+ maxIndex = p_input->stream.p_selected_area->i_part_nb - 1;
+ if ( maxIndex > 0)
+ currentIndex = p_input->stream.p_selected_area->i_part;
+ else
+ maxIndex = -1;
- vlc_mutex_unlock( &p_input->stream.stream_lock );
- }
+ vlc_mutex_unlock( &p_input->stream.stream_lock );
+#endif
+ }
}
/****************
if( !p_input )
return;
+#if 0
vout_thread_t * p_vout;
vlc_mutex_lock( &p_input->stream.stream_lock );
}
}
vlc_mutex_unlock( &p_input->stream.stream_lock );
+#endif
}
projects / vlc / commitdiff