[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[615] mplayerxp
Brought to you by:
olov
Menu
▾
▴
[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[615] mplayerxp
|
From: <nic...@us...> - 2012-12-28 07:33:37
|
Revision: 615
http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=615&view=rev
Author: nickols_k
Date: 2012-12-28 07:33:30 +0000 (Fri, 28 Dec 2012)
Log Message:
-----------
remove unused stuff
Modified Paths:
--------------
mplayerxp/libmpconf/Makefile
mplayerxp/libvo2/vo_opengl.cpp
Removed Paths:
-------------
mplayerxp/libmpconf/subopt-helper.cpp
mplayerxp/libmpconf/subopt-helper.h
Modified: mplayerxp/libmpconf/Makefile
===================================================================
--- mplayerxp/libmpconf/Makefile 2012-12-28 07:23:44 UTC (rev 614)
+++ mplayerxp/libmpconf/Makefile 2012-12-28 07:33:30 UTC (rev 615)
@@ -6,7 +6,7 @@
DO_MAKE = @ for i in $(SUBDIRS); do $(MAKE) -C $$i $@ || exit; done
DO_ALL = @ for i in $(SUBDIRS); do $(MAKE) -C $$i all || exit; done
-CXXSRCS=cfgparser.cpp m_option.cpp m_property.cpp m_struct.cpp subopt-helper.cpp
+CXXSRCS=cfgparser.cpp m_option.cpp m_property.cpp m_struct.cpp
SRCS =
ifeq ($(ENABLE_WIN32LOADER),yes)
CXXSRCS += codec-cfg.cpp
Deleted: mplayerxp/libmpconf/subopt-helper.cpp
===================================================================
--- mplayerxp/libmpconf/subopt-helper.cpp 2012-12-28 07:23:44 UTC (rev 614)
+++ mplayerxp/libmpconf/subopt-helper.cpp 2012-12-28 07:33:30 UTC (rev 615)
@@ -1,325 +0,0 @@
-#include "mpxp_config.h"
-#include "osdep/mplib.h"
-using namespace mpxp;
-/**
- * \file subopt-helper.c
- *
- * \brief Compensates the suboption parsing code duplication a bit.
- *
- * The routines defined below are there to help you with the
- * suboption parsing. Meaning extracting the options and their
- * values for you and also outputting generic help message if
- * a parse error is encountered.
- *
- * Most stuff happens in the subopt_parse function: if you call it
- * it parses for the passed opts in the passed string. It calls some
- * extra functions for explicit argument parsing ( where the option
- * itself isn't the argument but a value given after the argument
- * delimiter ('='). It also calls your test function if you supplied
- * one.
- *
- */
-#include <stdlib.h>
-#include <string.h>
-#include <limits.h>
-
-#include "subopt-helper.h"
-#include "global_msg.h"
-
-/* prototypes for argument parsing */
-static char const * parse_int( char const * const str, int * const valp );
-static char const * parse_str( char const * const str, strarg_t * const valp );
-static char const * parse_float( char const * const str, float * const valp );
-
-/**
- * \brief Try to parse all options in str and fail if it was not possible.
- *
- * \param str Pointer to the zero terminated string to be parsed.
- * \param opts Pointer to a options array. The array must be terminated
- * with an element having set name to NULL in its opt_t structure.
- *
- * \return The return value is zero if the string could be parsed
- * else a non-zero value is returned.
- *
- */
-int subopt_parse( char const * const str, const opt_t * opts )
-{
- int parse_err = 0, idx;
- unsigned int parse_pos = 0;
-
- if ( str )
- {
- while ( str[parse_pos] && !parse_err )
- {
- int next = 0;
-
- idx = 0; // reset index for the below loop
- while ( opts[idx].name )
- {
- int opt_len;
- int substr_len;
-
- // get length of the option we test against */
- opt_len = strlen( opts[idx].name );
-
- // get length of the current substring of str */
- {
- const char* arg_delim;
- const char* delim;
-
- /* search nearest delimiter ( option or argument delimiter ) */
- delim = strchr( &str[parse_pos], ':' );
- arg_delim = strchr( &str[parse_pos], '=' );
-
- if ( ( delim && arg_delim && delim > arg_delim ) ||
- delim == NULL )
- {
- delim = strchr( &str[parse_pos], '=' );
- }
-
- substr_len = delim ? // is a delim present
- delim - &str[parse_pos] : // yes
- strlen( &str[parse_pos] ); // no, end of string
- }
-
- //printf( "substr_len=%d, opt_len=%d\n", substr_len, opt_len );
-
- /* Check if the length of the current option matches the *
- * length of the option we want to test again. */
- if ( substr_len == opt_len )
-{
- /* check if option was activated/deactivated */
- if( strncmp( &str[parse_pos], opts[idx].name, opt_len ) == 0 )
- {
- /* option was found */
- next = 1;
-
- /* type specific code */
- if ( opts[idx].type == OPT_ARG_BOOL )
- {
- /* Handle OPT_ARG_BOOL separately so *
- * the others can share code. */
-
- /* set option to true */
- *((int *)(opts[idx].valp)) = 1;
-
- /* increment position */
- parse_pos += opt_len;
- }
- else
- {
- /* Type is not OPT_ARG_BOOL, means we have to parse *
- * for the arg delimiter character and eventually *
- * call a test function. */
- char const * last;
-
- /* increment position to check for arg */
- parse_pos += opt_len;
-
- if ( str[parse_pos] != '=' )
- {
- parse_err = 1; break;
- }
-
- /* '=' char was there, so let's move after it */
- ++parse_pos;
-
- switch ( opts[idx].type )
- {
- case OPT_ARG_INT:
- last = parse_int( &str[parse_pos],
- (int *)opts[idx].valp );
-
- break;
- case OPT_ARG_STR:
- last = parse_str( &str[parse_pos],
- (strarg_t *)opts[idx].valp );
- break;
- case OPT_ARG_MSTRZ:
- {
- char **valp = reinterpret_cast<char**>(opts[idx].valp);
- strarg_t tmp;
- tmp.str = NULL;
- tmp.len = 0;
- last = parse_str( &str[parse_pos], &tmp );
- if (*valp)
- delete *valp;
- *valp = NULL;
- if (tmp.str && tmp.len > 0) {
- *valp = new char [tmp.len + 1];
- memcpy(*valp, tmp.str, tmp.len);
- (*valp)[tmp.len] = 0;
- }
- break;
- }
- case OPT_ARG_FLOAT:
- last = parse_float( &str[parse_pos],
- (float *)opts[idx].valp );
- break;
- default:
- last = NULL; // break parsing!
- }
-
- /* was the conversion succesful? */
- if ( !last )
- {
- parse_err = 1; break;
- }
-
- /* make test if supplied */
- if ( opts[idx].test && !opts[idx].test( opts[idx].valp ) )
- {
- parse_err = 1; break;
- }
-
- /* we succeded, set position */
- parse_pos = last - str;
- }
- }
-}
-else if ( substr_len == opt_len+2 )
-{
- if ( opts[idx].type == OPT_ARG_BOOL && // check for no<opt>
- strncmp( &str[parse_pos], "no", 2 ) == 0 &&
- strncmp( &str[parse_pos+2], opts[idx].name, opt_len ) == 0 )
- {
- /* option was found but negated */
- next = 1;
-
- /* set arg to false */
- *((int *)(opts[idx].valp)) = 0;
-
- /* increment position */
- parse_pos += opt_len+2;
- }
-}
-
- ++idx; // test against next option
-
- /* break out of the loop, if this subopt is processed */
- if ( next ) { break; }
- }
-
- /* if we had a valid suboption the current pos should *
- * equal the delimiter char, which should be ':' for *
- * suboptions. */
- if ( !parse_err && str[parse_pos] == ':' ) { ++parse_pos; }
- else if ( str[parse_pos] ) { parse_err = 1; }
- }
- }
-
- /* if an error was encountered */
- if (parse_err)
- {
- unsigned int i;
- MSG_FATAL("Could not parse arguments at the position indicated below:\n%s\n", str );
- for ( i = 0; i < parse_pos; ++i )
- {
- MSG_FATAL(" ");
- }
- MSG_FATAL("^\n");
-
- return -1;
- }
-
- /* we could parse everything */
- return 0;
-}
-
-static char const * parse_int( char const * const str, int * const valp )
-{
- char * endp;
-
- *valp = (int)strtol( str, &endp, 0 );
-
- /* nothing was converted */
- if ( str == endp ) { return NULL; }
-
- return endp;
-}
-
-static char const * parse_float( char const * const str, float * const valp )
-{
- char * endp;
-
- *valp = strtod( str, &endp );
-
- /* nothing was converted */
- if ( str == endp ) { return NULL; }
-
- return endp;
-}
-
-static const char QUOTE_CHAR='%';
-static char const * parse_str( char const * str, strarg_t * const valp )
-{
- char const * match = strchr( str, ':' );
-
- if (str[0] == QUOTE_CHAR) {
- int len = 0;
- str = &str[1];
- len = (int)strtol(str, (char **)&str, 0);
- if (!str || str[0] != QUOTE_CHAR || (len > strlen(str) - 1))
- return NULL;
- str = &str[1];
- match = &str[len];
- }
- else
- if (str[0] == '"') {
- str = &str[1];
- match = strchr(str, '"');
- if (!match)
- return NULL;
- valp->len = match - str;
- valp->str = str;
- return &match[1];
- }
- if ( !match )
- match = &str[strlen(str)];
-
- // empty string or too long
- if ((match == str) || (match - str > INT_MAX))
- return NULL;
-
- valp->len = match - str;
- valp->str = str;
-
- return match;
-}
-
-
-/*** common test functions ***/
-
-/** \brief Test if i is not negative */
-int int_non_neg( int * i )
-{
- if ( *i < 0 ) { return 0; }
-
- return 1;
-}
-/** \brief Test if i is positive. */
-int int_pos( int * i )
-{
- if ( *i > 0 ) { return 1; }
-
- return 0;
-}
-
-/*** little helpers */
-
-/** \brief compare the stings just as strcmp does */
-int strargcmp(strarg_t *arg, const char *str) {
- int res = strncmp(arg->str, str, arg->len);
- if (!res && arg->len != strlen(str))
- res = arg->len - strlen(str);
- return res;
-}
-
-/** \brief compare the stings just as strcasecmp does */
-int strargcasecmp(strarg_t *arg, char *str) {
- int res = strncasecmp(arg->str, str, arg->len);
- if (!res && arg->len != strlen(str))
- res = arg->len - strlen(str);
- return res;
-}
-
Deleted: mplayerxp/libmpconf/subopt-helper.h
===================================================================
--- mplayerxp/libmpconf/subopt-helper.h 2012-12-28 07:23:44 UTC (rev 614)
+++ mplayerxp/libmpconf/subopt-helper.h 2012-12-28 07:33:30 UTC (rev 615)
@@ -1,44 +0,0 @@
-#ifndef MPLAYER_SUBOPT_HELPER_H
-#define MPLAYER_SUBOPT_HELPER_H
-
-#include "mpxp_config.h"
-/**
- * \file subopt-helper.h
- *
- * \brief Datatype and functions declarations for usage
- * of the suboption parser.
- *
- */
-enum {
- OPT_ARG_BOOL =0,
- OPT_ARG_INT =1,
- OPT_ARG_STR =2,
- OPT_ARG_MSTRZ =3, ///< A malloced, zero terminated string, use mp_free()!
- OPT_ARG_FLOAT =4
-};
-typedef int (*opt_test_f)(any_t*);
-
-/** simple structure for defining the option name, type and storage location */
-struct opt_t {
- const char * name; ///< string that identifies the option
- int type; ///< option type as defined in subopt-helper.h
- any_t* valp; ///< pointer to the mem where the value should be stored
- opt_test_f test; ///< argument test func ( optional )
-};
-
-/** parses the string for the options specified in opt */
-int subopt_parse( char const * const str, const opt_t * opts );
-
-
-/*------------------ arg specific types and declaration -------------------*/
-typedef struct strarg_t {
- int len; ///< length of the string determined by the parser
- char const * str; ///< pointer to position inside the parse string
-};
-
-int int_non_neg( int * i );
-int int_pos( int * i );
-
-int strargcmp(strarg_t *arg, const char *str);
-int strargcasecmp(strarg_t *arg, char *str);
-#endif /* MPLAYER_SUBOPT_HELPER_H */
Modified: mplayerxp/libvo2/vo_opengl.cpp
===================================================================
--- mplayerxp/libvo2/vo_opengl.cpp 2012-12-28 07:23:44 UTC (rev 614)
+++ mplayerxp/libvo2/vo_opengl.cpp 2012-12-28 07:33:30 UTC (rev 615)
@@ -33,7 +33,6 @@
#include "video_out_internal.h"
#include "font_load.h"
#include "sub.h"
-#include "libmpconf/subopt-helper.h"
#include "postproc/swscale.h" /* for MODE_RGB(BGR) definitions */
#ifdef GL_WIN32
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
