Archive: [email protected]
New revision: gephex--main--0.4--patch-1810
--
Revision: gephex--main--0.4--patch-1810
Archive: [email protected]
Creator: GePhex <[email protected]>
Date: Mon Oct 25 16:58:42 CEST 2004
Standard-date: 2004-10-25 14:58:42 GMT
New-files: build/.arch-ids/make_release.sh.id
build/make_release.sh
examples/graphs/.arch-ids/fzcam4.id
examples/graphs/.arch-ids/noise.id
examples/graphs/fzcam4 examples/graphs/noise
Modified-files: data/gephex-wrapper.in
doc/documentation.xml doc/gephex-engine.xml
doc/gephex-gui.xml engine/src/engine/main.cpp
examples/graphs/Makefile.am
modules/src/joystickmodule/joystickmodule.cpp
qtgui/src/gui/main.cpp
New-patches: [email protected]/gephex--georg--0.4--patch-339
[email protected]/gephex--georg--0.4--patch-340
[email protected]/gephex--georg--0.4--patch-341
[email protected]/gephex--georg--0.4--patch-342
[email protected]/gephex--georg--0.4--patch-343
[email protected]/gephex--georg--0.4--patch-344
[email protected]/gephex--main--0.4--patch-1810
Summary: parameter description (for --help), docu update and two new example graphs
Keywords:
Patches applied:
* [email protected]/gephex--georg--0.4--patch-339
Script to automatically build pre releases
* [email protected]/gephex--georg--0.4--patch-340
Add descriptions to all parameters.
* [email protected]/gephex--georg--0.4--patch-341
Commented out log-messages in joystickmodule
* [email protected]/gephex--georg--0.4--patch-342
Updated documentation: command line parameters
* [email protected]/gephex--georg--0.4--patch-343
Two new example graphs: noise and fzcam4
* [email protected]/gephex--georg--0.4--patch-344
Change gephex-wrapper to copy new example graphs
* added files
build/.arch-ids/make_release.sh.id
build/make_release.sh
examples/graphs/.arch-ids/fzcam4.id
examples/graphs/.arch-ids/noise.id
examples/graphs/fzcam4
examples/graphs/noise
{arch}/gephex/gephex--georg/gephex--georg--0.4/[email protected]/patch-log/patch-339
{arch}/gephex/gephex--georg/gephex--georg--0.4/[email protected]/patch-log/patch-340
{arch}/gephex/gephex--georg/gephex--georg--0.4/[email protected]/patch-log/patch-341
{arch}/gephex/gephex--georg/gephex--georg--0.4/[email protected]/patch-log/patch-342
{arch}/gephex/gephex--georg/gephex--georg--0.4/[email protected]/patch-log/patch-343
{arch}/gephex/gephex--georg/gephex--georg--0.4/[email protected]/patch-log/patch-344
{arch}/gephex/gephex--main/gephex--main--0.4/[email protected]/patch-log/patch-1810
* modified files
--- orig/data/gephex-wrapper.in
+++ mod/data/gephex-wrapper.in
@@ -27,7 +27,8 @@
cat $DATA_PATH/gephex.conf.default | sed s:__CONF_DIR__:$CONF_DIR:g > $CONF_DIR/gephex.conf
echo "Copying example graphs..."
- cp $DATA_PATH/graphs/example* $CONF_DIR/graphs
+ GRAPHS="example1 example2 example3 noise fzcam4"
+ for i in $GRAPHS; do cp $DATA_PATH/graphs/$i $CONF_DIR/graphs; done
echo "...done!"
echo "Everything is set up."
--- orig/doc/documentation.xml
+++ mod/doc/documentation.xml
@@ -116,7 +116,7 @@
<sect1><title>GePhex's Components</title>
<sect2><title>The Engine</title>
-<para>The engine can be started from the console with the <filename>gephex-engine</filename> command. At the moment there are no command-line options.
+<para>The engine can be started from the console with the <filename>gephex-engine</filename> command.
The only environment variable that is used is DISPLAY for the output under X11.
All options are set in the configuration file <filename>~/.gephex/gephex.conf</filename>. If no file exists a default configuration file is created.</para>
@@ -150,6 +150,14 @@
The parameters <literal>ipc_unix_node_prefix</literal> and <literal>ipc_port</literal> must equal to the ones for the gui.
</para>
+<para>
+All options that can be set in the config file can be overridden from the
+command line. For example
+<screen>
+ > gephex-engine --ipc_port=1234
+</screen>
+overrides the value of the option <varname>ipc_port</varname>.
+</para>
</sect2>
<sect2><title>The GUI (graphical user interface)</title>
@@ -183,6 +191,14 @@
The parameters <literal>ipc_unix_node_prefix</literal>, <literal>ipc_namedpipe_servername</literal>, and <literal>ipc_port</literal> must equal to the ones in for the engine.
<varname>engine_binary</varname> is the full path of the engine executable. It is used to spawn a engine process if necessary.
</para>
+<para>
+All options that can be set in the config file can be overridden from the
+command line. For example
+<screen>
+ > gephex-gui --media_path=/mnt/data/footage/
+</screen>
+overrides the value of the option <varname>media_path</varname>.
+</para>
</sect2>
<sect2><title>The GePhex Script</title>
--- orig/doc/gephex-engine.xml
+++ mod/doc/gephex-engine.xml
@@ -30,8 +30,9 @@
<manvolnum>1</manvolnum> </citerefentry>.</para>
<para>
-There are no command line parameters.
-All parameters are set in the config file.
+All parameters are set in the config file. All supported parameters
+can be overridden from the command line. Please see the html documentation
+for the full description.
</para>
<para>The projects main intent is to create a framework that allows video-jockeys to design complex real-time video effects. The user can influence parameters
--- orig/doc/gephex-gui.xml
+++ mod/doc/gephex-gui.xml
@@ -39,8 +39,8 @@
</para>
<para>
-There are no command line parameters (except for those that are used by
-qt). All parameters are set in the config file.
+All parameters that are set in the config file can be overridden from the
+command line. Please see the html documentation for the full description.
</para>
<para>The projects main intent is to create a framework that allows video-jockeys to design complex real-time video effects. The user can influence parameters
--- orig/engine/src/engine/main.cpp
+++ mod/engine/src/engine/main.cpp
@@ -236,32 +236,37 @@
def.s = "/tmp/gephex_socket";
params.push_back(config_param_t("ipc_unix_node_prefix",
- config_param_t::STRING_PARAM,
- "engine",
- "TODO", &def));
+ config_param_t::STRING_PARAM,
+ "engine",
+ "Path and prefix of the unix nodes "
+ "in the filesystem (unix only)", &def));
def.b = false;
params.push_back(config_param_t("headless",
- config_param_t::BOOL_PARAM,
- "engine",
- "TODO", &def));
+ config_param_t::BOOL_PARAM,
+ "engine",
+ "Start without GUI, load all "
+ "available modules", &def));
params.push_back(config_param_t("autostart",
- config_param_t::BOOL_PARAM,
- "engine",
- "TODO", &def));
+ config_param_t::BOOL_PARAM,
+ "engine",
+ "Automatically start the "
+ "rendering", &def));
def.s = "_default_";
params.push_back(config_param_t("render_graph_id",
- config_param_t::STRING_PARAM,
- "engine",
- "TODO", &def));
+ config_param_t::STRING_PARAM,
+ "engine",
+ "The graph that is initially "
+ "loaded", &def));
params.push_back(config_param_t("render_snap_id",
- config_param_t::STRING_PARAM,
- "engine",
- "TODO", &def));
+ config_param_t::STRING_PARAM,
+ "engine",
+ "The snapshot that is initially "
+ "active", &def));
utils::ConfigManager config(get_cfile_name(), argc, argv, params);
--- orig/examples/graphs/Makefile.am
+++ mod/examples/graphs/Makefile.am
@@ -1,4 +1,4 @@
datadir = $(prefix)/share/gephex/graphs
-data_DATA = example1 example2 example3 gephexwin32
+data_DATA = example1 example2 example3 gephexwin32 noise fzcam4
EXTRA_DIST = $(data_DATA)
--- orig/modules/src/joystickmodule/joystickmodule.cpp
+++ mod/modules/src/joystickmodule/joystickmodule.cpp
@@ -156,8 +156,8 @@
if (my->jst_drv == 0)
{
- s_log(1, "HEEEE");
- return;
+ //s_log(1, "HEEEE");
+ return;
}
if (joy_id != my->old_id)
@@ -210,7 +210,7 @@
if (my->jst == 0)
{
- s_log(1, "HAAA");
+ //s_log(1, "HAAA");
return;
}
--- orig/qtgui/src/gui/main.cpp
+++ mod/qtgui/src/gui/main.cpp
@@ -164,7 +164,8 @@
params.push_back(config_param_t("ipc_unix_node_prefix",
config_param_t::STRING_PARAM,
"gui",
- "TODO", &def));
+ "Path and prefix of the unix nodes "
+ "in the filesystem (unix only)", &def));
params.push_back(config_param_t("ipc_port",
config_param_t::INT_PARAM,
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.