Permalink
Browse files

Merge branch 'master' into pulseaudio

  • Loading branch information...
2 parents 02da302 + faa608b commit b2bbaf0f2663f8d224cf64f12035ef1df95a5880 @swick swick committed Jun 15, 2012
Showing with 4 additions and 2 deletions.
  1. +2 −0 CMakeLists.txt
  2. +1 −0 src/glc/capture/audio_capture.c
  3. +1 −2 src/play.c
View
@@ -6,6 +6,8 @@ PROJECT(glc)
SET(GLC_SOVER 0)
SET(GLC_VER 0.5.8)
+SET(CMAKE_C_FLAGS "-Wall")
+
IF (NOT CMAKE_BUILD_TYPE)
SET(CMAKE_BUILD_TYPE "Release")
ENDIF (NOT CMAKE_BUILD_TYPE)
@@ -103,6 +103,7 @@ int audio_capture_set_format(audio_capture_t audio_capture,
audio_capture->format = format;
audio_capture->flags |= AUDIO_CAPTURE_CFG_CHANGED;
}
+ return 0;
}
int audio_capture_set_rate(audio_capture_t audio_capture,
View
@@ -82,7 +82,7 @@ int main(int argc, char *argv[])
struct play_s play;
play.action = action_play;
const char *val_str = NULL;
- int opt, option_index;
+ int opt;
struct option long_options[] = {
{"info", 1, NULL, 'i'},
@@ -105,7 +105,6 @@ int main(int argc, char *argv[])
{"version", 0, NULL, 'V'},
{0, 0, 0, 0}
};
- option_index = 0;
play.fps = 0;

0 comments on commit b2bbaf0

Please sign in to comment.