[Pkg-wmaker-commits] [wmtv] 04/48: Remove trailing whitespace.
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Mon Feb 1 20:13:19 UTC 2016
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmtv.
commit 66a419b3db61dcf6f53e19062fbdaa2640929b11
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date: Sun Oct 5 10:29:59 2014 -0500
Remove trailing whitespace.
---
CHANGES | 14 +++---
README | 56 +++++++++++------------
src/channels.h | 10 ++--
src/wmgeneral/list.c | 12 ++---
src/wmgeneral/list.h | 2 +-
src/wmgeneral/misc.c | 24 +++++-----
src/wmgeneral/wmgeneral.c | 22 ++++-----
src/wmtv.c | 114 +++++++++++++++++++++++-----------------------
8 files changed, 127 insertions(+), 127 deletions(-)
diff --git a/CHANGES b/CHANGES
index a0bb53b..9ba832c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,7 +10,7 @@ Version 0.6.3b
Date - 22/4/99
- Releases video device when TV is turned off
- Support for both external TV application and inbuilt fullscreen
- - Auto edit of config file for finetune offsets.
+ - Auto edit of config file for finetune offsets.
- Other bug fixes
Version 0.6.2b
@@ -20,11 +20,11 @@ Date - 25/3/99
- Some keyboard bindings in fullscreen
- Mute feature
- Misc bug fixes
-
+
Version 0.6.1b
--------------
Date - 17/3/99
-Changes - Fixed CPU utilisation hog bug.
+Changes - Fixed CPU utilisation hog bug.
- Should now take up less than 1% CPU
- Fixed hanging state for executables
- Other minor bugfixes
@@ -40,17 +40,17 @@ Changes - Full Screen Support!
Version 0.5.2b
--------------
Date - 3/3/99
-Changes - TV Source bug fixed - Composite and S-Video inputs should work
+Changes - TV Source bug fixed - Composite and S-Video inputs should work
properly now.
- Now supports editing of config file after startup of wmtv.
(ie. wmtv's config file will be reread when the TV is turned On)
- - Fixed TV Off mode. Clicking and holding down more than 3 seconds
+ - Fixed TV Off mode. Clicking and holding down more than 3 seconds
during TV On mode or Set Tuner mode would turn wmtv off.
-
+
Version 0.5.1b
--------------
Date - 26/2/99
-Changes - Supports 8/16/24/32 depths as opposed to the first version
+Changes - Supports 8/16/24/32 depths as opposed to the first version
which only runs on 16 bit displays.
Version 0.5b
diff --git a/README b/README
index ce7f8c6..9474329 100644
--- a/README
+++ b/README
@@ -7,9 +7,9 @@ Version : 0.6.5
Release Date : 25th April 1999
-Description
+Description
===========
-WMTV is a WindowMaker dock.app that controls TV Cards which are supported under the Linux Kernel 2.2.x series (mainly for cards based on BrookTree BT848/848a/849a/878/879 chipsets: There are lots of cards out there which uses these chipsets such as the Hauppauge WinTV, Aimslab VideoExtreme, miroVIDEO PCTV, AverMedia TVPhone, Spirit TV, MagicXPress TView, Teppro TEV, etc).
+WMTV is a WindowMaker dock.app that controls TV Cards which are supported under the Linux Kernel 2.2.x series (mainly for cards based on BrookTree BT848/848a/849a/878/879 chipsets: There are lots of cards out there which uses these chipsets such as the Hauppauge WinTV, Aimslab VideoExtreme, miroVIDEO PCTV, AverMedia TVPhone, Spirit TV, MagicXPress TView, Teppro TEV, etc).
Installation
@@ -26,27 +26,27 @@ Note: Dock the application before switching the TV On.
Features
========
-WMTV is "Just another gadget(tm)". A miniature sized television screen which sits on your WindowMaker dock. However, it'll become a full featured television application in future major releases.
+WMTV is "Just another gadget(tm)". A miniature sized television screen which sits on your WindowMaker dock. However, it'll become a full featured television application in future major releases.
Currently supported:
- Channel Presets
- TV Modes - PAL/Secam/NTSC
- - FineTuning (Television source) - writes to config file now
+ - FineTuning (Television source) - writes to config file now
- Scanning of TV Stations (Television source)
- External TV application support
- All video sources (Television/S-Video/CompositeX) depending on your card
- 8/16/24/32 bit displays
- - Modification of config file after WMTV is executed
+ - Modification of config file after WMTV is executed
(Turn Off and Turn On again to reinitialise config file)
- Full Screen display!
- Icon should be of size 64x64
-Button map:
+Button map:
[ < ] [ > ] [ 0 ]
-
+
<1> <2> <3>
-
+
Tips:
There are 3 modes of operation on this applications.
You can cycle through the 3 modes by clicking on the right most button <3> repeatedly.
@@ -54,37 +54,37 @@ The 3 modes are described below:
On mode
---------
- Clicking on the rightmost button <3> for the first time (after the start of WMTV) would turn TV on. During this mode, the left <1> and right <2> buttons are used to change preset channels which has been defined in your config file. Left button to move down 1 channel and Right button to move up one
+ Clicking on the rightmost button <3> for the first time (after the start of WMTV) would turn TV on. During this mode, the left <1> and right <2> buttons are used to change preset channels which has been defined in your config file. Left button to move down 1 channel and Right button to move up one
channel.
Tune mode
---------
- Clicking again on button <3> after On mode would bring WMTV into tune mode. During this mode, the left <1> and right <2> buttons have two purposes
- individually. Left clicking on the left <1> or right <2> buttons would
- perform scans of channels. Scanning will stop when there is a strong signal strength. Right clicking on the left <1> or right <2> button would fine
+ Clicking again on button <3> after On mode would bring WMTV into tune mode. During this mode, the left <1> and right <2> buttons have two purposes
+ individually. Left clicking on the left <1> or right <2> buttons would
+ perform scans of channels. Scanning will stop when there is a strong signal strength. Right clicking on the left <1> or right <2> button would fine
tune the current frequency. After tuning, clicking on button <3> would set the fine tuned offset into your config file and bring you back into "On mode".
Off mode
--------
- Holding down button <3> for about 3 seconds from any of the two modes
- described above, would turn the TV off.
+ Holding down button <3> for about 3 seconds from any of the two modes
+ described above, would turn the TV off.
Right clicking once on the TV Screen would mute/unmute the audio.
Double clicking LEFT mouse button on the TV Screen would launch your favorite TV application when specified with --exe <filename> option in the command line.
-If the external application is not set, It'll automatically switch to the build in full screen mode.
-Double clicking the MIDDLE mouse button on the TV Screen would bring you into the built in full screen mode.
+If the external application is not set, It'll automatically switch to the build in full screen mode.
+Double clicking the MIDDLE mouse button on the TV Screen would bring you into the built in full screen mode.
To launch an external application:
foo at bar > wmtv --exe /usr/X11R6/bin/xawtv # example.
or
-foo at bar > wmtv -e /usr/X11R6/bin/xawtv
+foo at bar > wmtv -e /usr/X11R6/bin/xawtv
-If you do not specify any program to be launched during startup of WMTV,
+If you do not specify any program to be launched during startup of WMTV,
double clicking on the TV Screen would launch the inbuilt full screen feature.
-Make sure you have a 640x480 Modeline defined in your XF86Config file.
-
+Make sure you have a 640x480 Modeline defined in your XF86Config file.
+
Full Screen Mode:
Single click on any mouse button will return to initial screen.
@@ -96,15 +96,15 @@ Full Screen Mode:
Left - Volume down.
Escape - Return to initial screen.
m - mute/unmute audio.
-
+
Configuration file
==================
This section describes on how to configure WMTV's configuration file.
-Your configuration file is located in your home directory as ".wmtvrc".
+Your configuration file is located in your home directory as ".wmtvrc".
Excerpt from a sample config file:
/*-----------------------
-
+
source = Television
freqnorm = pal-australia
maxpreset = 7
@@ -137,7 +137,7 @@ fullscreen = {widthxheight}
[channel]
choose a total of <maxpreset> from the below channels.
separate it with a new line as in the sample config file above.
-{
+{
E2|E3|E4|
S01|S02|S03|
R1|R2|R3|R4|R5|
@@ -157,21 +157,21 @@ for example:
SE11 (-10) # channel SE11 minus 10
-
+
TODO
====
- Image Capture
- On Screen Display (OSD)
-- Other controls
-- Advance image clippings
+- Other controls
+- Advance image clippings
- Video Capture
- Other misc features
BUGS
====
-Ask flik. Bug me if you've found any.
+Ask flik. Bug me if you've found any.
NOTE
diff --git a/src/channels.h b/src/channels.h
index 72af0fd..3f9d0bc 100644
--- a/src/channels.h
+++ b/src/channels.h
@@ -4,7 +4,7 @@
* Nathan Laredo (laredo at broked.net)
* Minor additions by Wee Liang (wliang at tartarus.uwa.edu.au)
*
- * Frequencies are given in kHz
+ * Frequencies are given in kHz
*/
#define NTSC_AUDIO_CARRIER 4500
#define PAL_AUDIO_CARRIER_I 6000
@@ -17,7 +17,7 @@
containing 8 bits frame sync, 5 bits control, 11 bits additional data, and
704 bits audio data. The bit rate is reduced by transmitting only 10 bits
plus parity of each 14 bit sample, the largest sample in a frame determines
- which 10 bits are transmitted. The parity bits for audio samples also
+ which 10 bits are transmitted. The parity bits for audio samples also
specify the scaling factor used for that channel during that frame. The
companeded audio data is interleaved to reduce the influence of dropouts
and the whole frame except for sync bits is scrambled for spectrum shaping.
@@ -196,7 +196,7 @@ struct freqlist tvtuner[] = {
{"18", {495250, 145250, 144000, 0, 139250, 0, 0, 0, 0, 0, 0}},
{"19", {501250, 151250, 150000, 0, 145250, 0, 0, 0, 0, 0, 0}},
{"20", {507250, 157250, 156000, 0, 151250, 0, 0, 0, 0, 0, 0}},
-
+
{"21", {513250, 163250, 162000, 0, 157250, 471250, 471250, 0, 0, 0, 471250}},
{"22", {519250, 169250, 168000, 0, 165250, 479250, 479250, 0, 0, 0, 479250}},
{"23", {525250, 217250, 216000, 0, 223250, 487250, 487250, 0, 0, 0, 487250}},
@@ -246,7 +246,7 @@ struct freqlist tvtuner[] = {
{"67", {789250, 481250, 480000, 0, 0, 839250, 839250, 0, 0, 800250, 839250}},
{"68", {795250, 487250, 486000, 0, 0, 847250, 847250, 0, 0, 807250, 847250}},
{"69", {801250, 493250, 492000, 0, 0, 855250, 855250, 0, 0, 814250, 855250}},
-
+
{"70", {807250, 499250, 498000, 0, 0, 0, 0, 0, 0, 0, 0}},
{"71", {813250, 505250, 504000, 0, 0, 0, 0, 0, 0, 0, 0}},
{"72", {819250, 511250, 510000, 0, 0, 0, 0, 0, 0, 0, 0}},
@@ -303,7 +303,7 @@ struct freqlist tvtuner[] = {
{"123", { 0, 787250, 786000, 0, 0, 0, 0, 0, 0, 0, 0}},
{"124", { 0, 793250, 792000, 0, 0, 0, 0, 0, 0, 0, 0}},
{"125", { 0, 799250, 798000, 0, 0, 0, 0, 0, 0, 0, 0}},
-
+
{"T7", { 0, 8250, 7000, 0, 0, 0, 0, 0, 0, 0, 0}},
{"T8", { 0, 14250, 13000, 0, 0, 0, 0, 0, 0, 0, 0}},
{"T9", { 0, 20250, 19000, 0, 0, 0, 0, 0, 0, 0, 0}},
diff --git a/src/wmgeneral/list.c b/src/wmgeneral/list.c
index be7464f..a63562f 100644
--- a/src/wmgeneral/list.c
+++ b/src/wmgeneral/list.c
@@ -1,11 +1,11 @@
-/* Generic single linked list to keep various information
+/* Generic single linked list to keep various information
Copyright (C) 1993, 1994 Free Software Foundation, Inc.
Author: Kresten Krab Thorup
Many modifications by Alfredo K. Kojima
-
+
This file is part of GNU CC.
@@ -38,7 +38,7 @@ Boston, MA 02110-1301 USA. */
/* Return a cons cell produced from (head . tail) */
-INLINE LinkedList*
+INLINE LinkedList*
list_cons(void* head, LinkedList* tail)
{
LinkedList* cell;
@@ -63,7 +63,7 @@ list_length(LinkedList* list)
return i;
}
-/* Return the Nth element of LIST, where N count from zero. If N
+/* Return the Nth element of LIST, where N count from zero. If N
larger than the list length, NULL is returned */
INLINE void*
@@ -84,7 +84,7 @@ list_nth(int index, LinkedList* list)
INLINE void
list_remove_head(LinkedList** list)
{
- if (!*list) return;
+ if (!*list) return;
if ((*list)->tail)
{
LinkedList* tail = (*list)->tail; /* fetch next */
@@ -116,7 +116,7 @@ INLINE LinkedList *
list_remove_elem(LinkedList* list, void* elem)
{
LinkedList *tmp;
-
+
if (list) {
if (list->head == elem) {
tmp = list->tail;
diff --git a/src/wmgeneral/list.h b/src/wmgeneral/list.h
index 4b6b86f..92c3454 100644
--- a/src/wmgeneral/list.h
+++ b/src/wmgeneral/list.h
@@ -1,4 +1,4 @@
-/* Generic single linked list to keep various information
+/* Generic single linked list to keep various information
Copyright (C) 1993, 1994 Free Software Foundation, Inc.
Author: Kresten Krab Thorup
diff --git a/src/wmgeneral/misc.c b/src/wmgeneral/misc.c
index f86481e..1f3bb2e 100644
--- a/src/wmgeneral/misc.c
+++ b/src/wmgeneral/misc.c
@@ -1,9 +1,9 @@
/* dock.c- built-in Dock module for WindowMaker
- *
+ *
* WindowMaker window manager
- *
+ *
* Copyright (c) 1997 Alfredo K. Kojima
- *
+ *
* 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
@@ -28,7 +28,7 @@
*----------------------------------------------------------------------
* parse_command--
* Divides a command line into a argv/argc pair.
- *----------------------------------------------------------------------
+ *----------------------------------------------------------------------
*/
#define PRC_ALPHA 0
#define PRC_BLANK 1
@@ -64,11 +64,11 @@ next_token(char *word, char **next)
t = ret = malloc(strlen(word)+1);
ptr = word;
-
+
state = 0;
*t = 0;
while (1) {
- if (*ptr==0)
+ if (*ptr==0)
ctype = PRC_EOS;
else if (*ptr=='\\')
ctype = PRC_ESCAPE;
@@ -98,12 +98,12 @@ next_token(char *word, char **next)
t = strdup(ret);
free(ret);
-
+
if (ctype==PRC_EOS)
*next = NULL;
else
*next = ptr;
-
+
return t;
}
@@ -118,7 +118,7 @@ parse_command(char *command, char ***argv, int *argc)
line = command;
do {
token = next_token(line, &line);
- if (token) {
+ if (token) {
list = list_cons(token, list);
}
} while (token!=NULL && line!=NULL);
@@ -141,15 +141,15 @@ execCommand(char *command)
int argc;
parse_command(command, &argv, &argc);
-
+
if (argv==NULL) {
return 0;
}
-
+
if ((pid=fork())==0) {
char **args;
int i;
-
+
args = malloc(sizeof(char*)*(argc+1));
if (!args)
exit(10);
diff --git a/src/wmgeneral/wmgeneral.c b/src/wmgeneral/wmgeneral.c
index 4877acd..fbb5d16 100644
--- a/src/wmgeneral/wmgeneral.c
+++ b/src/wmgeneral/wmgeneral.c
@@ -21,7 +21,7 @@
file support.
11/09/1998 (Martijn Pieterse, pieterse at xs4all.nl)
* Removed a bug from parse_rcfile. You could
- not use "start" in a command if a label was
+ not use "start" in a command if a label was
also start.
* Changed the needed geometry string.
We don't use window size, and don't support
@@ -117,7 +117,7 @@ static void GetXPM(XpmIcon *wmgen, char *pixmap_bytes[]) {
err = XpmCreatePixmapFromData(display, Root, pixmap_bytes, &(wmgen->pixmap),
&(wmgen->mask), &(wmgen->attributes));
-
+
if (err != XpmSuccess) {
fprintf(stderr, "Not enough free colorcells.\n");
exit(1);
@@ -164,9 +164,9 @@ static int flush_expose(Window w) {
\*******************************************************************************/
void RedrawWindow(void) {
-
+
flush_expose(iconwin);
- XCopyArea(display, wmgen.pixmap, iconwin, NormalGC,
+ XCopyArea(display, wmgen.pixmap, iconwin, NormalGC,
0,0, wmgen.attributes.width, wmgen.attributes.height, 0,0);
flush_expose(win);
XCopyArea(display, wmgen.pixmap, win, NormalGC,
@@ -178,9 +178,9 @@ void RedrawWindow(void) {
\*******************************************************************************/
void RedrawWindowXYWH(int x, int y, int w, int h) {
-
+
flush_expose(iconwin);
- XCopyArea(display, wmgen.pixmap, iconwin, NormalGC,
+ XCopyArea(display, wmgen.pixmap, iconwin, NormalGC,
x,y, w, h, 0,0);
flush_expose(win);
XCopyArea(display, wmgen.pixmap, win, NormalGC,
@@ -235,7 +235,7 @@ void createXBMfromXPM(char *xbm, char **xpm, int sx, int sy) {
char zero;
unsigned char bwrite;
int bcount;
-
+
sscanf(*xpm, "%d %d %d", &width, &height, &numcol);
@@ -328,7 +328,7 @@ void openXwindow(int argc, char *argv[], char *pixmap_bytes[], char *pixmask_bit
*/
if (!(display = XOpenDisplay(display_name))) {
- fprintf(stderr, "%s: can't open display %s\n",
+ fprintf(stderr, "%s: can't open display %s\n",
wname, XDisplayName(display_name));
exit(1);
}
@@ -354,10 +354,10 @@ void openXwindow(int argc, char *argv[], char *pixmap_bytes[], char *pixmask_bit
mysizehints.width = 64;
mysizehints.height = 64;
-
+
win = XCreateSimpleWindow(display, Root, mysizehints.x, mysizehints.y,
mysizehints.width, mysizehints.height, borderwidth, fore_pix, back_pix);
-
+
iconwin = XCreateSimpleWindow(display, win, mysizehints.x, mysizehints.y,
mysizehints.width, mysizehints.height, borderwidth, fore_pix, back_pix);
@@ -378,7 +378,7 @@ void openXwindow(int argc, char *argv[], char *pixmap_bytes[], char *pixmask_bit
XSetWMName(display, win, &name);
/* Create GC for drawing */
-
+
gcm = GCForeground | GCBackground | GCGraphicsExposures;
gcv.foreground = fore_pix;
gcv.background = back_pix;
diff --git a/src/wmtv.c b/src/wmtv.c
index 9860461..086e40b 100644
--- a/src/wmtv.c
+++ b/src/wmtv.c
@@ -7,7 +7,7 @@
*
* This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
@@ -232,7 +232,7 @@ main(int argc, char *argv[])
if (c == -1)
break;
- switch(c)
+ switch(c)
{
case 0:
/*
@@ -268,10 +268,10 @@ main(int argc, char *argv[])
}
/* creat windows */
- createXBMfromXPM (wmtv_mask_bits, wmtv_master_xpm,
+ createXBMfromXPM (wmtv_mask_bits, wmtv_master_xpm,
wmtv_mask_width, wmtv_mask_height);
openXwindow (argc, argv, wmtv_master_xpm, wmtv_mask_bits,
- wmtv_mask_width, wmtv_mask_height);
+ wmtv_mask_width, wmtv_mask_height);
AddMouseRegion (NTFB, 47, 48, 59, 59); /* On/SetTune/Off Button */
AddMouseRegion (SCANLB, 23, 48, 35, 59); /* Left Preset/Scan Button */
@@ -279,7 +279,7 @@ main(int argc, char *argv[])
AddMouseRegion (FULLSB, 5, 5, 59, 44); /* Toggle FullScreen */
/* wmtv main loop */
- while (1)
+ while (1)
{
while (XPending(display))
{
@@ -306,7 +306,7 @@ main(int argc, char *argv[])
i = CheckMouseRegion (Event.xbutton.x, Event.xbutton.y);
switch (i) {
case NTFB:
- ButtonDown(NTFB);
+ ButtonDown(NTFB);
t_lc = Event.xbutton.time;
but_pressed = TRUE;
break;
@@ -314,7 +314,7 @@ main(int argc, char *argv[])
ButtonDown(SCANLB);
if (ntfb_status == SETUNE) {
switch (Event.xbutton.button) {
- case 1:
+ case 1:
timebutton = 1;
while (timebutton == 1)
if (isource == TELEVISION)
@@ -326,10 +326,10 @@ main(int argc, char *argv[])
break;
}
}
- else
+ else
ChanDown();
break;
- case SCANRB:
+ case SCANRB:
ButtonDown(SCANRB);
if (ntfb_status == SETUNE) {
switch (Event.xbutton.button) {
@@ -345,7 +345,7 @@ main(int argc, char *argv[])
break;
}
}
- else
+ else
ChanUp();
break;
case FULLSB:
@@ -374,7 +374,7 @@ main(int argc, char *argv[])
case ButtonRelease:
i = CheckMouseRegion (Event.xbutton.x, Event.xbutton.y);
switch (i) {
- case NTFB:
+ case NTFB:
ButtonUp(NTFB);
if (but_pressed) {
if (Event.xbutton.time - t_lc >= 900) {
@@ -390,7 +390,7 @@ main(int argc, char *argv[])
else if (ntfb_status == SETON) {
if (!btime) {
ntfb_status = SETUNE;
- copyXPMArea(96, 79, 11, 7, 6, 50);
+ copyXPMArea(96, 79, 11, 7, 6, 50);
RedrawWindowXYWH(6, 50, 11, 7);
}
else if (btime) {
@@ -404,7 +404,7 @@ main(int argc, char *argv[])
if (!btime) {
offset = (rfreq - ccrfreq);
// fprintf(stderr, "wmtv: finetune offset = %ld\n", offset);
- WriteRCFile(cfile);
+ WriteRCFile(cfile);
ntfb_status = SETON;
DrawPresetChan(cchannel);
}
@@ -569,13 +569,13 @@ main(int argc, char *argv[])
}
default:
break;
- }
+ }
XFlush(display);
- }
+ }
usleep(50000L);
- }
+ }
return(0);
-}
+}
/* ButtonDown function */
@@ -669,7 +669,7 @@ TVOn(void)
vclip[1].height = 39;
vwin.clips = vclip;
- vwin.clipcount = 2;
+ vwin.clipcount = 2;
vchn.channel = tvsource;
vaud.audio = tvsource;
@@ -691,9 +691,9 @@ TVOn(void)
if (!cnotune) {
if (ioctl(tfd, VIDIOCGTUNER, &vtun) < 0)
perror("ioctl VIDIOCGTUNER");
- if (vtun.flags & VIDEO_TUNER_LOW)
+ if (vtun.flags & VIDEO_TUNER_LOW)
st = 16000;
- else
+ else
st = 16;
}
@@ -743,7 +743,7 @@ TVOn(void)
if (ioctl(tfd, VIDIOCSWIN, &vwin) < 0)
perror("ioctl VIDIOCSWIN");
-
+
if (ioctl(tfd, VIDIOCCAPTURE, &ccapt) < 0)
perror("ioctl VIDIOCCAPTURE");
}
@@ -755,7 +755,7 @@ TVOff(void)
{
ccapt = 0;
- if (ioctl(tfd, VIDIOCCAPTURE, &ccapt) < 0)
+ if (ioctl(tfd, VIDIOCCAPTURE, &ccapt) < 0)
perror("ioctl VIDIOCCAPTURE");
vaud.audio = tvsource;
@@ -763,7 +763,7 @@ TVOff(void)
vaud.flags |= VIDEO_AUDIO_MUTE;
if (vchn.flags & VIDEO_VC_AUDIO) {
- if (ioctl(tfd, VIDIOCSAUDIO, &vaud) < 0)
+ if (ioctl(tfd, VIDIOCSAUDIO, &vaud) < 0)
perror("ioctl VIDIOCSAUDIO");
}
@@ -785,7 +785,7 @@ VolumeUp(void)
perror("ioctl VIDIOCSAUDIO");
}
}
-
+
}
/* VoumeDown function */
@@ -833,7 +833,7 @@ UnMuteAudio(void)
/* ScanUp function */
-void
+void
ScanUp(void)
{
rfreq += 2;
@@ -849,7 +849,7 @@ ScanUp(void)
if (vtun.signal == 0xFFFF) {
timebutton = 0;
}
-
+
}
@@ -907,7 +907,7 @@ ChanUp(void)
rfreq = ((tvtuner[i].freq[freqnorm] / 1000) * st) + ftune[cchannel];
ccrfreq = rfreq - ftune[cchannel];
break;
- }
+ }
}
DrawPresetChan(cchannel);
@@ -917,12 +917,12 @@ ChanUp(void)
/* ChanDown function */
-void
+void
ChanDown(void)
{
int i;
- if (cchannel != 0)
- --cchannel;
+ if (cchannel != 0)
+ --cchannel;
for (i=0; i < CHAN_ENTRIES; i++) {
if (!strcmp(cname[cchannel], tvtuner[i].name)) {
rfreq = ((tvtuner[i].freq[freqnorm] / 1000) * st) + ftune[cchannel];
@@ -977,8 +977,8 @@ DrawPresetChan(int cchannel)
/* ParseRCFile function */
-void
-ParseRCFile(const char *filename, rckeys *keys)
+void
+ParseRCFile(const char *filename, rckeys *keys)
{
char *p,*q;
char temp[128];
@@ -1004,17 +1004,17 @@ ParseRCFile(const char *filename, rckeys *keys)
*keys[key].var = strdup(p);
key = -1;
} else key++;
- }
+ }
}
free(q);
- }
+ }
fclose(fp);
}
/* ParseRCFile2 function */
void
-ParseRCFile2(const char *filename)
+ParseRCFile2(const char *filename)
{
int menu = FALSE;
char temp[128];
@@ -1057,7 +1057,7 @@ ParseRCFile2(const char *filename)
}
wcname[i] = (char *)malloc(sizeof(cname[i])+sizeof(p));
wcname[i] = strdup(cname[i]);
- sprintf(tp, " (%d) ", ftune[i]);
+ sprintf(tp, " (%d) ", ftune[i]);
strcat(wcname[i], tp);
i++;
tpst = i;
@@ -1160,7 +1160,7 @@ InitConfig(void)
strcpy(temp, "/etc/wmtvrc");
ParseRCFile(temp, wmtv_keys);
ParseRCFile2(temp);
-
+
strncpy(temp, (char *)getenv("HOME"), (sizeof(char)*128));
strcat(temp, "/.wmtvrc");
ParseRCFile(temp, wmtv_keys);
@@ -1202,7 +1202,7 @@ InitConfig(void)
}
if (!(vcap.type & VID_TYPE_SCALES)) {
- fprintf(stderr, "%s: video device does not support scalling\n", progname);
+ fprintf(stderr, "%s: video device does not support scalling\n", progname);
exit(1);
}
if (!(vcap.type & VID_TYPE_CLIPPING)) {
@@ -1229,7 +1229,7 @@ InitConfig(void)
cnotune = 0;
else
cnotune = 1;
-
+
vsource = 1;
tvsource = vchn.channel;
@@ -1274,7 +1274,7 @@ InitConfig(void)
}
}
}
-
+
for (i=0; i < vcap.audios; i++) {
vaud.audio = i;
if (ioctl(tfd, VIDIOCGAUDIO, &vaud) < 0) {
@@ -1313,7 +1313,7 @@ GetFrameBuffer(void)
if (XF86DGAQueryExtension(display, &evbr, &erbr)) {
XF86DGAQueryDirectVideo(display, XDefaultScreen(display), &flr);
if (flr & XF86DGADirectPresent) {
- XF86DGAGetVideoLL(display, XDefaultScreen(display),
+ XF86DGAGetVideoLL(display, XDefaultScreen(display),
(int *) &baseaddr, &bytesperline, &bankr, &memr);
}
}
@@ -1390,11 +1390,11 @@ DoFullScreen(void)
back_pix = WhitePixel(display, DefaultScreen(display));
fore_pix = BlackPixel(display, DefaultScreen(display));
- fmwin = XCreateWindow(display, DefaultRootWindow(display), fmsizehints.x,
- fmsizehints.y, fmsizehints.width, fmsizehints.height,
- borderwidth, CopyFromParent, InputOutput,
+ fmwin = XCreateWindow(display, DefaultRootWindow(display), fmsizehints.x,
+ fmsizehints.y, fmsizehints.width, fmsizehints.height,
+ borderwidth, CopyFromParent, InputOutput,
CopyFromParent, valuemask, &fmWinattr);
-
+
XSetWMNormalHints(display, fmwin, &fmsizehints);
@@ -1405,9 +1405,9 @@ DoFullScreen(void)
fmGC = XCreateGC(display, DefaultRootWindow(display), gcm, &gcv);
- XSelectInput(display, fmwin, ButtonPressMask | ExposureMask |
- ButtonReleaseMask | PointerMotionMask |
- StructureNotifyMask | VisibilityChangeMask | KeyPressMask );
+ XSelectInput(display, fmwin, ButtonPressMask | ExposureMask |
+ ButtonReleaseMask | PointerMotionMask |
+ StructureNotifyMask | VisibilityChangeMask | KeyPressMask );
fmxwmhints.flags = StateHint;
fmxwmhints.initial_state = NormalState;
@@ -1432,9 +1432,9 @@ DoFullScreen(void)
}
usleep(50000L);
- if (!XTranslateCoordinates(display, fmwin, DefaultRootWindow(display),
- -fmwinattr.border_width,
- -fmwinattr.border_width,
+ if (!XTranslateCoordinates(display, fmwin, DefaultRootWindow(display),
+ -fmwinattr.border_width,
+ -fmwinattr.border_width,
&rx, &ry, &junkwin)) {
fprintf(stderr, "wmtv: error translating coordinates for fmwin");
}
@@ -1448,7 +1448,7 @@ DoFullScreen(void)
if (ioctl(tfd, VIDIOCSWIN, &vswin) < 0) {
perror("ioctl VIDIOCSWIN");
}
-
+
ccapt = 1;
if (ioctl(tfd, VIDIOCCAPTURE, &ccapt) < 0) {
perror("ioctl VIDIOCCAPTURE");
@@ -1460,7 +1460,7 @@ DoFullScreen(void)
XF86VidModeGetAllModeLines(display, XDefaultScreen(display), &tml, &modelines);
for (i=0; i < tml; i++) {
- if ((modelines[i]->hdisplay == fswidth) &&
+ if ((modelines[i]->hdisplay == fswidth) &&
(modelines[i]->vdisplay == fsheight)) {
fullscreenmode = modelines[i];
mode_present = TRUE;
@@ -1475,9 +1475,9 @@ DoFullScreen(void)
XRaiseWindow(display, fmwin);
if (mode_present) {
- XF86VidModeSwitchToMode(display, XDefaultScreen(display), fullscreenmode);
+ XF86VidModeSwitchToMode(display, XDefaultScreen(display), fullscreenmode);
XF86VidModeSetViewPort(display, XDefaultScreen(display), vswin.x, vswin.y);
- XGrabPointer(display, fmwin, True, 0, GrabModeAsync, GrabModeAsync,
+ XGrabPointer(display, fmwin, True, 0, GrabModeAsync, GrabModeAsync,
fmwin, None, CurrentTime);
}
}
@@ -1498,7 +1498,7 @@ RetScreen()
if (mode_present) {
for (i = 0; i < tml; i++) {
- if ((modelines[i]->hdisplay == Winattr.width) &&
+ if ((modelines[i]->hdisplay == Winattr.width) &&
(modelines[i]->vdisplay==Winattr.height))
scm = modelines[i];
}
@@ -1517,7 +1517,7 @@ RetScreen()
scm->privsize = scmode.privsize;
scm->private = scmode.private;
*/
-
+
XClearWindow(display, fmwin);
XFreeGC(display, fmGC);
XMapRaised(display, fmwin);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmtv.git
More information about the Pkg-wmaker-commits
mailing list