[cheese/three-point-oh] Removed vala specific Mode Enum and reused MediaMode enum from libcheese
- From: Yuvaraj Pandian <yuvipanda src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cheese/three-point-oh] Removed vala specific Mode Enum and reused MediaMode enum from libcheese
- Date: Sun, 6 Jun 2010 19:30:24 +0000 (UTC)
commit 3113baf8c7b9b9f759a7f76f063e3bd24e4d4b78
Author: Yuvaraj Pandian T <yuvipanda gmail com>
Date: Mon Jun 7 01:00:18 2010 +0530
Removed vala specific Mode Enum and reused MediaMode enum from libcheese
valasrc/cheese-window.vala | 20 +++++++-------------
valasrc/vapi/cheese-common.vapi | 2 +-
2 files changed, 8 insertions(+), 14 deletions(-)
---
diff --git a/valasrc/cheese-window.vala b/valasrc/cheese-window.vala
index 1a47fd4..e7ccb63 100644
--- a/valasrc/cheese-window.vala
+++ b/valasrc/cheese-window.vala
@@ -7,15 +7,9 @@ using Eog;
using Gst;
const int FULLSCREEN_TIMEOUT_INTERVAL = 5 * 1000;
-enum MODE {
- PHOTO = 0,
- VIDEO = 1,
- BURST = 2
-}
-
public class Cheese.MainWindow : Gtk.Window {
- private MODE current_mode;
+ private MediaMode current_mode;
private Gtk.Builder builder;
@@ -82,25 +76,25 @@ public class Cheese.MainWindow : Gtk.Window {
[CCode (instance_pos = -1)]
internal void on_mode_change(RadioAction action) {
- set_mode((MODE)action.value);
+ set_mode((MediaMode)action.value);
}
- private void set_mode(MODE mode) {
+ private void set_mode(MediaMode mode) {
this.current_mode = mode;
switch(this.current_mode) {
- case MODE.PHOTO:
+ case MediaMode.PHOTO:
take_photo_action.sensitive = true;
take_video_action.sensitive = false;
take_burst_action.sensitive = false;
take_action_button.related_action = take_photo_action;
break;
- case MODE.VIDEO:
+ case MediaMode.VIDEO:
take_photo_action.sensitive = false;
take_video_action.sensitive = true;
take_burst_action.sensitive = false;
take_action_button.related_action = take_video_action;
break;
- case MODE.BURST:
+ case MediaMode.BURST:
take_photo_action.sensitive = false;
take_video_action.sensitive = false;
take_burst_action.sensitive = true;
@@ -288,7 +282,7 @@ public class Cheese.MainWindow : Gtk.Window {
camera.setup("/dev/video0");
camera.play();
set_wide_mode(false, true);
- set_mode(MODE.PHOTO);
+ set_mode(MediaMode.PHOTO);
this.add(main_vbox);
diff --git a/valasrc/vapi/cheese-common.vapi b/valasrc/vapi/cheese-common.vapi
index 8d0b757..a89395c 100644
--- a/valasrc/vapi/cheese-common.vapi
+++ b/valasrc/vapi/cheese-common.vapi
@@ -148,7 +148,7 @@ namespace Cheese {
DICE,
WARP
}
- [CCode (cprefix = "CHEESE_MEDIA_MODE_", has_type_id = false, cheader_filename = "cheese-gtk.h")]
+ [CCode (cprefix = "CHEESE_MEDIA_MODE_", has_type_id = false, cheader_filename = "cheese-fileutil.h")]
public enum MediaMode {
PHOTO,
VIDEO,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]