summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaromil <jaromil@dyne.org>2011-03-03 15:24:13 (GMT)
committer Jaromil <jaromil@dyne.org>2011-03-03 15:24:13 (GMT)
commit71c63f338965da33e9d5f9f4a04a41be19176109 (patch)
tree7675815b08206badfc02d650862eb80b10e504e4
parentd6be1c5fc2db6040d7957ca1154f21153ba4c1fc (diff)
documentation and cosmetics for 1.1
-rw-r--r--AUTHORS3
-rw-r--r--ChangeLog1
-rw-r--r--README103
-rw-r--r--src/hasciicam.c48
4 files changed, 108 insertions, 47 deletions
diff --git a/AUTHORS b/AUTHORS
index 551b995..2766f09 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,5 +1,5 @@
HasciiCam is being developed and mantained by:
-# denis rojo aka jaromil http://rastasoft.org
+# denis roio aka jaromil http://rastasoft.org
people who contributed to the hasciicam project:
# jan hubicka and the aalib crew - the asci rendering library
@@ -14,4 +14,5 @@
# alessandro preite martinez - sgi irix support (0.9)
# thomas pfau - ftp library
# blended - wider webcam support
+# dan stowell - v4l2 api support
diff --git a/ChangeLog b/ChangeLog
index 65ca628..255dbfd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,3 +3,4 @@ arg. i never kept a ChangeLog of this software
this last release fixes support for several webcams
thanks to blended for it!
+
diff --git a/README b/README
index fad9baf..f72cea0 100644
--- a/README
+++ b/README
@@ -1,25 +1,85 @@
+
+.... The Dyne.org Foundation presents RASTASOFT's
+
88 88 db .dP"Y8 dP""b8 88 88 dP""b8 db 8b d8
88 88 dPYb `Ybo." dP `" 88 88 dP `" dPYb 88b d88
888888 dP__Yb o.`Y8b Yb 88 88 Yb dP__Yb 88YbdP88
88 88 dP""""Yb 8bodP' YboodP 88 88 YboodP dP""""Yb 88 YY 88
+
[ (h)ascii for the masses! ]
- version 1.0 codename ASCII ROOTS
+
+ version 1.1
Hasciicam makes it possible to have live ascii video on the web. It
-captures video from a tv card and renders it into ascii, formatting the
-output into an html page with a refresh tag or in a live ascii window or
-in a simple text file as well, giving the possiblity to anybody that has a
-bttv card. a linux box and a cheap modem line to show a live asciivideo
-feed that can be browsable without any need for plugin, java etc.
+captures video from a tv card and renders it into ascii, formatting
+the output into an html page with a refresh tag or in a live ascii
+window or in a simple text file as well, giving the possiblity to
+anybody that has a bttv card. a linux box and a cheap modem line to
+show a live asciivideo feed that can be browsable without any need for
+plugin, java etc.
+
+
+||==================================||==|===|=================================================|===========
+==========================================================================================================
+||===================================<|awww%==============================================================
+|=================================<wg#ZUVSXQX|============================================================
+|||=================|=|||=========9HHBBBWWWQX=============================================================
+|||=======||||||||||||||||||||||||)XXXXXZ#WQ#>|||||||||===================================================
+||||=====||||||||||i||iiiii|||||||ioXXXXX#WQ#c||||||||||||||||||========::::::=:::::=====|||||||||||||||||
+||||=|===| YES this is a ii||i||ii|vXXXXX#mWWcii||||||||||||||||==:::::::::::::::::::::::=:=++||||||||||||
+|||||====|| ........ iiiiiiivXXXXXXmWQoi|iii|||||||||||==::::::--.:::.:.--.-.....---:::=+||||||||||
+|||||===|||| (H)ASCII SPLIFF iiiiiiiXXXXXX#WQXiiiii|||||||||=:::--::-...:::::::-............--::=|||||||||
+||||===||||||ii --------------> iiiinXXXXX#mQmiiiiiii|i|||==:::::........-::::................:::==|||||||
+||||===|||||iiiiiiiiiiiiiiiiiiiiiiiivXXXXX##Wmciiiiiii|||=:::-...........::.:..................:::=|||||||
+|||====|||||iiiiiiiiiiiiiiiiiiiiiiiilXXXXXZmWWziiiiiii||=::--........:::.:::;=;;:...............:::=||||||
+|||====|||i|iiiiiiiiiiiiiiiiiiiiiiiiinXXXXX#WQoiiiiii|==::...........::==|%vnooans|=;. .........-::==|||||
+|||====||ii|iiiiiiiiiiiiiiiiiiiiiiiiinXXXXZ#WQXiiiii||=::::........:=|ivnXXXm##mmXXons|_. ........:::=||i|
+|||===|||ii|iiiiiiiiiiiiiiiiiiiiiiiivvXXXXX#mQmi|||||==::..... ...=|vnXXXX#####m##XXXoov= ........:::=||ii
+||||==|||iiiiiiiiiiiiiiivnvvvvi||iiiiInXXXX#mWWVYY1*|=::::.......:=ino21*1*YX#WmmmmZXZXXo|..... ...:::=|||
+|||==|||iiiiiiiiiiiiiiivvovvvviiiiiivlnXXXX#mWWziii|=::-........:=iilivvvsiivX#m#ZXl|||l1s:. ..:::====
+||===||iii|iiiiiiiiiiiivnovnnniivvvvvvuXXXXZ#WQovvii==:.........:|iivlvnXXovivXXXe||saa%ii=.. . ....::::==
+||===<|iiiiiiiiiiiiiiivvoonoonivvvvoooXXXXX##WQmXXXX==::........:<vvni|=||ivoooXXqv*!!11ii;.........::::=:
+||==|||ii|iiiiiiiiiiiilnonnooovvvvnvvvnXXXXX#mQ#XXXn=:::........=ivoXXwauwqXoooXmWZnv|==<l=...-......-::::
+||==|ii|||iiiiiiiiiiiivoonnoonvvvnonlii3XXXXZ#QB1ll>::.-:......:<vnXX#m##XX?*++!YS*iXmwXXoc ..........::::
+||==|iiiiiiiiiiiiivlilvoooXo:=vvvXXos||)XXXX#mWW>===::......:::=|vvvnXe1nX1||+======XZ##XXn:.........::::-
+|===|iiiiiiiiiiiiivvllvSo}Y!:={}vXXXsi|%XXXX#mWQz||||=:.....:::|inovvi|*}+=::=:=:::=+*nI3nv=.........::::=
+||==iiiiiiiiiiiiiiivivvXX%+====<ndmX1|>imXXXZ#WQQkivQg;....::::<i3X1|==::==%ii}||=;:::+|ilv:........::====
+|==||iiiiiiiiiiivlvlllvX2::====<n###ci=vQ#XXX#WQQm%+==::....:===|ivv=iuuav1SUUH$B#S=:::=|vv:........::=|==
+=-=|i|iiiiiiiiiiiiiiiiivvsiiiiivvYTYsiivV&XXX##QW&vi=;::.....-.:=<iIsvXXXovInSSYSnvvvn%=|%>:......:::=====
+-..+||iiiiiiiiiivowwonvvlvvviilvvvvvvvnXmmXXXZXmmwoova>:........::=+l1v#Zo}=:::::=+<nXXi|>::......::==|iii
+ .~<iiiiiuwmQQQQQQQQQQQQQQQQQQQQQQmgmmQQmqqmmWQEYmmgw/;:::....::::==++**+===:::::{XX1i=:.......::=======
+ ...-iiwmQQQQQQQQQQQQQQQQWWWWWWWQQQQWWQQmmmmmWWkvQQQQ@=~::-:...::-:::--:::::::::::+=+:.......::======::-
+ .....:iqWQQQQQQQQQQQWW##Wmm######mmmQQQQQQQmovnX2vQQQQQg7(:....:.-.....::.::.--.::::::......:::==||=::
+ ..;vXX##WW###W##########XXXXXX#WWWQQQQQQQWmnnXS3QQQQQkmaa;:..==::...::-..-......-::.....::.:;==|==: .
+ ..:aonnXX##XXXXXXXXXXXXXXXXooXX#############vnXqmQQQQQWqoo%=;=ii|=;;................-....::==||||====-:.
+...<Xonvvnn222nnXooooonvvvnonvv1oXXXXXXXXXXXXXv1XZBBWmmmmWmm}>=%nnvii||==;::.......::.......:::..........:
+..)Xo1vllii|illIiillIIIllillliilIvIlIv1n11111llvXXXXXXXX$WWmc|vnooonnvvii||||||====||;.:::::::........:.::
+..)vnli||====|==========++++|||||||||||||ivi||ivXXvnXXXXdWQQWzoXXXXXXoonvvvviiii||iii=|vs;:::::.........:.
+..=vli||||====:::;=ivvsi|==;;:=========|ivnXX##mWWQQQQmmmQQQQQXXXXXXXXXXXoonnvvvvvvi|=<nXZa;:::-..........
+..:vnvv%||=:==|vvnXXXmXXqXoovs%iiii|iiiivnXX##mmWQQQQQQQQQQQQQQQQmmXX##XXXXXXoonnvvvi|:IXmm#a;:::.........
+..:oXXXonvvnnooXoXXX########ZXXXXXXoooooXXX####mWQQQQQQQQQQQQQQQQQQQmmm#XXXqXXXXnnvvvvi=XWWm#h%-::........
+::vXXXXXooooXXXXXXXZ#m############m##mmmmmmmmm#mmWQQQQQQQQWQQQQQQQQQQQQm#mm##mXXooXovvvsmQQWmmm#6,:-......
+sd#ZXXXXXXXXXXXXXXXXXXXXX#####XXX###############m#mWWWWWm#WQQQQQQQQQQQQQmmmmmmmmmmmqmgD9QQQQWW#????"-....:
+####XXXXoXXonooononnXXon2XXXXXXXm####XXXXXXXXXXX##Z########WQQQQQQQQQQQWWWQQQQQmQQQQQP::=?VVT'-... ....:::
+ZXSXXonnvnv1vvvvlliilivvvnooXXXXXXXXXXXXXXXXXooXXXXXXZ###X#####mWWWWWW##QQQQQQQQQQQQP:::::.-............--
+nnonnvvvIllliiliiiiiilvvnnnnnn1nn11I11v1n111II1nqmmmmmmmmQQQQQmQmmZXXXXqQQQQQQQQQQQC:::::-.......:........
+nnnvvvli||||||||||+iaaawwwwygwwwwwwwwwwwymmmWWQQQQQQQQQQQQQQQQQQQQQmuymQQQQQQQQQQQt=:::-.........-........
+
---
INSTALLATION
-it should work as usual:
-./configure
-make
-make install
+To compile the sourcecode it works as usual:
+
+ ./configure; make; make install
+
+on Debian and Ubuntu you have hasciicam packages ready to install
+for the very latest version add the dyne.org apt repository:
+
+ Debian: deb http://apt.dyne.org/debian stable main
+
+ Ubuntu: deb http://apt.dyne.org/ubuntu stable main
what's needed to compile:
@@ -43,32 +103,31 @@ man hasciicam
---
-ADDITIONAL CREDITS
+ CREDITS
+
+ Hasciicam software is written by Jaromil - http://rastasoft.org
-code snippets hacks and ideas have been contributed by:
+code, hacks and ideas have been contributed by:
jan hubicka and the aalibcrew, gerdknorr, mathop, augustonero, boffh,
martin guy, pbm, megabug, rat, rapid, alessandro preite martinez, hks1,
- thomas pfau, knorke, blended
+ thomas pfau, knorke, blended, dan stowell
special thanks to:
+
# LOA hacklab milano :: http://loa.hacklab.it
- for donating a pentium100mhz box
+ for donating a pentium100mhz development box
+
# hell voyager
for donating an hauppage bttv brooktree card
(wich makes it possible to have releases :) )
+
# alex + rasty + martinez
very good vibez!
+
# servus.at, maddler.net, flyinglinux.net, autistici.org
high quality bandwidth lets people get slashdotted!
+
# FREAKNET medialab catania :: http://freaknet.org
for knowledge, place, sun and connectivity under the vulcano!
---
- jaromil dyne.org rasta coder http://rastasoft.org
-
- dyne:bolic GNU/Linux liveCD http://dynebolic.org
- MuSE Streamer http://muse.dyne.org
- FreeJ - free the veejay! http://freej.org
- FARAH in Palestine http://farah.dyne.org
-
diff --git a/src/hasciicam.c b/src/hasciicam.c
index 1398cb4..e9c5452 100644
--- a/src/hasciicam.c
+++ b/src/hasciicam.c
@@ -64,29 +64,29 @@ char *help =
why here? just a reminder for a shamanic secret told by bernie@codewiz.org */
"Usage: hasciicam [options] [rendering options] [aalib options]\n"
"options:\n"
-"-h --help this help\n"
-"-H --aahelp aalib complete help\n"
-"-v --version version information\n"
-"-q --quiet be quiet\n"
-"-m --mode mode: live|html|text - default live\n"
-"-d --device video grabbing device - default /dev/video\n"
-"-i --input input channel number - default 1\n"
+" -h --help this help\n"
+" -H --aahelp aalib complete help\n"
+" -v --version version information\n"
+" -q --quiet be quiet\n"
+" -m --mode mode: live|html|text - default live\n"
+" -d --device video grabbing device - default /dev/video\n"
+" -i --input input channel number - default 1\n"
//"-s --size ascii image size WxH - default 96x72\n"
-"-o --aafile dumped file - default hasciicam.[txt|html]\n"
-"-f --ftp ie: :user%pass@host:dir - default none\n"
-"-D --daemon run in background - default foregrond\n"
-"-U --uid setuid (int) - default current\n"
-"-G --gid setgid (int) - default current\n"
+" -o --aafile dumped file - default hasciicam.[txt|html]\n"
+" -f --ftp ie: :user%pass@host:dir - default none\n"
+" -D --daemon run in background - default foregrond\n"
+" -U --uid setuid (int) - default current\n"
+" -G --gid setgid (int) - default current\n"
"rendering options:\n"
-"-S --font-size html font size (1-4) - default 1\n"
-"-a --font-face html font to use - default courier\n"
-"-r --refresh refresh delay - default 2\n"
-"-b --aabright ascii brightness - default 60\n"
-"-c --aacontrast ascii contrast - default 4\n"
-"-g --aagamma ascii gamma - default 3\n"
-"-I --invert invert colors - default off\n"
-"-B --background background color (hex) - default 000000\n"
-"-F --foreground foreground color (hex) - default 00FF00\n";
+" -S --font-size html font size (1-4) - default 1\n"
+" -a --font-face html font to use - default courier\n"
+" -r --refresh refresh delay - default 2\n"
+" -b --aabright ascii brightness - default 60\n"
+" -c --aacontrast ascii contrast - default 4\n"
+" -g --aagamma ascii gamma - default 3\n"
+" -I --invert invert colors - default off\n"
+" -B --background background color (hex) - default 000000\n"
+" -F --foreground foreground color (hex) - default 00FF00\n";
const struct option long_options[] = {
{"help", no_argument, NULL, 'h'},
@@ -464,14 +464,14 @@ config_init (int argc, char *argv[]) {
switch (res) {
case 'h':
fprintf (stderr, "%s", help);
- exit (1);
+ exit (0);
break;
case 'H':
fprintf (stderr, "%s", help);
fprintf (stderr, "\naalib options:\n%s",aa_help);
- exit(1);
+ exit(0);
case 'v':
- exit (1);
+ exit (0);
break;
case 'q':
quiet = 1;