apps/tv: Fix -Werror=class-memaccess
Fix -Werror=class-memaccess, pointed by gcc8. * Remove unneed memset() at line 300, since constructor of media_format already runs memset(). * Replace other memset() with media_format.Clear(). * Remove trailing tabs. Change-Id: I3207842603208b33a77cfd88de7a8a0e52fb2d72 Reviewed-on: https://review.haiku-os.org/c/1116 Reviewed-by: waddlesplash <[email protected]>
This commit is contained in:
committed by
waddlesplash
parent
752ec5c625
commit
74d9e19df9
+27
-28
@@ -123,7 +123,7 @@ Controller::ConnectInterface(int i)
|
|||||||
|
|
||||||
BParameterWeb *web;
|
BParameterWeb *web;
|
||||||
status_t err;
|
status_t err;
|
||||||
|
|
||||||
err = gDeviceRoster->MediaRoster()->GetParameterWebFor(gDeviceRoster->DeviceNode(i), &web);
|
err = gDeviceRoster->MediaRoster()->GetParameterWebFor(gDeviceRoster->DeviceNode(i), &web);
|
||||||
if (err != B_OK) {
|
if (err != B_OK) {
|
||||||
printf("Controller::ConnectInterface: can't get parameter web\n");
|
printf("Controller::ConnectInterface: can't get parameter web\n");
|
||||||
@@ -133,7 +133,7 @@ Controller::ConnectInterface(int i)
|
|||||||
delete fWeb;
|
delete fWeb;
|
||||||
fWeb = web;
|
fWeb = web;
|
||||||
fCurrentInterface = i;
|
fCurrentInterface = i;
|
||||||
|
|
||||||
// XXX we may need to monitor for parameter web changes
|
// XXX we may need to monitor for parameter web changes
|
||||||
// and reassing fWeb and fChannelParam on demand.
|
// and reassing fWeb and fChannelParam on demand.
|
||||||
|
|
||||||
@@ -141,14 +141,14 @@ Controller::ConnectInterface(int i)
|
|||||||
fChannelParam = NULL;
|
fChannelParam = NULL;
|
||||||
int count = fWeb->CountParameters();
|
int count = fWeb->CountParameters();
|
||||||
for (int i = 0; i < count; i++) {
|
for (int i = 0; i < count; i++) {
|
||||||
BParameter *parameter = fWeb->ParameterAt(i);
|
BParameter *parameter = fWeb->ParameterAt(i);
|
||||||
|
|
||||||
printf("parameter %d\n", i);
|
printf("parameter %d\n", i);
|
||||||
printf(" name '%s'\n", parameter->Name());
|
printf(" name '%s'\n", parameter->Name());
|
||||||
printf(" kind '%s'\n", parameter->Kind());
|
printf(" kind '%s'\n", parameter->Kind());
|
||||||
printf(" unit '%s'\n", parameter->Unit());
|
printf(" unit '%s'\n", parameter->Unit());
|
||||||
printf(" flags 0x%08" B_PRIx32 "\n", parameter->Flags());
|
printf(" flags 0x%08" B_PRIx32 "\n", parameter->Flags());
|
||||||
|
|
||||||
// XXX TODO: matching on Name is weak
|
// XXX TODO: matching on Name is weak
|
||||||
if (strcmp(parameter->Name(), "Channel") == 0 || strcmp(parameter->Kind(), B_TUNER_CHANNEL) == 0) {
|
if (strcmp(parameter->Name(), "Channel") == 0 || strcmp(parameter->Kind(), B_TUNER_CHANNEL) == 0) {
|
||||||
fChannelParam = dynamic_cast<BDiscreteParameter *>(parameter);
|
fChannelParam = dynamic_cast<BDiscreteParameter *>(parameter);
|
||||||
@@ -212,7 +212,7 @@ Controller::SelectChannel(int i)
|
|||||||
{
|
{
|
||||||
if (!fChannelParam)
|
if (!fChannelParam)
|
||||||
return B_ERROR;
|
return B_ERROR;
|
||||||
|
|
||||||
int32 index;
|
int32 index;
|
||||||
status_t err;
|
status_t err;
|
||||||
index = i;
|
index = i;
|
||||||
@@ -232,7 +232,7 @@ Controller::ChannelCount()
|
|||||||
{
|
{
|
||||||
if (fCurrentInterface == -1)
|
if (fCurrentInterface == -1)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
if (!fChannelParam)
|
if (!fChannelParam)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
@@ -245,7 +245,7 @@ Controller::ChannelName(int i)
|
|||||||
{
|
{
|
||||||
if (fCurrentInterface == -1)
|
if (fCurrentInterface == -1)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
if (!fChannelParam)
|
if (!fChannelParam)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
@@ -296,8 +296,7 @@ Controller::ConnectNodes()
|
|||||||
HandleError("Can't find free audio input", err);
|
HandleError("Can't find free audio input", err);
|
||||||
if (count < 1)
|
if (count < 1)
|
||||||
HandleError("No free audio input", -1);
|
HandleError("No free audio input", -1);
|
||||||
|
|
||||||
memset(&fmt, 0, sizeof(fmt));
|
|
||||||
err = gMediaRoster->Connect(output.source, input.destination, &fmt, &audio_output, &audio_input);
|
err = gMediaRoster->Connect(output.source, input.destination, &fmt, &audio_output, &audio_input);
|
||||||
HandleError("Can't connect audio", err);
|
HandleError("Can't connect audio", err);
|
||||||
|
|
||||||
@@ -312,7 +311,7 @@ Controller::ConnectNodes()
|
|||||||
HandleError("Can't find free video input", err);
|
HandleError("Can't find free video input", err);
|
||||||
if (count < 1)
|
if (count < 1)
|
||||||
HandleError("No free video input", -1);
|
HandleError("No free video input", -1);
|
||||||
|
|
||||||
color_space cspaces_overlay[] = { B_YCbCr422, B_RGB32, B_NO_COLOR_SPACE };
|
color_space cspaces_overlay[] = { B_YCbCr422, B_RGB32, B_NO_COLOR_SPACE };
|
||||||
color_space cspaces_bitmap[] = { B_RGB32, B_NO_COLOR_SPACE };
|
color_space cspaces_bitmap[] = { B_RGB32, B_NO_COLOR_SPACE };
|
||||||
|
|
||||||
@@ -322,7 +321,7 @@ Controller::ConnectNodes()
|
|||||||
fVideoNode->SetOverlayEnabled(true);
|
fVideoNode->SetOverlayEnabled(true);
|
||||||
for (int i = 0; cspaces_overlay[i] != B_NO_COLOR_SPACE; i++) {
|
for (int i = 0; cspaces_overlay[i] != B_NO_COLOR_SPACE; i++) {
|
||||||
printf("trying connect with colorspace 0x%08x\n", cspaces_overlay[i]);
|
printf("trying connect with colorspace 0x%08x\n", cspaces_overlay[i]);
|
||||||
memset(&fmt, 0, sizeof(fmt));
|
fmt.Clear();
|
||||||
fmt.type = B_MEDIA_RAW_VIDEO;
|
fmt.type = B_MEDIA_RAW_VIDEO;
|
||||||
fmt.u.raw_video.display.format = cspaces_overlay[i];
|
fmt.u.raw_video.display.format = cspaces_overlay[i];
|
||||||
err = gMediaRoster->Connect(output.source, input.destination, &fmt, &video_output, &video_input);
|
err = gMediaRoster->Connect(output.source, input.destination, &fmt, &video_output, &video_input);
|
||||||
@@ -334,18 +333,18 @@ Controller::ConnectNodes()
|
|||||||
fVideoNode->SetOverlayEnabled(false);
|
fVideoNode->SetOverlayEnabled(false);
|
||||||
for (int i = 0; cspaces_bitmap[i] != B_NO_COLOR_SPACE; i++) {
|
for (int i = 0; cspaces_bitmap[i] != B_NO_COLOR_SPACE; i++) {
|
||||||
printf("trying connect with colorspace 0x%08x\n", cspaces_bitmap[i]);
|
printf("trying connect with colorspace 0x%08x\n", cspaces_bitmap[i]);
|
||||||
memset(&fmt, 0, sizeof(fmt));
|
fmt.Clear();
|
||||||
fmt.type = B_MEDIA_RAW_VIDEO;
|
fmt.type = B_MEDIA_RAW_VIDEO;
|
||||||
fmt.u.raw_video.display.format = cspaces_bitmap[i];
|
fmt.u.raw_video.display.format = cspaces_bitmap[i];
|
||||||
err = gMediaRoster->Connect(output.source, input.destination, &fmt, &video_output, &video_input);
|
err = gMediaRoster->Connect(output.source, input.destination, &fmt, &video_output, &video_input);
|
||||||
if (err == B_OK)
|
if (err == B_OK)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
HandleError("Can't connect video", err);
|
HandleError("Can't connect video", err);
|
||||||
|
|
||||||
// set time sources
|
// set time sources
|
||||||
|
|
||||||
err = gMediaRoster->GetTimeSource(&time_node);
|
err = gMediaRoster->GetTimeSource(&time_node);
|
||||||
HandleError("Can't get time source", err);
|
HandleError("Can't get time source", err);
|
||||||
|
|
||||||
@@ -369,12 +368,12 @@ Controller::ConnectNodes()
|
|||||||
err = gMediaRoster->SetProducerRunModeDelay(dvb_node, 80000);
|
err = gMediaRoster->SetProducerRunModeDelay(dvb_node, 80000);
|
||||||
HandleError("Can't set DVB producer delay", err);
|
HandleError("Can't set DVB producer delay", err);
|
||||||
|
|
||||||
bigtime_t start_time = ts->Now() + 50000;
|
bigtime_t start_time = ts->Now() + 50000;
|
||||||
|
|
||||||
ts->Release();
|
ts->Release();
|
||||||
|
|
||||||
// start nodes
|
// start nodes
|
||||||
|
|
||||||
err = gMediaRoster->StartNode(dvb_node, start_time);
|
err = gMediaRoster->StartNode(dvb_node, start_time);
|
||||||
HandleError("Can't start dvb node", err);
|
HandleError("Can't start dvb node", err);
|
||||||
|
|
||||||
@@ -384,10 +383,10 @@ Controller::ConnectNodes()
|
|||||||
err = gMediaRoster->StartNode(video_window_node, start_time);
|
err = gMediaRoster->StartNode(video_window_node, start_time);
|
||||||
HandleError("Can't start video window node", err);
|
HandleError("Can't start video window node", err);
|
||||||
|
|
||||||
printf("running...\n");
|
printf("running...\n");
|
||||||
|
|
||||||
fConnected = true;
|
fConnected = true;
|
||||||
|
|
||||||
return B_OK;
|
return B_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -396,12 +395,12 @@ status_t
|
|||||||
Controller::DisconnectNodes()
|
Controller::DisconnectNodes()
|
||||||
{
|
{
|
||||||
printf("stopping...\n");
|
printf("stopping...\n");
|
||||||
|
|
||||||
if (!fConnected)
|
if (!fConnected)
|
||||||
return B_OK;
|
return B_OK;
|
||||||
|
|
||||||
status_t err;
|
status_t err;
|
||||||
|
|
||||||
// stop nodes
|
// stop nodes
|
||||||
|
|
||||||
err = gMediaRoster->StopNode(dvb_node, 0, true);
|
err = gMediaRoster->StopNode(dvb_node, 0, true);
|
||||||
@@ -414,7 +413,7 @@ Controller::DisconnectNodes()
|
|||||||
HandleError("Can't stop video window node", err);
|
HandleError("Can't stop video window node", err);
|
||||||
|
|
||||||
// disconnect nodes
|
// disconnect nodes
|
||||||
|
|
||||||
err = MediaRoster_Disconnect(video_output, video_input);
|
err = MediaRoster_Disconnect(video_output, video_input);
|
||||||
HandleError("Can't disconnect video", err);
|
HandleError("Can't disconnect video", err);
|
||||||
|
|
||||||
@@ -426,7 +425,7 @@ Controller::DisconnectNodes()
|
|||||||
fVideoView->RemoveVideoDisplay();
|
fVideoView->RemoveVideoDisplay();
|
||||||
|
|
||||||
// release other nodes
|
// release other nodes
|
||||||
|
|
||||||
err = gMediaRoster->ReleaseNode(audio_mixer_node);
|
err = gMediaRoster->ReleaseNode(audio_mixer_node);
|
||||||
HandleError("Can't release audio mixer node", err);
|
HandleError("Can't release audio mixer node", err);
|
||||||
|
|
||||||
@@ -440,9 +439,9 @@ Controller::DisconnectNodes()
|
|||||||
|
|
||||||
err = gMediaRoster->ReleaseNode(dvb_node);
|
err = gMediaRoster->ReleaseNode(dvb_node);
|
||||||
HandleError("Can't release DVB node", err);
|
HandleError("Can't release DVB node", err);
|
||||||
|
|
||||||
fConnected = false;
|
fConnected = false;
|
||||||
|
|
||||||
return B_OK;
|
return B_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user