[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[618] mplayerxp
Brought to you by:
olov
Menu
▾
▴
[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[618] mplayerxp
|
From: <nic...@us...> - 2012-12-28 12:53:09
|
Revision: 618
http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=618&view=rev
Author: nickols_k
Date: 2012-12-28 12:53:00 +0000 (Fri, 28 Dec 2012)
Log Message:
-----------
cleanups
Modified Paths:
--------------
mplayerxp/libmpconf/cfgparser.cpp
mplayerxp/libmpconf/cfgparser.h
mplayerxp/libplaytree/playtree.cpp
mplayerxp/libplaytree/playtree.h
mplayerxp/mplayerxp.cpp
mplayerxp/mplayerxp.h
mplayerxp/postproc/libmenu/menu_pt.cpp
Modified: mplayerxp/libmpconf/cfgparser.cpp
===================================================================
--- mplayerxp/libmpconf/cfgparser.cpp 2012-12-28 12:22:38 UTC (rev 617)
+++ mplayerxp/libmpconf/cfgparser.cpp 2012-12-28 12:53:00 UTC (rev 618)
@@ -271,14 +271,9 @@
out:
if(ret >= 0 && ! is_running() && !is_global() && ! (conf[i].flags & CONF_GLOBAL) && conf[i].type != CONF_TYPE_SUBCONFIG ) {
PlayTree* dest = last_entry ? last_entry : last_parent;
- std::string o;
- if(sub_conf) o=std::string(sub_conf)+":"+opt;
- else o=opt;
- if(ret == 0)
- dest->set_param(o,"");
- else if(ret > 0)
- dest->set_param(o,param);
+ if(ret == 0) dest->set_param(opt,"");
+ else if(ret > 0) dest->set_param(opt,param);
}
return ret;
err_missing_param:
@@ -395,13 +390,13 @@
line_pos = 0;
/* skip whitespaces */
- while (isspace(line[line_pos])) ++line_pos;
+ while (::isspace(line[line_pos])) ++line_pos;
/* EOL / comment */
if (line[line_pos] == '\0' || line[line_pos] == '#') continue;
/* read option. */
- for (opt_pos = 0; isprint(line[line_pos]) &&
+ for (opt_pos = 0; ::isprint(line[line_pos]) &&
line[line_pos] != ' ' &&
line[line_pos] != '#' &&
line[line_pos] != '='; /* NOTHING */) {
@@ -424,7 +419,7 @@
opt[opt_pos] = '\0';
/* skip whitespaces */
- while (isspace(line[line_pos])) ++line_pos;
+ while (::isspace(line[line_pos])) ++line_pos;
/* check '=' */
if (line[line_pos++] != '=') {
@@ -436,7 +431,7 @@
}
/* whitespaces... */
- while (isspace(line[line_pos])) ++line_pos;
+ while (::isspace(line[line_pos])) ++line_pos;
/* read the parameter */
if (line[line_pos] == '"' || line[line_pos] == '\'') {
@@ -454,7 +449,7 @@
}
line_pos++; /* skip the closing " or ' */
} else {
- for (param_pos = 0; isprint(line[line_pos]) && !isspace(line[line_pos])
+ for (param_pos = 0; ::isprint(line[line_pos]) && !::isspace(line[line_pos])
&& line[line_pos] != '#'; /* NOTHING */) {
param[param_pos++] = line[line_pos++];
if (param_pos >= MAX_PARAM_LEN) {
@@ -479,7 +474,7 @@
/* now, check if we have some more chars on the line */
/* whitespace... */
- while (isspace(line[line_pos])) ++line_pos;
+ while (::isspace(line[line_pos])) ++line_pos;
/* EOL / comment */
if (line[line_pos] != '\0' && line[line_pos] != '#') {
@@ -897,7 +892,7 @@
::write(conffile_fd, default_config, strlen(default_config));
::close(conffile_fd);
}
- if (parse_config_file(conffile) != MPXP_Ok) exit(1);
+ if (parse_config_file(conffile) != MPXP_Ok) ::exit(1);
}
}
Modified: mplayerxp/libmpconf/cfgparser.h
===================================================================
--- mplayerxp/libmpconf/cfgparser.h 2012-12-28 12:22:38 UTC (rev 617)
+++ mplayerxp/libmpconf/cfgparser.h 2012-12-28 12:53:00 UTC (rev 618)
@@ -132,7 +132,6 @@
std::vector<const mpxp_option_t*> opt_list;
mode_e parser_mode;
flags_e flags;
- const char* sub_conf; // When we save a subconfig
PlayTree* pt; // play tree we use for playlist option, etc
PlayTree* last_entry; // last added entry
PlayTree* last_parent; // if last_entry is NULL we must create child of this
Modified: mplayerxp/libplaytree/playtree.cpp
===================================================================
--- mplayerxp/libplaytree/playtree.cpp 2012-12-28 12:22:38 UTC (rev 617)
+++ mplayerxp/libplaytree/playtree.cpp 2012-12-28 12:53:00 UTC (rev 618)
@@ -319,14 +319,14 @@
return NULL;
}
-_PlayTree_Iter::_PlayTree_Iter(PlayTree* pt,M_Config& _config)
+PlayTree_Iter::PlayTree_Iter(PlayTree* pt,M_Config& _config)
:root(pt),
tree(NULL),
config(_config) {
if(pt->get_parent()) loop = pt->get_parent()->get_loop();
}
-_PlayTree_Iter::_PlayTree_Iter(const _PlayTree_Iter& old)
+PlayTree_Iter::PlayTree_Iter(const PlayTree_Iter& old)
:root(old.root),
tree(old.tree),
config(old.config),
@@ -335,9 +335,9 @@
num_files(old.num_files),
mode(old.mode) {}
-_PlayTree_Iter::~_PlayTree_Iter() {}
+PlayTree_Iter::~PlayTree_Iter() {}
-void _PlayTree_Iter::push_params() {
+void PlayTree_Iter::push_params() {
PlayTree* pt;
pt = tree;
@@ -354,7 +354,7 @@
return;
}
-int _PlayTree_Iter::step(int d,int with_nodes) {
+int PlayTree_Iter::step(int d,int with_nodes) {
PlayTree* pt;
int rnd;
@@ -430,7 +430,7 @@
return PLAY_TREE_ITER_ENTRY;
}
-int _PlayTree_Iter::up_step(int d,int with_nodes) {
+int PlayTree_Iter::up_step(int d,int with_nodes) {
file = -1;
if(tree->get_parent() == root->get_parent()) return PLAY_TREE_ITER_END;
@@ -441,7 +441,7 @@
return step(d,with_nodes);
}
-int _PlayTree_Iter::down_step(int d,int with_nodes) {
+int PlayTree_Iter::down_step(int d,int with_nodes) {
file = -1;
// Push subtree params
@@ -459,7 +459,7 @@
return step(0,with_nodes);
}
-std::string _PlayTree_Iter::get_file(int d) {
+std::string PlayTree_Iter::get_file(int d) {
std::string entry;
if(tree->get_files().empty()) return "";
@@ -506,79 +506,3 @@
}
} // namespace mpxp
-
-void pt_iter_destroy(_PlayTree_Iter** iter)
-{
- if (iter && *iter)
- {
- delete *iter;
- iter=NULL;
- }
-}
-
-std::string pt_iter_get_file(_PlayTree_Iter* iter, int d)
-{
- int i=0;
- std::string r;
-
- if (iter==NULL)
- return NULL;
-
- r = iter->get_file(d);
-
- while (r.empty() && d!=0)
- {
- if (iter->step(d,0) != PLAY_TREE_ITER_ENTRY) break;
- r=iter->get_file(d);
- i++;
- }
-
- return r;
-}
-
-void pt_iter_insert_entry(_PlayTree_Iter* iter, PlayTree* entry)
-{
- PlayTree *pt = iter->get_tree();
-
- pt->insert_entry(entry);
- entry->set_params_from(*pt);
-}
-
-void pt_iter_replace_entry(_PlayTree_Iter* iter, PlayTree* entry)
-{
- PlayTree *pt = iter->get_tree();
-
- pt_iter_insert_entry(iter, entry);
- pt->remove(1, 1);
- iter->set_tree(entry);
-}
-
-//Add a new file as a new entry
-void pt_add_file(PlayTree** ppt,const std::string& filename)
-{
- PlayTree *pt = *ppt, *entry = new(zeromem) PlayTree;
-
- entry->add_file(filename);
- if (pt)
- pt->append_entry(entry);
- else
- {
- pt=entry;
- *ppt=pt;
- }
- entry->set_params_from(*pt);
-}
-
-void pt_add_gui_file(PlayTree** ppt,const std::string& path,const std::string& file)
-{
- std::string wholename;
-
- wholename=path+"/"+file;
- pt_add_file(ppt, wholename);
-}
-
-void pt_iter_goto_head(_PlayTree_Iter* iter)
-{
- iter->reset_tree();
- iter->step(0, 0);
-}
Modified: mplayerxp/libplaytree/playtree.h
===================================================================
--- mplayerxp/libplaytree/playtree.h 2012-12-28 12:22:38 UTC (rev 617)
+++ mplayerxp/libplaytree/playtree.h 2012-12-28 12:53:00 UTC (rev 618)
@@ -110,11 +110,11 @@
int flags;
};
- struct _PlayTree_Iter : public Opaque {
+ struct PlayTree_Iter : public Opaque {
public:
- _PlayTree_Iter(PlayTree* parent,M_Config& config);
- _PlayTree_Iter(const _PlayTree_Iter& old);
- virtual ~_PlayTree_Iter();
+ PlayTree_Iter(PlayTree* parent,M_Config& config);
+ PlayTree_Iter(const PlayTree_Iter& old);
+ virtual ~PlayTree_Iter();
// d is the direction : d > 0 == next , d < 0 == prev
// with_node : TRUE == stop on nodes with childs, FALSE == go directly to the next child
@@ -141,46 +141,7 @@
int num_files;
int mode;
- std::stack<int> status_stack;
+ std::stack<int> status_stack;
};
} // namespace mpxp
-
-/// \defgroup PtAPI Playtree highlevel API
-/// \ingroup Playtree
-/// Highlevel API with pt-suffix to different from low-level API
-/// by Fabian Franz (mp...@fa...).
-///@{
-
-/// Frees the iter.
-void pt_iter_destroy(_PlayTree_Iter** iter);
-
-/// Gets the next available file in the direction (d=-1 || d=+1).
-std::string pt_iter_get_file(_PlayTree_Iter* iter, int d);
-
-// Two Macros that implement forward and backward direction.
-static inline std::string pt_iter_get_next_file(_PlayTree_Iter* iter) { return pt_iter_get_file(iter, 1); }
-static inline std::string pt_iter_get_prev_file(_PlayTree_Iter* iter) { return pt_iter_get_file(iter, -1); }
-
-/// Inserts entry into the playtree.
-void pt_iter_insert_entry(_PlayTree_Iter* iter, PlayTree* entry);
-
-/// Replaces current entry in playtree with entry by doing insert and remove.
-void pt_iter_replace_entry(_PlayTree_Iter* iter, PlayTree* entry);
-
-/// Adds a new file to the playtree, if it is not valid it is created.
-void pt_add_file(PlayTree** ppt,const std::string& filename);
-
-/// \brief Performs a convert to playtree-syntax, by concat path/file
-/// and performs pt_add_file
-void pt_add_gui_file(PlayTree** ppt,const std::string& path,const std::string& file);
-
-// Two macros to use only the iter and not the other things.
-static inline void pt_iter_add_file(_PlayTree_Iter* iter, const std::string& filename) { PlayTree* tree=iter->get_tree(); pt_add_file(&tree, filename); }
-static inline void pt_iter_add_gui_file(_PlayTree_Iter* iter,const std::string& path,const std::string& name) { PlayTree* tree=iter->get_tree(); pt_add_gui_file(&tree, path, name); }
-
-/// Resets the iter and goes back to head.
-void pt_iter_goto_head(_PlayTree_Iter* iter);
-
-///@}
-
#endif
Modified: mplayerxp/mplayerxp.cpp
===================================================================
--- mplayerxp/mplayerxp.cpp 2012-12-28 12:22:38 UTC (rev 617)
+++ mplayerxp/mplayerxp.cpp 2012-12-28 12:53:00 UTC (rev 618)
@@ -156,7 +156,7 @@
int osd_function;
PlayTree* playtree;
// for multifile support:
- _PlayTree_Iter* playtree_iter;
+ PlayTree_Iter* playtree_iter;
private:
Opaque unusable;
Demuxer* _demuxer;
@@ -1395,7 +1395,7 @@
exit_player(MSGTR_Exit_quit);
case MP_CMD_PLAY_TREE_STEP : {
int n = cmd->args[0].v.i > 0 ? 1 : -1;
- _PlayTree_Iter* it = new _PlayTree_Iter(*playtree_iter);
+ PlayTree_Iter* it = new PlayTree_Iter(*playtree_iter);
if(it->step(n,0) == PLAY_TREE_ITER_ENTRY)
eof = (n > 0) ? PT_NEXT_ENTRY : PT_PREV_ENTRY;
@@ -1403,7 +1403,7 @@
} break;
case MP_CMD_PLAY_TREE_UP_STEP : {
int n = cmd->args[0].v.i > 0 ? 1 : -1;
- _PlayTree_Iter* it = new _PlayTree_Iter(*playtree_iter);
+ PlayTree_Iter* it = new PlayTree_Iter(*playtree_iter);
if(it->up_step(n,0) == PLAY_TREE_ITER_ENTRY)
eof = (n > 0) ? PT_UP_NEXT : PT_UP_PREV;
delete it;
@@ -1564,7 +1564,7 @@
return eof;
}
-_PlayTree_Iter* mpxp_get_playtree_iter() { return mpxp_context().engine().MPXPSys->playtree_iter; }
+PlayTree_Iter& mpxp_get_playtree_iter() { return *(mpxp_context().engine().MPXPSys->playtree_iter); }
/******************************************\
* MAIN MPLAYERXP FUNCTION !!! *
\******************************************/
@@ -1633,7 +1633,7 @@
// MPXPSys.playtree = play_tree_cleanup(MPXPSys.playtree);
if(MPXPSys.playtree) {
- MPXPSys.playtree_iter = new _PlayTree_Iter(MPXPSys.playtree,m_config);
+ MPXPSys.playtree_iter = new PlayTree_Iter(MPXPSys.playtree,m_config);
if(MPXPSys.playtree_iter) {
if(MPXPSys.playtree_iter->step(0,0) != PLAY_TREE_ITER_ENTRY) {
delete MPXPSys.playtree_iter;
Modified: mplayerxp/mplayerxp.h
===================================================================
--- mplayerxp/mplayerxp.h 2012-12-28 12:22:38 UTC (rev 617)
+++ mplayerxp/mplayerxp.h 2012-12-28 12:53:00 UTC (rev 618)
@@ -19,7 +19,7 @@
struct video_decoder_t;
namespace mpxp {
class M_Config;
- struct _PlayTree_Iter;
+ struct PlayTree_Iter;
/* List of all modules which require protection by pin-code */
enum {
Module_Stream=0,
@@ -194,7 +194,7 @@
MPXPContext& mpxp_context();
- _PlayTree_Iter* mpxp_get_playtree_iter();
+ PlayTree_Iter& mpxp_get_playtree_iter();
unsigned get_number_cpu(void);
void show_help(void);
Modified: mplayerxp/postproc/libmenu/menu_pt.cpp
===================================================================
--- mplayerxp/postproc/libmenu/menu_pt.cpp 2012-12-28 12:22:38 UTC (rev 617)
+++ mplayerxp/postproc/libmenu/menu_pt.cpp 2012-12-28 12:53:00 UTC (rev 618)
@@ -59,22 +59,22 @@
char str[15];
PlayTree* i;
mp_cmd_t* c;
- _PlayTree_Iter* _playtree_iter =mpxp_get_playtree_iter();
+ PlayTree_Iter& pt_iter =mpxp_get_playtree_iter();
- if(_playtree_iter->get_tree() == mpriv->p.current->pt)
+ if(pt_iter.get_tree() == mpriv->p.current->pt)
break;
- if(_playtree_iter->get_tree()->get_parent() && mpriv->p.current->pt == _playtree_iter->get_tree()->get_parent())
+ if(pt_iter.get_tree()->get_parent() && mpriv->p.current->pt == pt_iter.get_tree()->get_parent())
snprintf(str,15,"pt_up_step 1");
else {
- for(i = _playtree_iter->get_tree()->get_next(); i != NULL ; i = i->get_next()) {
+ for(i = pt_iter.get_tree()->get_next(); i != NULL ; i = i->get_next()) {
if(i == mpriv->p.current->pt)
break;
d++;
}
if(i == NULL) {
d = -1;
- for(i = _playtree_iter->get_tree()->get_prev(); i != NULL ; i = i->get_prev()) {
+ for(i = pt_iter.get_tree()->get_prev(); i != NULL ; i = i->get_prev()) {
if(i == mpriv->p.current->pt)
break;
d--;
@@ -108,7 +108,7 @@
static int op(menu_t* menu,const char* args) {
PlayTree* i;
list_entry_t* e;
- _PlayTree_Iter* _playtree_iter = mpxp_get_playtree_iter();
+ PlayTree_Iter& pt_iter = mpxp_get_playtree_iter();
args = NULL; // Warning kill
@@ -121,14 +121,14 @@
mpriv->p.title = mpriv->title;
- if(_playtree_iter->get_tree()->get_parent() != _playtree_iter->get_root()) {
+ if(pt_iter.get_tree()->get_parent() != pt_iter.get_root()) {
e = new(zeromem) list_entry_t;
e->p.txt = "..";
- e->pt = _playtree_iter->get_tree()->get_parent();
+ e->pt = pt_iter.get_tree()->get_parent();
menu_list_add_entry(menu,e);
}
- for(i = _playtree_iter->get_tree() ; i->get_prev() != NULL ; i = i->get_prev())
+ for(i = pt_iter.get_tree() ; i->get_prev() != NULL ; i = i->get_prev())
/* NOP */;
for( ; i != NULL ; i = i->get_next() ) {
e = new(zeromem) list_entry_t;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
