diff --git a/libgeneric-pc/record_lib.h b/libgeneric-pc/record_lib.h index bbe407d..a5325ee 100644 --- a/libgeneric-pc/record_lib.h +++ b/libgeneric-pc/record_lib.h @@ -38,7 +38,6 @@ class cRecord #define RECORD_WRITER_CHUNKS 16 unsigned char *io_buf[RECORD_WRITER_CHUNKS]; size_t io_len[RECORD_WRITER_CHUNKS]; - public: cRecord(int num = 0, int bs_dmx = 2048 * 1024, int bs = 4096 * 1024); void setFailureCallback(void (*f)(void *), void *d) { failureCallback = f; failureData = d; } diff --git a/libraspi/audio_lib.h b/libraspi/audio_lib.h index 39c1069..3afc215 100644 --- a/libraspi/audio_lib.h +++ b/libraspi/audio_lib.h @@ -50,7 +50,7 @@ class cAudio int mixer_fd; /* if we are using the OSS mixer */ int mixer_num; /* oss mixer to use, if any */ - AUDIO_FORMAT StreamType; + int StreamType; AUDIO_SYNC_MODE SyncMode; bool started; bool thread_started; @@ -84,7 +84,8 @@ class cAudio int Start(void); int Stop(void); bool Pause(bool Pcm = true); - void SetStreamType(AUDIO_FORMAT type); + void SetStreamType(int bypass); + int GetStreamType(void) { return StreamType; } void SetSyncMode(AVSYNC_TYPE Mode); /* select channels */ diff --git a/libraspi/video.cpp b/libraspi/video.cpp index 75f9caf..e67eaf9 100644 --- a/libraspi/video.cpp +++ b/libraspi/video.cpp @@ -78,6 +78,18 @@ int cVideo::setBlank(int) return 1; } +int cVideo::GetVideoSystem() +{ + int current_video_system = VIDEO_STD_1080I50; + + if (dec_w < 720) + current_video_system = VIDEO_STD_PAL; + else if (dec_w > 720 && dec_w <= 1280) + current_video_system = VIDEO_STD_720P50; + + return current_video_system; +} + int cVideo::SetVideoSystem(int system, bool) { int h; diff --git a/libraspi/video_lib.h b/libraspi/video_lib.h index 406e14a..45358e2 100644 --- a/libraspi/video_lib.h +++ b/libraspi/video_lib.h @@ -180,6 +180,10 @@ class cVideo int getBlank(void); int setBlank(int enable); + /* set video_system */ + int SetVideoSystem(int video_system, bool remember = true); + int GetVideoSystem(); + /* change video play state. Parameters are all unused. */ int Start(void *PcrChannel = NULL, unsigned short PcrPid = 0, unsigned short VideoPid = 0, void *x = NULL); int Stop(bool blank = true);