i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Codycam: some 64 bit fixes

Browse Source
This commit is contained in:
Jérôme Duval
2013-05-04 15:31:03 +02:00
parent 1a84d6b362
commit afcbccb9b5
5 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/codycam/CodyCam.cpp
+2 -2
View File
@@ -65,7 +65,7 @@ ErrorAlert(const char* message, status_t err, BWindow *window = NULL)
alert->SetFlags(alert->Flags() | B_CLOSE_ON_ESCAPE);
alert->Go();
printf("%s\n%s [%lx]", message, strerror(err), err);
printf("%s\n%s [%" B_PRIx32 "]", message, strerror(err), err);
}
@@ -541,7 +541,7 @@ VideoWindow::MessageReceived(BMessage* message)
case msg_upl_client:
message->FindInt32("client", &(fFtpInfo.uploadClient));
FTPINFO("upl client = %ld\n", fFtpInfo.uploadClient);
FTPINFO("upl client = %" B_PRId32 "\n", fFtpInfo.uploadClient);
_UploadClientChanged();
break;
src/apps/codycam/Settings.cpp
+1 -1
View File
@@ -177,7 +177,7 @@ ScalarValueSetting::Value() const
void
ScalarValueSetting::GetValueAsString(char* buffer) const
{
sprintf(buffer, "%ld", fValue);
sprintf(buffer, "%" B_PRId32, fValue);
}
src/apps/codycam/Settings.h
+1 -1
View File
@@ -61,7 +61,7 @@ public:
int32 defaultValue,
const char* valueExpectedErrorString,
const char* wrongValueErrorString,
int32 min = LONG_MIN, int32 max = LONG_MAX);
int32 min = INT32_MIN, int32 max = INT32_MAX);
virtual ~ScalarValueSetting();
void ValueChanged(int32 newValue);
src/apps/codycam/VideoConsumer.cpp
+9 -8
View File
@@ -124,7 +124,7 @@ VideoConsumer::~VideoConsumer()
BMediaAddOn*
VideoConsumer::AddOn(long* cookie) const
VideoConsumer::AddOn(int32* cookie) const
{
FUNCTION("VideoConsumer::AddOn\n");
// do the right thing if we're ever used with an add-on
@@ -243,7 +243,8 @@ VideoConsumer::HandleMessage(int32 message, const void* data, size_t size)
void
VideoConsumer::BufferReceived(BBuffer* buffer)
{
LOOP("VideoConsumer::Buffer #%ld received, start_time %Ld\n", buffer->ID(), buffer->Header()->start_time);
LOOP("VideoConsumer::Buffer #%" B_PRId32 " received, start_time %" B_PRIdBIGTIME
"\n", buffer->ID(), buffer->Header()->start_time);
if (RunState() == B_STOPPED) {
buffer->Recycle();
@@ -309,8 +310,8 @@ VideoConsumer::CreateBuffers(const media_format& withFormat)
else
PROGRESS("VideoConsumer::CreateBuffers - SUCCESSFUL ADD BUFFER TO GROUP\n");
} else {
ERROR("VideoConsumer::CreateBuffers - ERROR CREATING VIDEO RING BUFFER: %08lx\n",
status);
ERROR("VideoConsumer::CreateBuffers - ERROR CREATING VIDEO RING "
"BUFFER: %08" B_PRIx32 "\n", status);
return B_ERROR;
}
}
@@ -322,8 +323,8 @@ VideoConsumer::CreateBuffers(const media_format& withFormat)
if ((status = fBuffers->GetBufferList(3, buffList)) == B_OK)
for (int j = 0; j < 3; j++)
if (buffList[j] != NULL) {
fBufferMap[j] = (uint32)buffList[j];
PROGRESS(" j = %d buffer = %08lx\n", j, fBufferMap[j]);
fBufferMap[j] = buffList[j];
PROGRESS(" j = %d buffer = %p\n", j, fBufferMap[j]);
} else {
ERROR("VideoConsumer::CreateBuffers ERROR MAPPING RING BUFFER\n");
return B_ERROR;
@@ -542,7 +543,7 @@ VideoConsumer::HandleEvent(const media_timed_event* event, bigtime_t lateness,
uint32 index = 0;
fOurBuffers = true;
while (index < 3)
if ((uint32)buffer == fBufferMap[index])
if (buffer == fBufferMap[index])
break;
else
index++;
@@ -735,7 +736,7 @@ VideoConsumer::FtpSave(char* filename)
uint32 time = real_time_clock();
char s[80];
strcpy(s, B_TRANSLATE("Last Capture: "));
strcat(s, ctime((const long*)&time));
strcat(s, ctime((const time_t*)&time));
s[strlen(s) - 1] = 0;
UpdateFtpStatus(s);
delete ftp;
src/apps/codycam/VideoConsumer.h
+3 -3
View File
@@ -43,7 +43,7 @@ class VideoConsumer : public BMediaEventLooper, public BBufferConsumer {
/* BMediaNode */
public:
virtual BMediaAddOn* AddOn(long* cookie) const;
virtual BMediaAddOn* AddOn(int32* cookie) const;
protected:
virtual void Start(bigtime_t performanceTime);
@@ -114,7 +114,7 @@ class VideoConsumer : public BMediaEventLooper, public BBufferConsumer {
private:
BStringView* fStatusLine;
uint32 fInternalID;
int32 fInternalID;
BMediaAddOn* fAddOn;
thread_id fFtpThread;
@@ -129,7 +129,7 @@ class VideoConsumer : public BMediaEventLooper, public BBufferConsumer {
BBitmap* fBitmap[3];
bool fOurBuffers;
BBufferGroup* fBuffers;
uint32 fBufferMap[3];
BBuffer* fBufferMap[3];
BBitmap* fFtpBitmap;
volatile bool fTimeToFtp;