diff --git a/src/kits/media/BufferConsumer.cpp b/src/kits/media/BufferConsumer.cpp index fe824c6f22..f59df95d65 100644 --- a/src/kits/media/BufferConsumer.cpp +++ b/src/kits/media/BufferConsumer.cpp @@ -328,8 +328,8 @@ BBufferConsumer::SendLatencyChange(const media_source& source, command.latency = newLatency; command.flags = flags; - TRACE("###### BBufferConsumer::SendLatencyChange: latency from %d/%d to " - "%d/%d changed to %" B_PRId64 "\n", source.port, source.id, + TRACE("###### BBufferConsumer::SendLatencyChange: latency from %" B_PRId32 "/%" B_PRId32 " to " + "%" B_PRId32 "/%" B_PRId32 " changed to %" B_PRId64 "\n", source.port, source.id, destination.port, destination.id, newLatency); return SendToPort(source.port, PRODUCER_LATENCY_CHANGED, &command, diff --git a/src/kits/media/DefaultMediaTheme.cpp b/src/kits/media/DefaultMediaTheme.cpp index 11a855bd47..3198fe16e8 100644 --- a/src/kits/media/DefaultMediaTheme.cpp +++ b/src/kits/media/DefaultMediaTheme.cpp @@ -646,8 +646,8 @@ ContinuousMessageFilter::Filter(BMessage *message, BHandler **target) value[i] = (float)(slider->ValueFor(i) / 1000.0); } - TRACE("ContinuousMessageFilter::Filter: update view %s, %d " - "channels\n", fControl->Name(), fParameter.CountChannels()); + TRACE("ContinuousMessageFilter::Filter: update view %s, %" B_PRId32 + " channels\n", fControl->Name(), fParameter.CountChannels()); if (fParameter.SetValue((void *)value, sizeof(value), -1) < B_OK) { @@ -758,7 +758,8 @@ DiscreteMessageFilter::Filter(BMessage *message, BHandler **target) popUp->SelectedOption(NULL, &value); } - TRACE("DiscreteMessageFilter::Filter: update view %s, value = %d\n", control->Name(), value); + TRACE("DiscreteMessageFilter::Filter: update view %s, value = %" + B_PRId32 "\n", control->Name(), value); if (fParameter.SetValue((void *)&value, sizeof(value), -1) < B_OK) { ERROR("DiscreteMessageFilter::Filter: Could not set parameter value for %p\n", &fParameter); diff --git a/src/kits/media/MediaFile.cpp b/src/kits/media/MediaFile.cpp index c4c58070ea..f93d27bdf0 100644 --- a/src/kits/media/MediaFile.cpp +++ b/src/kits/media/MediaFile.cpp @@ -214,7 +214,8 @@ BMediaFile::TrackAt(int32 index) return NULL; } if (fTrackList[index] == NULL) { - TRACE("BMediaFile::TrackAt, creating new track for index %d\n", index); + TRACE("BMediaFile::TrackAt, creating new track for index %" + B_PRId32 "\n", index); fTrackList[index] = new(std::nothrow) BMediaTrack(fExtractor, index); TRACE("BMediaFile::TrackAt, new track is %p\n", fTrackList[index]); } @@ -235,7 +236,7 @@ BMediaFile::ReleaseTrack(BMediaTrack* track) for (int32 i = 0; i < fTrackNum; i++) { if (fTrackList[i] == track) { TRACE("BMediaFile::ReleaseTrack, releasing track %p with index " - "%d\n", track, i); + "%" B_PRId32 "\n", track, i); delete track; fTrackList[i] = NULL; return B_OK; @@ -255,7 +256,7 @@ BMediaFile::ReleaseAllTracks() for (int32 i = 0; i < fTrackNum; i++) { if (fTrackList[i]) { TRACE("BMediaFile::ReleaseAllTracks, releasing track %p with " - "index %d\n", fTrackList[i], i); + "index %" B_PRId32 "\n", fTrackList[i], i); delete fTrackList[i]; fTrackList[i] = NULL; } diff --git a/src/kits/media/MediaFormats.cpp b/src/kits/media/MediaFormats.cpp index 74cf5d7422..e0bda690c2 100644 --- a/src/kits/media/MediaFormats.cpp +++ b/src/kits/media/MediaFormats.cpp @@ -477,7 +477,8 @@ BMediaFormats::GetFormatFor(const media_format_description& description, strerror(status)); return status; } - TRACE("search for description family = %d, a = 0x%ux, b = 0x%ux\n", + TRACE("search for description family = %d, a = 0x%" + B_PRId32 "x, b = 0x%" B_PRId32 "x\n", description.family, description.u.misc.file_format, description.u.misc.codec); diff --git a/src/kits/media/MediaRoster.cpp b/src/kits/media/MediaRoster.cpp index 4a8c62953f..b62dce518c 100644 --- a/src/kits/media/MediaRoster.cpp +++ b/src/kits/media/MediaRoster.cpp @@ -2215,11 +2215,13 @@ BMediaRoster::UnregisterNode(BMediaNode* node) if (node == NULL) return B_BAD_VALUE; - TRACE("BMediaRoster::UnregisterNode %d (%p)\n", node->ID(), node); + TRACE("BMediaRoster::UnregisterNode %" + B_PRId32 " (%p)\n", node->ID(), node); if ((node->fKinds & NODE_KIND_NO_REFCOUNTING) !=0) { TRACE("BMediaRoster::UnregisterNode, trying to unregister reference " - "counting disabled timesource, node %d, port %d, team %d\n", + "counting disabled timesource, node %" + B_PRId32 " , port %" B_PRId32 " , team %" B_PRId32 "\n", node->ID(), node->ControlPort(), BPrivate::current_team()); return B_OK; } diff --git a/src/kits/media/ParameterWeb.cpp b/src/kits/media/ParameterWeb.cpp index ced5623a04..c7fb13c519 100644 --- a/src/kits/media/ParameterWeb.cpp +++ b/src/kits/media/ParameterWeb.cpp @@ -444,8 +444,9 @@ BParameterWeb::ParameterAt(int32 index) groups.AddList(group->fGroups); } - TRACE("*** could not find parameter at %d (count = %d)\n", index, - CountParameters()); + TRACE("*** could not find parameter at %" + B_PRId32 " (count = %" B_PRId32 ")\n", index, CountParameters()); + return NULL; } diff --git a/src/kits/media/PluginManager.cpp b/src/kits/media/PluginManager.cpp index db7ce29c61..3c529bcd5a 100644 --- a/src/kits/media/PluginManager.cpp +++ b/src/kits/media/PluginManager.cpp @@ -269,7 +269,7 @@ PluginManager::CreateReader(Reader** reader, int32* streamCount, if ((*reader)->Sniff(streamCount) == B_OK) { TRACE("PluginManager::CreateReader: Sniff success " - "(%d stream(s))\n", *streamCount); + "(%" B_PRId32 " stream(s))\n", *streamCount); (*reader)->GetFileFormatInfo(mff); return B_OK; } @@ -735,7 +735,7 @@ PluginManager::PutPlugin(MediaPlugin* plugin) if (pinfo->usecount == 0) { TRACE(" deleting %p\n", pinfo->plugin); delete pinfo->plugin; - TRACE(" unloading add-on: %d\n\n", pinfo->image); + TRACE(" unloading add-on: %" B_PRId32 "\n\n", pinfo->image); unload_add_on(pinfo->image); fPluginList.RemoveCurrent(); } diff --git a/src/kits/media/SoundPlayNode.cpp b/src/kits/media/SoundPlayNode.cpp index 51c1ee5218..6587248a6d 100644 --- a/src/kits/media/SoundPlayNode.cpp +++ b/src/kits/media/SoundPlayNode.cpp @@ -352,7 +352,7 @@ SoundPlayNode::PrepareToConnect(const media_source& what, channel_count = *(uint32 *)&format->user_data[4]; frame_rate = *(float *)&format->user_data[20]; TRACE("SoundPlayNode::PrepareToConnect: found mixer info: " - "channel_count %d, frame_rate %.1f\n", channel_count, frame_rate); + "channel_count %" B_PRId32 " , frame_rate %.1f\n", channel_count, frame_rate); } media_format default_format; diff --git a/src/kits/media/SoundPlayer.cpp b/src/kits/media/SoundPlayer.cpp index 8e7334ac32..c62e1d7d6d 100644 --- a/src/kits/media/SoundPlayer.cpp +++ b/src/kits/media/SoundPlayer.cpp @@ -123,7 +123,7 @@ BSoundPlayer::~BSoundPlayer() err = roster->Disconnect(fMediaOutput, fMediaInput); if (err != B_OK) { TRACE("BSoundPlayer::~BSoundPlayer: Error disconnecting nodes: " - "%d (%s)\n", err, strerror(err)); + "%" B_PRId32 " (%s)\n", err, strerror(err)); } } @@ -133,7 +133,7 @@ BSoundPlayer::~BSoundPlayer() err = roster->ReleaseNode(fMediaInput.node); if (err != B_OK) { TRACE("BSoundPlayer::~BSoundPlayer: Error releasing input node: " - "%d (%s)\n", err, strerror(err)); + "%" B_PRId32 " (%s)\n", err, strerror(err)); } } @@ -210,7 +210,7 @@ BSoundPlayer::Start() status_t err = roster->StartNode(fPlayerNode->Node(), fPlayerNode->TimeSource()->Now() + Latency() + 5000); if (err != B_OK) { - TRACE("BSoundPlayer::Start: StartNode failed, %d", err); + TRACE("BSoundPlayer::Start: StartNode failed, %" B_PRId32, err); return err; } @@ -285,8 +285,8 @@ BSoundPlayer::Latency() bigtime_t latency; status_t err = roster->GetLatencyFor(fMediaOutput.node, &latency); if (err != B_OK) { - TRACE("BSoundPlayer::Latency: GetLatencyFor failed %d (%s)\n", err, - strerror(err)); + TRACE("BSoundPlayer::Latency: GetLatencyFor failed %" B_PRId32 + " (%s)\n", err, strerror(err)); return 0; } @@ -427,8 +427,8 @@ BSoundPlayer::Preroll() status_t err = roster->PrerollNode(fMediaOutput.node); if (err != B_OK) { - TRACE("BSoundPlayer::Preroll: Error while PrerollNode: %d (%s)\n", - err, strerror(err)); + TRACE("BSoundPlayer::Preroll: Error while PrerollNode: %" + B_PRId32 " (%s)\n", err, strerror(err)); return err; } @@ -867,7 +867,7 @@ BSoundPlayer::_Init(const media_node* node, _GetVolumeSlider(); - TRACE("BSoundPlayer node %d has timesource %d\n", + TRACE("BSoundPlayer node %" B_PRId32 " has timesource %" B_PRId32 "\n", fPlayerNode->Node().node, fPlayerNode->TimeSource()->Node().node); } diff --git a/src/kits/media/TimeSourceObject.cpp b/src/kits/media/TimeSourceObject.cpp index 9686945d14..f300c472d4 100644 --- a/src/kits/media/TimeSourceObject.cpp +++ b/src/kits/media/TimeSourceObject.cpp @@ -28,7 +28,9 @@ TimeSourceObject::TimeSourceObject(const media_node& node) BMediaNode("some timesource object", node.node, node.kind), BTimeSource(node.node) { - TRACE("TimeSourceObject::TimeSourceObject enter, id = %d\n", node.node); + TRACE("TimeSourceObject::TimeSourceObject enter, id = %" + B_PRId32 "\n", node.node); + if (fControlPort > 0) delete_port(fControlPort); diff --git a/src/kits/media/TimedEventQueuePrivate.cpp b/src/kits/media/TimedEventQueuePrivate.cpp index 7ec09fc27d..aac6111bb9 100644 --- a/src/kits/media/TimedEventQueuePrivate.cpp +++ b/src/kits/media/TimedEventQueuePrivate.cpp @@ -620,7 +620,7 @@ _event_queue_imp::GetStart_AfterTime(bigtime_t eventTime, bool inclusive) void _event_queue_imp::Dump() const { - TRACE("fEventCount = %d\n", fEventCount); + TRACE("fEventCount = %" B_PRId32 "\n", fEventCount); TRACE("fFirstEntry = 0x%p\n", (void*)fFirstEntry); TRACE("fLastEntry = 0x%p\n", (void*)fLastEntry); for (event_queue_entry *entry = fFirstEntry; entry; entry = entry->next) {