Commit 308a4a0c authored by user's avatar user
Browse files

Merge branch 'master' of gitlab.irl.020:sms/c-player

Conflicts:
	scripts/deployGstreamer-dev
parents ac64ae1a f6700629
......@@ -11,6 +11,8 @@ BDIR=$(realpath $1)
echo "Building in: $BDIR, is that ok? (press enter)"
read
echo "Make sure you have all the repos in your sources list (contrib and non-free) press enter to continue"
read
#should we install debian packages?
checkdeps="false"
......
......@@ -14,4 +14,4 @@ tcpclient
c-player-np
midicontrol
valgrind.sh
tcp2rtsp
......@@ -124,31 +124,31 @@ main (int argc, char *argv[])
pData->feedid = atoi(optarg);
break;
case 's':
if (strcmp(optarg,"snowmix") == 0)
if (strncmp(optarg,"snowmix", 7) == 0)
{
pData->sink = SNOWMIX;
} else if (strcmp(optarg,"rtmp") == 0)
} else if (strncmp(optarg,"rtmp", 4) == 0)
{
pData->sink = RTMP;
} else if (strcmp(optarg,"fake") == 0)
} else if (strncmp(optarg,"fake", 4) == 0)
{
pData->sink = FAKE;
}
break;
#ifdef SNOWBIN
case 'a':
if (strcmp(optarg,"snowmix") == 0)
if (strncmp(optarg,"snowmix", 7) == 0)
{
pData->snow->audiosink = SNOWMIX;
} else if (strcmp(optarg,"jack") == 0)
} else if (strncmp(optarg,"jack", 4) == 0)
{
pData->snow->audiosink = JACK;
} else if (strcmp(optarg,"auto") == 0)
} else if (strncmp(optarg,"auto", 4) == 0)
{
pData->snow->audiosink = AUTO;
} else if (strcmp(optarg,"fake") == 0)
} else if (strncmp(optarg,"fake", 4) == 0)
{
pData->snow->audiosink = FAKE;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment