Skip to content

Remove exitflag and some other header cruft #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
makomk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove exitflag and some other header cruft #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions dsd/dsd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
* PERFORMANCE OF THIS SOFTWARE.
*/

#include "config.h"
#include <stdio.h>
#include <stdlib.h>
#include <signal.h>
Expand All @@ -28,20 +27,9 @@
#include <sys/ioctl.h>
#include <fcntl.h>
#include <unistd.h>
#ifdef SOLARIS
#include <sys/audioio.h>
#endif
#if defined(BSD) && !defined(__APPLE__)
#include <sys/soundcard.h>
#endif
#include <math.h>
#include <mbelib.h>
#include <sndfile.h>
/*
* global variables
*/
int exitflag;


typedef struct
{
Expand Down Expand Up @@ -252,7 +240,6 @@ extern void initState (dsd_state * state);
void usage ();
extern void liveScanner (dsd_opts * opts, dsd_state * state);
void cleanupAndExit (dsd_opts * opts, dsd_state * state);
void sigfun (int sig);
int main (int argc, char **argv);
void playMbeFiles (dsd_opts * opts, dsd_state * state, int argc, char **argv);
void processMbeFrame (dsd_opts * opts, dsd_state * state, char imbe_fr[8][23], char ambe_fr[4][24], char imbe7100_fr[7][24]);
Expand Down
2 changes: 2 additions & 0 deletions dsd/dsd_frame_sync.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -792,10 +792,12 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
}
}

#if 0
if (exitflag == 1)
{
cleanupAndExit (opts, state);
}
#endif

if (synctest_pos < 10200)
{
Expand Down
10 changes: 0 additions & 10 deletions dsd/dsd_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,13 +329,6 @@ cleanupAndExit (dsd_opts * opts, dsd_state * state)
exit (0);
}

void
sigfun (int sig)
{
exitflag = 1;
signal (SIGINT, SIG_DFL);
}

int
main (int argc, char **argv)
{
Expand All @@ -354,9 +347,6 @@ main (int argc, char **argv)
initOpts (&opts);
initState (&state);

exitflag = 0;
signal (SIGINT, sigfun);

while ((c = getopt (argc, argv, "hep:qstv:z:i:o:d:g:nw:B:C:R:f:m:u:x:A:S:M:rl")) != -1)
{
opterr = 0;
Expand Down
2 changes: 2 additions & 0 deletions dsd/dsd_mbe.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,12 @@ playMbeFiles (dsd_opts * opts, dsd_state * state, int argc, char **argv)
playSynthesizedVoice (opts, state);
}
}
#if 0
if (exitflag == 1)
{
cleanupAndExit (opts, state);
}
#endif
}
}
}
Expand Down