* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
#include <vlc_input.h>
#include "history.h"
#include "xarray.h"
#ifdef HAVE_STDLIB_H
-# include <stdlib.h> /* realloc() */
+# include <stdlib.h> /* malloc() */
#endif
#undef HISTORY_DEBUG
/*****************************************************************************
* Local prototypes
*****************************************************************************/
+#ifdef HISTORY_DEBUG
static void history_Dump( history_t *p_history );
+#endif
/*****************************************************************************
* Local structure lock
history_t *history_New( void )
{
history_t *p_new_history;
-
+
p_new_history = calloc( 1, sizeof( struct history_t ) );
if( p_new_history == NULL ) return NULL;
return NULL;
}
-#ifndef HISTORY_DEBUG
- /* make dummy reference to history_Dump to avoid compiler warnings */
- while (0)
- {
- void *p_tmp;
-
- p_tmp = history_Dump;
- }
-#endif
-
return p_new_history;
}
-vlc_bool_t history_GoBackSavingCurrentItem ( history_t *p_history,
+bool history_GoBackSavingCurrentItem ( history_t *p_history,
history_item_t *p_item )
{
history_PruneAndInsert( p_history, p_item );
#ifdef HISTORY_DEBUG
history_Dump( p_history );
#endif
- return VLC_TRUE;
+ return true;
}
+#ifdef HISTORY_DEBUG
static void history_Dump( history_t *p_history )
{
unsigned int i_count;
fprintf( stderr, "HISTORY: [%d] NULL\n", i );
else
{
- char *psz_uri = input_item_GetURI( p_item );
fprintf( stderr, "HISTORY: [%d] %p (%p->%s)\n", i, p_item,
- psz_uri, psz_uri );
- free( psz_uri );
+ p_item->psz_uri, p_item->psz_uri );
}
}
}
+#endif
-vlc_bool_t history_GoForwardSavingCurrentItem ( history_t *p_history,
+bool history_GoForwardSavingCurrentItem ( history_t *p_history,
history_item_t *p_item )
{
#ifdef HISTORY_DEBUG
== XARRAY_SUCCESS )
{
p_history->i_index++;
- return VLC_TRUE;
+ return true;
}
else
{
- return VLC_FALSE;
+ return false;
}
}
-vlc_bool_t history_CanGoBack( history_t *p_history )
+bool history_CanGoBack( history_t *p_history )
{
if( p_history->i_index > 0 )
- return VLC_TRUE;
+ return true;
else
- return VLC_FALSE;
+ return false;
}
-vlc_bool_t history_CanGoForward( history_t *p_history )
+bool history_CanGoForward( history_t *p_history )
{
unsigned int i_count;
if( xarray_Count( p_history->p_xarray, &i_count ) != XARRAY_SUCCESS )
- return VLC_FALSE;
+ return false;
if( p_history->i_index < i_count )
- return VLC_TRUE;
+ return true;
else
- return VLC_FALSE;
+ return false;
}
history_item_t *history_Item( history_t *p_history )