sinek/src keys.c,1.43,1.44
[email protected] Wed, 15 Jan 2003 23:26:07 -0800
| Newsgroups | gmane.comp.video.sinek.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/sinek/sinek/src
In directory sc8-pr-cvs1:/tmp/cvs-serv12111
Modified Files:
keys.c
Log Message:
gtkxine changes
Index: keys.c
===================================================================
RCS file: /cvsroot/sinek/sinek/src/keys.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- keys.c 3 Jan 2003 09:42:19 -0000 1.43
+++ keys.c 16 Jan 2003 07:26:05 -0000 1.44
@@ -9,6 +9,7 @@
*/
#include "common.h"
+#include "gtkxine.h"
#include <gdk/gdkkeysyms.h>
@@ -693,7 +694,6 @@
void execute_cmd(cmd_type cmd)
{
- xine_event_t xinev;
int tmp;
switch(cmd)
@@ -704,27 +704,32 @@
case CMD_QUIT:
sinek.playing = 0;
scrsaver_enable();
- sinek_delete(media);
+ gtk_widget_destroy(sinek.xine);
gtk_main_quit();
break;
case CMD_PLAY:
scrsaver_disable();
- sinek_play(media);
+ if (gtk_xine_get_status(GTK_XINE(sinek.xine)) != GTK_XINE_STATUS_PLAYING) {
+ gtk_xine_load(GTK_XINE(sinek.xine), sinek.mrl);
+ gtk_xine_play(GTK_XINE(sinek.xine));
+ }
+ else
+ gtk_xine_set_speed(GTK_XINE(sinek.xine), GTK_XINE_PLAYBACK_SPEED_NORMAL);
sinek.pause = 0;
break;
case CMD_PAUSE:
if(sinek.pause)
- xine_set_param(sinek.stream, XINE_PARAM_SPEED, XINE_SPEED_NORMAL);
+ gtk_xine_set_speed(GTK_XINE(sinek.xine), GTK_XINE_PLAYBACK_SPEED_NORMAL);
else
- xine_set_param(sinek.stream, XINE_PARAM_SPEED, XINE_SPEED_PAUSE);
+ gtk_xine_set_speed(GTK_XINE(sinek.xine), GTK_XINE_PLAYBACK_SPEED_PAUSE);
sinek.pause = ~sinek.pause;
break;
case CMD_STOP:
sinek.playing = 0;
- sinek_stop(media);
+ gtk_xine_stop(GTK_XINE(sinek.xine));
scrsaver_enable();
break;
@@ -737,35 +742,33 @@
break;
case CMD_VOLUME_UP:
- audio_slide_volume(1);
+ control_volume(gtk_xine_adjust_volume(GTK_XINE(sinek.xine), 1));
break;
case CMD_VOLUME_DOWN:
- audio_slide_volume(-1);
+ control_volume(gtk_xine_adjust_volume(GTK_XINE(sinek.xine), -1));
break;
case CMD_SPEED_FAST:
- tmp = xine_get_param(sinek.stream, XINE_PARAM_SPEED);
- if(tmp != XINE_SPEED_PAUSE && tmp < XINE_SPEED_FAST_4)
- xine_set_param(sinek.stream, XINE_PARAM_SPEED, tmp * 2);
+ tmp = gtk_xine_get_speed(GTK_XINE(sinek.xine));
+ if(tmp != GTK_XINE_PLAYBACK_SPEED_PAUSE && tmp < GTK_XINE_PLAYBACK_SPEED_FOUR_FAST)
+ gtk_xine_set_speed(GTK_XINE(sinek.xine), tmp * 2);
break;
case CMD_SPEED_SLOW:
- tmp = xine_get_param(sinek.stream, XINE_PARAM_SPEED);
- if(tmp > XINE_SPEED_SLOW_4)
- xine_set_param(sinek.stream, XINE_PARAM_SPEED, tmp / 2);
+ tmp = gtk_xine_get_speed(GTK_XINE(sinek.xine));
+ if(tmp > GTK_XINE_PLAYBACK_SPEED_QUARTER_SLOW)
+ gtk_xine_set_speed(GTK_XINE(sinek.xine), tmp / 2);
break;
case CMD_AV_OFFSET_DOWN:
- tmp = xine_get_param(sinek.stream, XINE_PARAM_AV_OFFSET);
- tmp = tmp - 3600;
- xine_set_param(sinek.stream, XINE_PARAM_AV_OFFSET, tmp);
+ tmp = gtk_xine_get_av_offset(GTK_XINE(sinek.xine));
+ gtk_xine_set_av_offset(GTK_XINE(sinek.xine), tmp - 3600);
break;
case CMD_AV_OFFSET_UP:
- tmp = xine_get_param(sinek.stream, XINE_PARAM_AV_OFFSET);
- tmp = tmp + 3600;
- xine_set_param(sinek.stream, XINE_PARAM_AV_OFFSET, tmp);
+ tmp = gtk_xine_get_av_offset(GTK_XINE(sinek.xine));
+ gtk_xine_set_av_offset(GTK_XINE(sinek.xine), tmp + 3600);
break;
case CMD_SHOW_ABOUT:
@@ -806,24 +809,24 @@
case CMD_TOGGLE_FULLSCREEN:
if(sinek.video_mode == VIDEO_FULLSCREEN)
- video_set_mode(VIDEO_WINDOW);
+ gtk_xine_set_fullscreen(GTK_XINE(sinek.xine), 0);
else
- video_set_mode(VIDEO_FULLSCREEN);
+ gtk_xine_set_fullscreen(GTK_XINE(sinek.xine), 1);
break;
case CMD_TOGGLE_ASPECT:
- tmp = xine_get_param(sinek.stream, XINE_PARAM_VO_ASPECT_RATIO);
- xine_set_param(sinek.stream, XINE_PARAM_VO_ASPECT_RATIO, tmp + 1);
+ tmp = gtk_xine_get_aspect_ratio(GTK_XINE(sinek.xine));
+ gtk_xine_set_aspect_ratio(GTK_XINE(sinek.xine), tmp + 1);
break;
case CMD_TOGGLE_INTERLEAVE:
- tmp = xine_get_param(sinek.stream, XINE_PARAM_VO_DEINTERLACE);
- xine_set_param(sinek.stream, XINE_PARAM_VO_DEINTERLACE, 1 - tmp);
+ tmp = gtk_xine_get_deinterlace(GTK_XINE(sinek.xine));
+ gtk_xine_set_deinterlace(GTK_XINE(sinek.xine), 1 - tmp);
break;
case CMD_TOGGLE_TVMODE:
- tmp = xine_get_param(sinek.stream, XINE_PARAM_VO_TVMODE);
- xine_set_param(sinek.stream, XINE_PARAM_VO_TVMODE, tmp);
+ tmp = gtk_xine_get_tvmode(GTK_XINE(sinek.xine));
+ gtk_xine_set_tvmode(GTK_XINE(sinek.xine), tmp);
break;
case CMD_TOGGLE_SUBTITLES:
@@ -846,39 +849,30 @@
sinek.signal_fake = 1;
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(sinek.repeat_all_chk), sinek.repeat_all);
sinek.signal_fake = 0;
- {
- xine_cfg_entry_t e;
- xine_config_lookup_entry(sinek.xine, "sinek.repeat_all", &e);
- e.num_value = sinek.repeat_all;
- xine_config_update_entry(sinek.xine, &e);
- }
+ gtk_xine_config_set(GTK_XINE(sinek.xine), "sinek.repeat_all", (void *) sinek.repeat_all);
break;
case CMD_TOGGLE_MUTE:
- audio_toggle_mute();
+ sinek.mute = gtk_xine_set_mute(GTK_XINE(sinek.xine), ~sinek.mute);
sinek.signal_fake = 1;
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(sinek.mute_tog), sinek.mute);
sinek.signal_fake = 0;
break;
case CMD_SPU_NEXT:
- tmp = xine_get_param(sinek.stream, XINE_PARAM_SPU_CHANNEL);
- xine_set_param(sinek.stream, XINE_PARAM_SPU_CHANNEL, tmp + 1);
+ gtk_xine_set_spu_channel(GTK_XINE(sinek.xine), gtk_xine_get_spu_channel(GTK_XINE(sinek.xine)) + 1);
break;
case CMD_SPU_PREVIOUS:
- tmp = xine_get_param(sinek.stream, XINE_PARAM_SPU_CHANNEL);
- xine_set_param(sinek.stream, XINE_PARAM_SPU_CHANNEL, tmp - 1);
+ gtk_xine_set_spu_channel(GTK_XINE(sinek.xine), gtk_xine_get_spu_channel(GTK_XINE(sinek.xine)) - 1);
break;
case CMD_AUDIO_NEXT:
- tmp = xine_get_param(sinek.stream, XINE_PARAM_AUDIO_CHANNEL_LOGICAL);
- xine_set_param(sinek.stream, XINE_PARAM_AUDIO_CHANNEL_LOGICAL, tmp + 1);
+ gtk_xine_set_audio_channel(GTK_XINE(sinek.xine), gtk_xine_get_audio_channel(GTK_XINE(sinek.xine)) + 1);
break;
case CMD_AUDIO_PREVIOUS:
- tmp = xine_get_param(sinek.stream, XINE_PARAM_AUDIO_CHANNEL_LOGICAL);
- xine_set_param(sinek.stream, XINE_PARAM_AUDIO_CHANNEL_LOGICAL, tmp - 1);
+ gtk_xine_set_audio_channel(GTK_XINE(sinek.xine), gtk_xine_get_audio_channel(GTK_XINE(sinek.xine)) - 1);
break;
case CMD_ZOOM_IN:
@@ -894,21 +888,21 @@
break;
case CMD_WINDOW_1x1:
- video_set_mode(VIDEO_WINDOW);
+ gtk_xine_set_fullscreen(GTK_XINE(sinek.xine), 0);
video_scale_abs(1);
break;
case CMD_WINDOW_2x2:
- video_set_mode(VIDEO_WINDOW);
+ gtk_xine_set_fullscreen(GTK_XINE(sinek.xine), 0);
video_scale_abs(2);
break;
case CMD_WINDOW_FULLSCREEN:
- video_set_mode(VIDEO_FULLSCREEN);
+ gtk_xine_set_fullscreen(GTK_XINE(sinek.xine), 1);
break;
case CMD_WINDOW_BACKGROUND:
- video_set_mode(VIDEO_BACKGROUND);
+ gtk_widget_hide(sinek.videowin);
break;
case CMD_WINDOW_REDUCE:
@@ -920,63 +914,51 @@
break;
case CMD_EVENT_MENU1:
- xinev.type = XINE_EVENT_INPUT_MENU1;
- xine_event_send(sinek.stream, &xinev);
+ gtk_xine_event_send(GTK_XINE(sinek.xine), GTK_XINE_EVENT_MENU1, NULL);
break;
case CMD_EVENT_MENU2:
- xinev.type = XINE_EVENT_INPUT_MENU2;
- xine_event_send(sinek.stream, &xinev);
+ gtk_xine_event_send(GTK_XINE(sinek.xine), GTK_XINE_EVENT_MENU2, NULL);
break;
case CMD_EVENT_MENU3:
- xinev.type = XINE_EVENT_INPUT_MENU3;
- xine_event_send(sinek.stream, &xinev);
+ gtk_xine_event_send(GTK_XINE(sinek.xine), GTK_XINE_EVENT_MENU3, NULL);
break;
case CMD_EVENT_UP:
- xinev.type = XINE_EVENT_INPUT_UP;
- xine_event_send(sinek.stream, &xinev);
+ gtk_xine_event_send(GTK_XINE(sinek.xine), GTK_XINE_EVENT_UP, NULL);
break;
case CMD_EVENT_DOWN:
- xinev.type = XINE_EVENT_INPUT_DOWN;
- xine_event_send(sinek.stream, &xinev);
+ gtk_xine_event_send(GTK_XINE(sinek.xine), GTK_XINE_EVENT_DOWN, NULL);
break;
case CMD_EVENT_LEFT:
- xinev.type = XINE_EVENT_INPUT_LEFT;
- xine_event_send(sinek.stream, &xinev);
+ gtk_xine_event_send(GTK_XINE(sinek.xine), GTK_XINE_EVENT_LEFT, NULL);
break;
case CMD_EVENT_RIGHT:
- xinev.type = XINE_EVENT_INPUT_RIGHT;
- xine_event_send(sinek.stream, &xinev);
+ gtk_xine_event_send(GTK_XINE(sinek.xine), GTK_XINE_EVENT_RIGHT, NULL);
break;
case CMD_EVENT_NEXT:
- xinev.type = XINE_EVENT_INPUT_NEXT;
- xine_event_send(sinek.stream, &xinev);
+ gtk_xine_event_send(GTK_XINE(sinek.xine), GTK_XINE_EVENT_NEXT, NULL);
break;
case CMD_EVENT_PRIOR:
- xinev.type = XINE_EVENT_INPUT_PREVIOUS;
- xine_event_send(sinek.stream, &xinev);
+ gtk_xine_event_send(GTK_XINE(sinek.xine), GTK_XINE_EVENT_PREVIOUS, NULL);
break;
case CMD_EVENT_ANGLE_NEXT:
- xinev.type = XINE_EVENT_INPUT_ANGLE_NEXT;
- xine_event_send(sinek.stream, &xinev);
+ gtk_xine_event_send(GTK_XINE(sinek.xine), GTK_XINE_EVENT_ANGLE_NEXT, NULL);
break;
case CMD_EVENT_ANGLE_PRIOR:
- xinev.type = XINE_EVENT_INPUT_ANGLE_PREVIOUS;
- xine_event_send(sinek.stream, &xinev);
+ gtk_xine_event_send(GTK_XINE(sinek.xine), GTK_XINE_EVENT_ANGLE_PREVIOUS, NULL);
break;
case CMD_EVENT_SELECT:
- xinev.type = XINE_EVENT_INPUT_SELECT;
- xine_event_send(sinek.stream, &xinev);
+ gtk_xine_event_send(GTK_XINE(sinek.xine), GTK_XINE_EVENT_SELECT, NULL);
break;
case CMD_GOTO_MARK_0:
@@ -990,11 +972,7 @@
case CMD_GOTO_MARK_8:
case CMD_GOTO_MARK_9:
video_seek(sinek.marks[cmd - CMD_GOTO_MARK_0]);
- {
- int x, y, cur;
- xine_get_pos_length(sinek.stream, &x, &cur, &y);
- sinek.marks[0] = cur;
- }
+ sinek.marks[0] = gtk_xine_get_stream_length(GTK_XINE(sinek.xine));
break;
case CMD_SET_MARK_1:
@@ -1006,11 +984,7 @@
case CMD_SET_MARK_7:
case CMD_SET_MARK_8:
case CMD_SET_MARK_9:
- {
- int x, y, cur;
- xine_get_pos_length(sinek.stream, &x, &cur, &y);
- sinek.marks[cmd - CMD_SET_MARK_1 + 1] = cur;
- }
+ sinek.marks[cmd - CMD_SET_MARK_1 + 1] = gtk_xine_get_stream_length(GTK_XINE(sinek.xine));
break;
}
}
-------------------------------------------------------
This SF.NET email is sponsored by: A Thawte Code Signing Certificate
is essential in establishing user confidence by providing assurance of
authenticity and code integrity. Download our Free Code Signing guide:
http://ads.sourceforge.net/cgi-bin/redirect.pl?thaw0028en