Update of /cvsroot/mplayerplug-in/mplayerplug-in/Source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16860/Source
Modified Files:
plugin-list.cpp plugin-setup.cpp plugin-support.cpp
plugin-threads.cpp plugin-ui.cpp plugin.cpp
Log Message:
More GTK1 cleanups
Index: plugin-ui.cpp
===================================================================
RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-ui.cpp,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -d -r1.95 -r1.96
*** plugin-ui.cpp 13 Aug 2004 18:51:52 -0000 1.95
--- plugin-ui.cpp 17 Sep 2004 15:13:16 -0000 1.96
***************
*** 1041,1045 ****
return FALSE;
if (instance->status != NULL && instance->lastmessage != NULL)
! gtk_label_set_text(instance->status, instance->lastmessage);
return FALSE;
}
--- 1041,1045 ----
return FALSE;
if (instance->status != NULL && instance->lastmessage != NULL)
! gtk_label_set_text(instance->status, instance->lastmessage); //GTK_LABEL
return FALSE;
}
Index: plugin-support.cpp
===================================================================
RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-support.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** plugin-support.cpp 5 Sep 2004 13:52:18 -0000 1.49
--- plugin-support.cpp 17 Sep 2004 15:13:16 -0000 1.50
***************
*** 240,244 ****
hostname2 = getURLHostname(buffer2);
! if (hostname1 != NULL && hostname2 != NULL && strstr(hostname2, hostname1) == NULL) {
// hostname1 is a not substring of hostname2
ret = -1;
--- 240,245 ----
hostname2 = getURLHostname(buffer2);
! if (hostname1 != NULL && hostname2 != NULL
! && strstr(hostname2, hostname1) == NULL) {
// hostname1 is a not substring of hostname2
ret = -1;
***************
*** 401,407 ****
--- 402,410 ----
}
+
if (instance->player == NULL) {
instance->pid = 0;
} else {
+ /*
fclose(instance->player);
instance->player = NULL;
***************
*** 411,415 ****
instance->control = -1;
}
!
}
--- 414,418 ----
instance->control = -1;
}
! */
}
***************
*** 448,459 ****
#endif
- #ifdef GTK_ENABLED
- while (g_idle_remove_by_data(instance)) {
- if (DEBUG) {
- printf("removing function from idle handler\n");
- }
- }
- #endif
-
if (instance->threadsetup == 1) {
count = 0;
--- 451,454 ----
Index: plugin-setup.cpp
===================================================================
RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-setup.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** plugin-setup.cpp 14 Sep 2004 21:01:40 -0000 1.38
--- plugin-setup.cpp 17 Sep 2004 15:13:16 -0000 1.39
***************
*** 214,218 ****
"audio/x-realaudio:ra:RealAudio;", sizeof(MimeTypes));
}
!
if (enable_real == 0 && enable_qt == 1) {
strlcat(MimeTypes,
--- 214,218 ----
"audio/x-realaudio:ra:RealAudio;", sizeof(MimeTypes));
}
!
if (enable_real == 0 && enable_qt == 1) {
strlcat(MimeTypes,
***************
*** 235,246 ****
"video/mp4:mp4:MPEG 4 Video;", sizeof(MimeTypes));
}
!
if (enable_ogg == 1) {
strlcat(MimeTypes,
! "application/x-ogg:ogg:Ogg Vorbis Media;"
"audio/ogg:ogg:Ogg Vorbis Audio;"
! "application/ogg:ogg:Ogg Vorbis / Ogg Theora;", sizeof(MimeTypes));
}
-
// FLI
strlcat(MimeTypes,
--- 235,246 ----
"video/mp4:mp4:MPEG 4 Video;", sizeof(MimeTypes));
}
!
if (enable_ogg == 1) {
strlcat(MimeTypes,
! "application/x-ogg:ogg:Ogg Vorbis Media;"
"audio/ogg:ogg:Ogg Vorbis Audio;"
! "application/ogg:ogg:Ogg Vorbis / Ogg Theora;",
! sizeof(MimeTypes));
}
// FLI
strlcat(MimeTypes,
***************
*** 358,362 ****
PACKAGE_VERSION
"<br><br>Video Player Plug-in for QuickTime, RealPlayer and Windows Media Player streams using <a href=\"http://mplayerhq.hu\">MPlayer</a> <br>JavaScript Enabled and Using GTK2 Widgets<br>";
! #endif
#ifdef GTK1_ENABLED
*((const char **) value) =
--- 358,362 ----
PACKAGE_VERSION
"<br><br>Video Player Plug-in for QuickTime, RealPlayer and Windows Media Player streams using <a href=\"http://mplayerhq.hu\">MPlayer</a> <br>JavaScript Enabled and Using GTK2 Widgets<br>";
! #endif
#ifdef GTK1_ENABLED
*((const char **) value) =
***************
*** 364,368 ****
PACKAGE_VERSION
"<br><br>Video Player Plug-in for QuickTime, RealPlayer and Windows Media Player streams using <a href=\"http://mplayerhq.hu\">MPlayer</a> <br>JavaScript Enabled and Using GTK1 Widgets<br>";
! #endif
#ifdef X_ENABLED
*((const char **) value) =
--- 364,368 ----
PACKAGE_VERSION
"<br><br>Video Player Plug-in for QuickTime, RealPlayer and Windows Media Player streams using <a href=\"http://mplayerhq.hu\">MPlayer</a> <br>JavaScript Enabled and Using GTK1 Widgets<br>";
! #endif
#ifdef X_ENABLED
*((const char **) value) =
***************
*** 370,374 ****
PACKAGE_VERSION
"<br><br>Video Player Plug-in for QuickTime, RealPlayer and Windows Media Player streams using <a href=\"http://mplayerhq.hu\">MPlayer</a> <br>JavaScript Enabled and Using X Widgets<br>";
! #endif
}
--- 370,374 ----
PACKAGE_VERSION
"<br><br>Video Player Plug-in for QuickTime, RealPlayer and Windows Media Player streams using <a href=\"http://mplayerhq.hu\">MPlayer</a> <br>JavaScript Enabled and Using X Widgets<br>";
! #endif
}
***************
*** 389,399 ****
char *cp;
! if (DEBUG)
! printf ("mimetype: %s\n", parameters->type);
instance->mode = parameters->mode;
instance->mInstance = parameters->instance;
instance->mimetype = strdup(parameters->type);
!
if (parameters->mode == NP_EMBED) {
--- 389,399 ----
char *cp;
! if (DEBUG)
! printf("mimetype: %s\n", parameters->type);
instance->mode = parameters->mode;
instance->mInstance = parameters->instance;
instance->mimetype = strdup(parameters->type);
!
if (parameters->mode == NP_EMBED) {
***************
*** 453,457 ****
}
!
/* handle 'scale' attribute used by QT instance */
if (strncasecmp(parameters->argn[i], "scale", 5) == 0) {
--- 453,457 ----
}
!
/* handle 'scale' attribute used by QT instance */
if (strncasecmp(parameters->argn[i], "scale", 5) == 0) {
***************
*** 496,501 ****
}
! if ((strncasecmp(parameters->argn[i], "showcontrols", 11) == 0)
! || ((strncasecmp(parameters->argn[i], "controls", 8) == 0) && (strstr(instance->mimetype, "quicktime") != NULL))) {
lowercase(parameters->argv[i]);
--- 496,503 ----
}
! if ((strncasecmp(parameters->argn[i], "showcontrols", 11) == 0)
! || ((strncasecmp(parameters->argn[i], "controls", 8) == 0)
! && (strstr(instance->mimetype, "quicktime") !=
! NULL))) {
lowercase(parameters->argv[i]);
***************
*** 532,536 ****
! if ((strncasecmp(parameters->argn[i], "controls", 8) == 0) && (strstr(instance->mimetype, "quicktime") == NULL)) {
lowercase(parameters->argv[i]);
--- 534,539 ----
! if ((strncasecmp(parameters->argn[i], "controls", 8) == 0)
! && (strstr(instance->mimetype, "quicktime") == NULL)) {
lowercase(parameters->argv[i]);
Index: plugin-threads.cpp
===================================================================
RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-threads.cpp,v
retrieving revision 1.117
retrieving revision 1.118
diff -C2 -d -r1.117 -r1.118
*** plugin-threads.cpp 8 Sep 2004 18:54:57 -0000 1.117
--- plugin-threads.cpp 17 Sep 2004 15:13:16 -0000 1.118
***************
*** 118,122 ****
("****WARNING: launching duplicate player thread, js_state = %d\n",
instance->js_state);
! instance->threadlaunched = 0;
}
}
--- 118,122 ----
("****WARNING: launching duplicate player thread, js_state = %d\n",
instance->js_state);
! instance->threadlaunched = 0;
}
}
***************
*** 131,137 ****
if (instance->threadlaunched != 1)
! if (DEBUG)
printf("****Player thread did not launch correctly****\n");
!
pthread_mutex_lock(&(instance->control_mutex));
while (instance->js_state == JS_STATE_INITIALIZING) {
--- 131,137 ----
if (instance->threadlaunched != 1)
! if (DEBUG)
printf("****Player thread did not launch correctly****\n");
!
pthread_mutex_lock(&(instance->control_mutex));
while (instance->js_state == JS_STATE_INITIALIZING) {
***************
*** 227,232 ****
if (DEBUG > 1)
! printf("Entering SetupPlayer\n");
!
#ifdef X_ENABLED
DrawUI(instance->widget, instance, "Loading Media...", 0, -1);
--- 227,232 ----
if (DEBUG > 1)
! printf("Entering SetupPlayer\n");
!
#ifdef X_ENABLED
DrawUI(instance->widget, instance, "Loading Media...", 0, -1);
***************
*** 640,648 ****
pthread_testcancel();
if (local_td->instance->player != NULL) {
!
//if (fgets(buffer, 1024, local_td->instance->player) == NULL) {
! // continue;
//}
!
// fgets is not a pthread cancel point, so we basically have to rewrite fgets
// to make this work better. If we cancel the thread while fgets is waiting for
--- 640,648 ----
pthread_testcancel();
if (local_td->instance->player != NULL) {
!
//if (fgets(buffer, 1024, local_td->instance->player) == NULL) {
! // continue;
//}
!
// fgets is not a pthread cancel point, so we basically have to rewrite fgets
// to make this work better. If we cancel the thread while fgets is waiting for
***************
*** 651,656 ****
i = 0;
do {
! pthread_testcancel();
! c = fgetc(local_td->instance->player);
if (c == EOF) {
buffer[i] = '\0';
--- 651,656 ----
i = 0;
do {
! pthread_testcancel();
! c = fgetc(local_td->instance->player);
if (c == EOF) {
buffer[i] = '\0';
***************
*** 659,673 ****
if (c == 0)
continue;
! buffer[i] = (char)c;
i++;
! if ( i >= 1024 ) {
! buffer[1023] = '\0';
break;
! }
! } while (((unsigned char)c != '\n'));
if (buffer[0] == '\0')
! continue;
else
! buffer[i] = '\0'; // make sure we NULL terminate the string
}
pthread_testcancel();
--- 659,673 ----
if (c == 0)
continue;
! buffer[i] = (char) c;
i++;
! if (i >= 1024) {
! buffer[1023] = '\0';
break;
! }
! } while (((unsigned char) c != '\n'));
if (buffer[0] == '\0')
! continue;
else
! buffer[i] = '\0'; // make sure we NULL terminate the string
}
pthread_testcancel();
***************
*** 1340,1344 ****
local_td->instance->js_state = JS_STATE_PLAYING;
}
!
pthread_mutex_unlock(&(local_td->instance->control_mutex));
pthread_cleanup_pop(0);
--- 1340,1344 ----
local_td->instance->js_state = JS_STATE_PLAYING;
}
!
pthread_mutex_unlock(&(local_td->instance->control_mutex));
pthread_cleanup_pop(0);
***************
*** 1453,1457 ****
if (local_td->argv[argc] != NULL)
free(local_td->argv[argc]);
! local_td->argv[argc++] = NULL;
}
pthread_mutex_unlock(&(local_td->instance->control_mutex));
--- 1453,1457 ----
if (local_td->argv[argc] != NULL)
free(local_td->argv[argc]);
! local_td->argv[argc++] = NULL;
}
pthread_mutex_unlock(&(local_td->instance->control_mutex));
***************
*** 1464,1469 ****
printf("----player thread: normal exit\n");
}
!
!
pthread_exit(0);
--- 1464,1469 ----
printf("----player thread: normal exit\n");
}
!
!
pthread_exit(0);
Index: plugin-list.cpp
===================================================================
RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-list.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** plugin-list.cpp 4 Sep 2004 16:42:16 -0000 1.41
--- plugin-list.cpp 17 Sep 2004 15:13:16 -0000 1.42
***************
*** 234,238 ****
if (URLcmp(n->url, localitem) == 0) {
if (DEBUG)
! printf("found duplicate entry\n%s\n", n->url);
break;
}
--- 234,238 ----
if (URLcmp(n->url, localitem) == 0) {
if (DEBUG)
! printf("found duplicate entry\n%s\n", n->url);
break;
}
***************
*** 462,476 ****
else
videosrc = strchr(videosrc, '\"');
!
if (videosrc == NULL) {
! seqtag = (char *)NULL;
p = NULL;
videotag = NULL;
break;
! }
i = (long) videosrc - (long) buffer_lower;
sscanf(buffer + i, "\"%1023[^\"]\"", url);
if (url == NULL)
! sscanf(buffer + i, "\'%1023[^\']\'", url);
if (DEBUG)
printf("[smil] found url %s\n", url);
--- 462,477 ----
else
videosrc = strchr(videosrc, '\"');
!
if (videosrc == NULL) {
! seqtag = (char *) NULL;
p = NULL;
videotag = NULL;
break;
! }
i = (long) videosrc - (long) buffer_lower;
sscanf(buffer + i, "\"%1023[^\"]\"", url);
if (url == NULL)
! sscanf(buffer + i, "\'%1023[^\']\'",
! url);
if (DEBUG)
printf("[smil] found url %s\n", url);
***************
*** 479,483 ****
found = 1;
} else {
! seqtag = (char *)NULL;
p = NULL;
videotag = NULL;
--- 480,484 ----
found = 1;
} else {
! seqtag = (char *) NULL;
p = NULL;
videotag = NULL;
***************
*** 507,511 ****
p = (char *) seqtag;
} else {
! p = (char *) seqtag + 4; // for the seq block that contains no video or audio tags
}
}
--- 508,512 ----
p = (char *) seqtag;
} else {
! p = (char *) seqtag + 4; // for the seq block that contains no video or audio tags
}
}
Index: plugin.cpp
===================================================================
RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin.cpp,v
retrieving revision 1.134
retrieving revision 1.135
diff -C2 -d -r1.134 -r1.135
*** plugin.cpp 15 Sep 2004 23:48:22 -0000 1.134
--- plugin.cpp 17 Sep 2004 15:13:17 -0000 1.135
***************
*** 315,321 ****
#ifdef GTK_ENABLED
! gdk_flush();
#endif
!
#ifdef GTK2_ENABLED // When disabled probably causes a GTK memory leak, but stops weird crash and warnings
if (controlwindow == 0) {
--- 315,325 ----
#ifdef GTK_ENABLED
! while (g_idle_remove_by_data(this)) {
! if (DEBUG)
! printf("Removing function from idle handler\n");
! }
! // gdk_flush();
#endif
!
#ifdef GTK2_ENABLED // When disabled probably causes a GTK memory leak, but stops weird crash and warnings
if (controlwindow == 0) {
***************
*** 359,366 ****
if (gtkwidget != NULL)
gtk_widget_destroy(gtkwidget);
- //gdk_window_process_all_updates();
}
#endif
if (mimetype != NULL) {
free(mimetype);
--- 363,412 ----
if (gtkwidget != NULL)
gtk_widget_destroy(gtkwidget);
}
#endif
+ #ifdef GTK1_ENABLED // When disabled probably causes a GTK memory leak, but stops weird crash and warnings
+ if (controlwindow == 0) {
+
+ if (image != NULL)
+ gtk_widget_destroy(image);
+
+ if (popup_menu != NULL) {
+ gtk_widget_destroy(GTK_WIDGET(menuitem_play));
+ gtk_widget_destroy(GTK_WIDGET(menuitem_pause));
+ gtk_widget_destroy(GTK_WIDGET(menuitem_stop));
+ gtk_widget_destroy(GTK_WIDGET(menuitem_sep1));
+ gtk_widget_destroy(GTK_WIDGET(menuitem_sep2));
+ gtk_widget_destroy(GTK_WIDGET(menuitem_showcontrols));
+ gtk_widget_destroy(GTK_WIDGET(menuitem_fullscreen));
+ gtk_widget_destroy(GTK_WIDGET(menuitem_copy));
+ gtk_widget_destroy(GTK_WIDGET(menuitem_save));
+ gtk_widget_destroy(GTK_WIDGET(popup_menu));
+ }
+
+ }
+ #endif
+
+ #ifdef GTK_ENABLED
+ image = NULL;
+ progress_bar = NULL;
+ mediaprogress_bar = NULL;
+ status = NULL;
+ play_event_box = NULL;
+ pause_event_box = NULL;
+ stop_event_box = NULL;
+ ff_event_box = NULL;
+ rew_event_box = NULL;
+ fs_event_box = NULL;
+ gtkwidget = NULL;
+ fixed_container = NULL;
+ drawing_area = NULL;
+ popup_menu = NULL;
+ #ifdef GTK2_ENABLED
+ fs_window = NULL;
+ #endif
+ gtkwidget = NULL;
+ #endif
+
if (mimetype != NULL) {
free(mimetype);
***************
*** 480,484 ****
#endif
#ifdef GTK1_ENABLED
! GtkStyle *s;
#endif
--- 526,530 ----
#endif
#ifdef GTK1_ENABLED
! // GtkStyle *s;
#endif
***************
*** 556,560 ****
#ifdef GTK1_ENABLED
! if (DEBUG > 1) printf("setting window size\n");
gtk_widget_set_usize(gtkwidget, aWindow->width, aWindow->height);
--- 602,607 ----
#ifdef GTK1_ENABLED
! if (DEBUG > 1)
! printf("setting window size\n");
gtk_widget_set_usize(gtkwidget, aWindow->width, aWindow->height);
***************
*** 658,662 ****
#endif
! if (DEBUG > 1) printf("menus built\n");
fixed_container = gtk_fixed_new();
--- 705,710 ----
#endif
! if (DEBUG > 1)
! printf("menus built\n");
fixed_container = gtk_fixed_new();
***************
*** 675,685 ****
#endif
#ifdef GTK1_ENABLED
! if (DEBUG > 1) printf("> 125 setup\n");
gtk_widget_show(gtkwidget);
! s = gtk_widget_get_style(gtkwidget);
! color.red = s->bg[GTK_STATE_NORMAL].red;
! color.green = s->bg[GTK_STATE_NORMAL].green;
! color.blue = s->bg[GTK_STATE_NORMAL].blue;
! gdk_flush();
logo = gdk_pixmap_create_from_xpm_d(gtkwidget->window,
NULL, NULL, logo_xpm);
--- 723,734 ----
#endif
#ifdef GTK1_ENABLED
! if (DEBUG > 1)
! printf("> 125 setup\n");
gtk_widget_show(gtkwidget);
! // s = gtk_widget_get_style(gtkwidget);
! // color.red = s->bg[GTK_STATE_NORMAL].red;
! // color.green = s->bg[GTK_STATE_NORMAL].green;
! // color.blue = s->bg[GTK_STATE_NORMAL].blue;
! // gdk_flush();
logo = gdk_pixmap_create_from_xpm_d(gtkwidget->window,
NULL, NULL, logo_xpm);
***************
*** 716,720 ****
#endif
#ifdef GTK1_ENABLED
! if (DEBUG > 1) printf("< 125 setup\n");
gtk_widget_set_usize(GTK_WIDGET(progress_bar),
aWindow->width - 20, 15);
--- 765,770 ----
#endif
#ifdef GTK1_ENABLED
! if (DEBUG > 1)
! printf("< 125 setup\n");
gtk_widget_set_usize(GTK_WIDGET(progress_bar),
aWindow->width - 20, 15);
***************
*** 733,745 ****
gdk_flush();
InitPixbufs(this);
! if (DEBUG > 1) printf("all setup and ready to reparent and map\n");
XReparentWindow(GDK_WINDOW_XDISPLAY(gtkwidget->window),
GDK_WINDOW_XWINDOW(gtkwidget->window), window, 0,
0);
! // XMapWindow(GDK_WINDOW_XDISPLAY(gtkwidget->window),
! // GDK_WINDOW_XWINDOW(gtkwidget->window));
gtk_widget_map(gtkwidget);
! if (DEBUG > 1) printf("reparent and map done\n");
#endif
--- 783,797 ----
gdk_flush();
InitPixbufs(this);
! if (DEBUG > 1)
! printf("all setup and ready to reparent and map\n");
XReparentWindow(GDK_WINDOW_XDISPLAY(gtkwidget->window),
GDK_WINDOW_XWINDOW(gtkwidget->window), window, 0,
0);
! // XMapWindow(GDK_WINDOW_XDISPLAY(gtkwidget->window),
! // GDK_WINDOW_XWINDOW(gtkwidget->window));
gtk_widget_map(gtkwidget);
! if (DEBUG > 1)
! printf("reparent and map done\n");
#endif
***************
*** 790,809 ****
aWindow->height);
! if (status != NULL) {
! gtk_widget_show(GTK_WIDGET(status));
#ifdef GTK2_ENABLED
! gtk_widget_set_size_request(GTK_WIDGET(status),
! aWindow->width - 20, aWindow->height - 25);
#endif
#ifdef GTK1_ENABLED
! gtk_widget_set_usize(GTK_WIDGET(status),
aWindow->width - 20, aWindow->height - 25);
#endif
}
-
#ifdef GTK_ENABLED
if (gtkwidget == NULL)
! return NPERR_NO_ERROR;
!
gtk_widget_show(gtkwidget);
XResizeWindow(GDK_WINDOW_XDISPLAY(gtkwidget->window),
--- 842,861 ----
aWindow->height);
! if (status != NULL) {
! gtk_widget_show(GTK_WIDGET(status));
#ifdef GTK2_ENABLED
! gtk_widget_set_size_request(GTK_WIDGET(status),
! aWindow->width - 20,
! aWindow->height - 25);
#endif
#ifdef GTK1_ENABLED
! gtk_widget_set_usize(GTK_WIDGET(status),
aWindow->width - 20, aWindow->height - 25);
#endif
}
#ifdef GTK_ENABLED
if (gtkwidget == NULL)
! return NPERR_NO_ERROR;
!
gtk_widget_show(gtkwidget);
XResizeWindow(GDK_WINDOW_XDISPLAY(gtkwidget->window),
***************
*** 812,817 ****
XResizeWindow(display, window, aWindow->width, aWindow->height);
! if (DEBUG > 1) printf("resize is complete\n");
!
if (panel_drawn == 1 && mode == NP_FULL) {
if (panel_height >= 32) {
--- 864,870 ----
XResizeWindow(display, window, aWindow->width, aWindow->height);
! if (DEBUG > 1)
! printf("resize is complete\n");
!
if (panel_drawn == 1 && mode == NP_FULL) {
if (panel_height >= 32) {
***************
*** 1323,1327 ****
}
if (status != NULL) {
! if (state < STATE_PLAYING) {
gtk_label_set_text(status, message);
gtk_widget_show(GTK_WIDGET(status));
--- 1376,1380 ----
}
if (status != NULL) {
! if (state < STATE_PLAYING) {
gtk_label_set_text(status, message);
gtk_widget_show(GTK_WIDGET(status));
***************
*** 1460,1464 ****
if (js_state == JS_STATE_UNDEFINED) {
//reset the playlist
! if (DEBUG > 1)
printf("Play: resetting playlist\n");
--- 1513,1517 ----
if (js_state == JS_STATE_UNDEFINED) {
//reset the playlist
! if (DEBUG > 1)
printf("Play: resetting playlist\n");
***************
*** 1474,1478 ****
if (threadsetup == 0 && controlwindow == 0) {
! if (DEBUG > 1)
printf("Play: setupplayer\n");
state = STATE_GETTING_PLAYLIST;
--- 1527,1531 ----
if (threadsetup == 0 && controlwindow == 0) {
! if (DEBUG > 1)
printf("Play: setupplayer\n");
state = STATE_GETTING_PLAYLIST;
***************
*** 1483,1487 ****
if (threadsignaled == 1 && js_state == JS_STATE_UNDEFINED) {
! if (DEBUG > 1)
printf("Play: launching thread\n");
state = STATE_NEWINSTANCE;
--- 1536,1540 ----
if (threadsignaled == 1 && js_state == JS_STATE_UNDEFINED) {
! if (DEBUG > 1)
printf("Play: launching thread\n");
state = STATE_NEWINSTANCE;
***************
*** 1491,1495 ****
usleep(1);
//signal player thread
! if (DEBUG > 1)
printf("Play: signaling thread after launch\n");
signalPlayerThread(this);
--- 1544,1548 ----
usleep(1);
//signal player thread
! if (DEBUG > 1)
printf("Play: signaling thread after launch\n");
signalPlayerThread(this);
***************
*** 1498,1502 ****
} else if ((autostart == 0) && (threadsignaled == 0)) {
pthread_mutex_unlock(&control_mutex);
! if (DEBUG > 1)
printf("Play: signaling thread without launch\n");
--- 1551,1555 ----
} else if ((autostart == 0) && (threadsignaled == 0)) {
pthread_mutex_unlock(&control_mutex);
! if (DEBUG > 1)
printf("Play: signaling thread without launch\n");
***************
*** 1795,1804 ****
}
! if (DEBUG)
! printf("height = %i and width = %i\n",win_height, win_width);
!
if (win_height == 0 || win_width == 0 || hidden == 1)
! return;
!
if (fullscreen) {
if (value) {
--- 1848,1857 ----
}
! if (DEBUG)
! printf("height = %i and width = %i\n", win_height, win_width);
!
if (win_height == 0 || win_width == 0 || hidden == 1)
! return;
!
if (fullscreen) {
if (value) {
***************
*** 1811,1829 ****
if (DEBUG > 1)
printf("SetFullscreen returning to original size\n");
! #ifdef GTK2_ENABLED
if (fs_window != NULL) {
gtk_window_unfullscreen(GTK_WINDOW(fs_window));
XReparentWindow(GDK_WINDOW_XDISPLAY(gtkwidget->window),
! GDK_WINDOW_XWINDOW(gtkwidget->window), window,
! 0, 0);
gtk_widget_map(gtkwidget);
gtk_widget_destroy(fs_window);
fs_window = NULL;
}
! gtk_window_move(GTK_WINDOW(gtkwidget),0,0);
! gtk_window_resize(GTK_WINDOW(gtkwidget),win_width,win_height);
#endif
! #ifdef GTK1_ENABLED
! XReparentWindow(GDK_WINDOW_XDISPLAY(gtkwidget->window),
GDK_WINDOW_XWINDOW(gtkwidget->window), window,
0, 0);
--- 1864,1883 ----
if (DEBUG > 1)
printf("SetFullscreen returning to original size\n");
! #ifdef GTK2_ENABLED
if (fs_window != NULL) {
gtk_window_unfullscreen(GTK_WINDOW(fs_window));
XReparentWindow(GDK_WINDOW_XDISPLAY(gtkwidget->window),
! GDK_WINDOW_XWINDOW(gtkwidget->window),
! window, 0, 0);
gtk_widget_map(gtkwidget);
gtk_widget_destroy(fs_window);
fs_window = NULL;
}
! gtk_window_move(GTK_WINDOW(gtkwidget), 0, 0);
! gtk_window_resize(GTK_WINDOW(gtkwidget), win_width,
! win_height);
#endif
! #ifdef GTK1_ENABLED
! XReparentWindow(GDK_WINDOW_XDISPLAY(gtkwidget->window),
GDK_WINDOW_XWINDOW(gtkwidget->window), window,
0, 0);
***************
*** 1833,1837 ****
GDK_WINDOW_XWINDOW(gtkwidget->window),
win_width, win_height);
! #endif
if (panel_drawn == 1) {
height = 16;
--- 1887,1891 ----
GDK_WINDOW_XWINDOW(gtkwidget->window),
win_width, win_height);
! #endif
if (panel_drawn == 1) {
height = 16;
***************
*** 1934,1946 ****
#endif
#ifdef GTK1_ENABLED
! style = gtk_rc_style_new();
! style->bg[GTK_STATE_NORMAL] = color;
! style->color_flags[GTK_STATE_NORMAL] =
! (GtkRcFlags) (style->
! color_flags[GTK_STATE_NORMAL] | GTK_RC_BG);
! gtk_widget_modify_style(gtkwidget, style);
! if (drawing_area != NULL)
! gtk_widget_modify_style(drawing_area, style);
! gtk_rc_style_unref(style);
#endif
#endif
--- 1988,2001 ----
#endif
#ifdef GTK1_ENABLED
! // This style block does not seem to work anyway and since color is not set it could crash
! // style = gtk_rc_style_new();
! // style->bg[GTK_STATE_NORMAL] = color;
! // style->color_flags[GTK_STATE_NORMAL] =
! // (GtkRcFlags) (style->
! // color_flags[GTK_STATE_NORMAL] | GTK_RC_BG);
! // gtk_widget_modify_style(gtkwidget, style);
! // if (drawing_area != NULL)
! // gtk_widget_modify_style(drawing_area, style);
! // gtk_rc_style_unref(style);
#endif
#endif
***************
*** 1952,1969 ****
printf("SetFullscreen setting fullscreen\n");
#ifdef GTK_ENABLED
! #ifdef GTK2_ENABLED
fs_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_fullscreen(GTK_WINDOW(fs_window));
gtk_widget_show(fs_window);
! gtk_widget_reparent(gtkwidget,fs_window);
XReparentWindow(GDK_WINDOW_XDISPLAY(gtkwidget->window),
GDK_WINDOW_XWINDOW(gtkwidget->window),
GDK_WINDOW_XWINDOW(fs_window->window), 0, 0);
!
gtk_widget_map(gtkwidget);
gdisp = gdk_display_get_default();
screen = gdk_screen_get_default();
! gdk_screen_get_monitor_geometry (screen, gdk_screen_get_monitor_at_window(screen, gtkwidget->window),
! &rect);
//x = gdk_screen_get_width(screen);
--- 2007,2026 ----
printf("SetFullscreen setting fullscreen\n");
#ifdef GTK_ENABLED
! #ifdef GTK2_ENABLED
fs_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_fullscreen(GTK_WINDOW(fs_window));
gtk_widget_show(fs_window);
! gtk_widget_reparent(gtkwidget, fs_window);
XReparentWindow(GDK_WINDOW_XDISPLAY(gtkwidget->window),
GDK_WINDOW_XWINDOW(gtkwidget->window),
GDK_WINDOW_XWINDOW(fs_window->window), 0, 0);
!
gtk_widget_map(gtkwidget);
gdisp = gdk_display_get_default();
screen = gdk_screen_get_default();
! gdk_screen_get_monitor_geometry(screen,
! gdk_screen_get_monitor_at_window
! (screen, gtkwidget->window),
! &rect);
//x = gdk_screen_get_width(screen);
***************
*** 1972,1976 ****
y = rect.height;
//gtk_window_move(GTK_WINDOW(gtkwidget),rect.x,rect.y);
! gtk_window_resize(GTK_WINDOW(gtkwidget),rect.width,rect.height);
#endif
#ifdef GTK1_ENABLED
--- 2029,2034 ----
y = rect.height;
//gtk_window_move(GTK_WINDOW(gtkwidget),rect.x,rect.y);
! gtk_window_resize(GTK_WINDOW(gtkwidget), rect.width,
! rect.height);
#endif
#ifdef GTK1_ENABLED
***************
*** 2035,2051 ****
disp_y = ((long int) (x * win_height)) / win_width;
disp_x = ((long int) (y * win_width)) / win_height;
! }
}
pos_y = (y - disp_y) / 2;
pos_x = (x - disp_x) / 2;
if (drawing_area != NULL) {
! if ( disp_y <= y ) {
gtk_widget_set_usize(drawing_area, x, disp_y);
gtk_fixed_move(GTK_FIXED(fixed_container),
! GTK_WIDGET(drawing_area), 0, pos_y);
} else {
gtk_widget_set_usize(drawing_area, disp_x, y);
gtk_fixed_move(GTK_FIXED(fixed_container),
! GTK_WIDGET(drawing_area), pos_x, 0);
}
}
--- 2093,2109 ----
disp_y = ((long int) (x * win_height)) / win_width;
disp_x = ((long int) (y * win_width)) / win_height;
! }
}
pos_y = (y - disp_y) / 2;
pos_x = (x - disp_x) / 2;
if (drawing_area != NULL) {
! if (disp_y <= y) {
gtk_widget_set_usize(drawing_area, x, disp_y);
gtk_fixed_move(GTK_FIXED(fixed_container),
! GTK_WIDGET(drawing_area), 0, pos_y);
} else {
gtk_widget_set_usize(drawing_area, disp_x, y);
gtk_fixed_move(GTK_FIXED(fixed_container),
! GTK_WIDGET(drawing_area), pos_x, 0);
}
}
|