X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_deque.c;h=1be59298926ec8e3bae2210343803d866b15cd68;hb=bf3264b9e340ba5c11cbf59835a8af3db94e0cc2;hp=c048310c430b675d6bb84815bc8c997ead297c81;hpb=15a23435c82ba0435061a35611c6afbe24d09e32;p=melted diff --git a/src/framework/mlt_deque.c b/src/framework/mlt_deque.c index c048310..1be5929 100644 --- a/src/framework/mlt_deque.c +++ b/src/framework/mlt_deque.c @@ -3,19 +3,19 @@ * Copyright (C) 2003-2004 Ushodaya Enterprises Limited * Author: Charles Yates * - * 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 library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * This library 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. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser 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-1307, USA. + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ // Local header files @@ -25,12 +25,20 @@ #include #include +typedef union +{ + void *addr; + int value; + double floating; +} +deque_entry; + /** Private structure. */ struct mlt_deque_s { - void **list; + deque_entry *list; int size; int count; }; @@ -40,7 +48,14 @@ struct mlt_deque_s mlt_deque mlt_deque_init( ) { - return calloc( 1, sizeof( struct mlt_deque_s ) ); + mlt_deque this = malloc( sizeof( struct mlt_deque_s ) ); + if ( this != NULL ) + { + this->list = NULL; + this->size = 0; + this->count = 0; + } + return this; } /** Return the number of items in the deque. @@ -58,8 +73,8 @@ static int mlt_deque_allocate( mlt_deque this ) { if ( this->count == this->size ) { - this->list = realloc( this->list, sizeof( void * ) * ( this->size + 10 ) ); - this->size += 10; + this->list = realloc( this->list, sizeof( deque_entry ) * ( this->size + 20 ) ); + this->size += 20; } return this->list == NULL; } @@ -72,7 +87,7 @@ int mlt_deque_push_back( mlt_deque this, void *item ) int error = mlt_deque_allocate( this ); if ( error == 0 ) - this->list[ this->count ++ ] = item; + this->list[ this->count ++ ].addr = item; return error; } @@ -82,7 +97,7 @@ int mlt_deque_push_back( mlt_deque this, void *item ) void *mlt_deque_pop_back( mlt_deque this ) { - return this->count > 0 ? this->list[ -- this->count ] : NULL; + return this->count > 0 ? this->list[ -- this->count ].addr : NULL; } /** Queue an item at the start. @@ -94,8 +109,8 @@ int mlt_deque_push_front( mlt_deque this, void *item ) if ( error == 0 ) { - memmove( &this->list[ 1 ], this->list, ( this->count ++ ) * sizeof( void * ) ); - this->list[ 0 ] = item; + memmove( &this->list[ 1 ], this->list, ( this->count ++ ) * sizeof( deque_entry ) ); + this->list[ 0 ].addr = item; } return error; @@ -110,8 +125,8 @@ void *mlt_deque_pop_front( mlt_deque this ) if ( this->count > 0 ) { - item = this->list[ 0 ]; - memmove( this->list, &this->list[ 1 ], ( -- this->count ) * sizeof( void * ) ); + item = this->list[ 0 ].addr; + memmove( this->list, &this->list[ 1 ], ( -- this->count ) * sizeof( deque_entry ) ); } return item; @@ -122,7 +137,7 @@ void *mlt_deque_pop_front( mlt_deque this ) void *mlt_deque_peek_back( mlt_deque this ) { - return this->count > 0 ? this->list[ this->count - 1 ] : NULL; + return this->count > 0 ? this->list[ this->count - 1 ].addr : NULL; } /** Inquire on item at front of deque but don't remove. @@ -130,7 +145,145 @@ void *mlt_deque_peek_back( mlt_deque this ) void *mlt_deque_peek_front( mlt_deque this ) { - return this->count > 0 ? this->list[ 0 ] : NULL; + return this->count > 0 ? this->list[ 0 ].addr : NULL; +} + +/** Push an item to the end. +*/ + +int mlt_deque_push_back_int( mlt_deque this, int item ) +{ + int error = mlt_deque_allocate( this ); + + if ( error == 0 ) + this->list[ this->count ++ ].value = item; + + return error; +} + +/** Pop an item. +*/ + +int mlt_deque_pop_back_int( mlt_deque this ) +{ + return this->count > 0 ? this->list[ -- this->count ].value : 0; +} + +/** Queue an item at the start. +*/ + +int mlt_deque_push_front_int( mlt_deque this, int item ) +{ + int error = mlt_deque_allocate( this ); + + if ( error == 0 ) + { + memmove( &this->list[ 1 ], this->list, ( this->count ++ ) * sizeof( deque_entry ) ); + this->list[ 0 ].value = item; + } + + return error; +} + +/** Remove an item from the start. +*/ + +int mlt_deque_pop_front_int( mlt_deque this ) +{ + int item = 0; + + if ( this->count > 0 ) + { + item = this->list[ 0 ].value; + memmove( this->list, &this->list[ 1 ], ( -- this->count ) * sizeof( deque_entry ) ); + } + + return item; +} + +/** Inquire on item at back of deque but don't remove. +*/ + +int mlt_deque_peek_back_int( mlt_deque this ) +{ + return this->count > 0 ? this->list[ this->count - 1 ].value : 0; +} + +/** Inquire on item at front of deque but don't remove. +*/ + +int mlt_deque_peek_front_int( mlt_deque this ) +{ + return this->count > 0 ? this->list[ 0 ].value : 0; +} + +/** Push an item to the end. +*/ + +int mlt_deque_push_back_double( mlt_deque this, double item ) +{ + int error = mlt_deque_allocate( this ); + + if ( error == 0 ) + this->list[ this->count ++ ].floating = item; + + return error; +} + +/** Pop an item. +*/ + +double mlt_deque_pop_back_double( mlt_deque this ) +{ + return this->count > 0 ? this->list[ -- this->count ].floating : 0; +} + +/** Queue an item at the start. +*/ + +int mlt_deque_push_front_double( mlt_deque this, double item ) +{ + int error = mlt_deque_allocate( this ); + + if ( error == 0 ) + { + memmove( &this->list[ 1 ], this->list, ( this->count ++ ) * sizeof( deque_entry ) ); + this->list[ 0 ].floating = item; + } + + return error; +} + +/** Remove an item from the start. +*/ + +double mlt_deque_pop_front_double( mlt_deque this ) +{ + double item = 0; + + if ( this->count > 0 ) + { + item = this->list[ 0 ].floating; + memmove( this->list, &this->list[ 1 ], ( -- this->count ) * sizeof( deque_entry ) ); + } + + return item; +} + +/** Inquire on item at back of deque but don't remove. +*/ + +double mlt_deque_peek_back_double( mlt_deque this ) +{ + return this->count > 0 ? this->list[ this->count - 1 ].floating : 0; +} + +/** Inquire on item at front of deque but don't remove. +*/ + +double mlt_deque_peek_front_double( mlt_deque this ) +{ + return this->count > 0 ? this->list[ 0 ].floating : 0; } /** Close the queue. @@ -142,4 +295,3 @@ void mlt_deque_close( mlt_deque this ) free( this ); } -