[Mplayerplug-in-cvs] mplayerplug-in/Source plugin-setup.cpp,1.63,1.64 plugin-threads.cpp,1.143,1.144 plugin.cpp,1.187,1.188 plugin.h,1.62,1.63

[Kevin DeKorte <kdekorte@us...>]

Update of /cvsroot/mplayerplug-in/mplayerplug-in/Source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22183/Source

Modified Files:
	plugin-setup.cpp plugin-threads.cpp plugin.cpp plugin.h 
Log Message:
	Added options nomouseinput and noconsolecontrols to config file to disable (set to 0) or enable (set to 1 [default])


Index: plugin.h
===================================================================
RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin.h,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** plugin.h	19 Mar 2005 15:31:12 -0000	1.62
--- plugin.h	7 Jun 2005 15:11:34 -0000	1.63
***************
*** 177,180 ****
--- 177,182 ----
      int hidden;
      int black_background;
+     int nomouseinput;
+     int noconsolecontrols;
      
  #ifdef GTK_ENABLED

Index: plugin-setup.cpp
===================================================================
RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-setup.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** plugin-setup.cpp	6 May 2005 22:38:17 -0000	1.63
--- plugin-setup.cpp	7 Jun 2005 15:11:33 -0000	1.64
***************
*** 943,946 ****
--- 943,964 ----
  	    }
  
+ 	    if (strncasecmp(buffer, "nomouseinput", 12) == 0) {
+ 		snprintf(parse, 1000, "%s", strtok(buffer, "="));
+ 		snprintf(parse, 1000, "%s", strtok(NULL, "="));
+ 		sscanf(parse, "%i", &instance->nomouseinput);
+ 		if (instance->nomouseinput != 0)
+ 		    instance->nomouseinput = 1;
+ 		continue;
+ 	    }
+ 
+ 	    if (strncasecmp(buffer, "noconsolecontrols", 17) == 0) {
+ 		snprintf(parse, 1000, "%s", strtok(buffer, "="));
+ 		snprintf(parse, 1000, "%s", strtok(NULL, "="));
+ 		sscanf(parse, "%i", &instance->noconsolecontrols);
+ 		if (instance->noconsolecontrols != 0)
+ 		    instance->noconsolecontrols = 1;
+ 		continue;
+ 	    }
+ 
  	    if (strncasecmp(buffer, "osdlevel", 8) == 0) {
  		snprintf(parse, 1000, "%s", strtok(buffer, "="));

Index: plugin-threads.cpp
===================================================================
RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-threads.cpp,v
retrieving revision 1.143
retrieving revision 1.144
diff -C2 -d -r1.143 -r1.144
*** plugin-threads.cpp	27 May 2005 23:18:13 -0000	1.143
--- plugin-threads.cpp	7 Jun 2005 15:11:33 -0000	1.144
***************
*** 300,304 ****
  	    NPN_MemFree(filename);
      } else {
! 	if ((instance->nomediacache == 0) && (instance->td->list->bytes > 0)) {
  	    if (strlen(instance->td->list->fname) == 0) {
  		snprintf(instance->td->list->fname, 1024, "%s",
--- 300,305 ----
  	    NPN_MemFree(filename);
      } else {
! 	if ((instance->nomediacache == 0)
! 	    && (instance->td->list->bytes > 0)) {
  	    if (strlen(instance->td->list->fname) == 0) {
  		snprintf(instance->td->list->fname, 1024, "%s",
***************
*** 521,526 ****
      snprintf(buffer, 1024, "-nojoystick");	/* annoying... */
      instance->td->argv[i++] = strdup(buffer);
!     snprintf(buffer, 1024, "-noconsolecontrols");
!     instance->td->argv[i++] = strdup(buffer);
  //    snprintf(buffer, 1024, "-nofs");  /* no full screen */
  //    instance->td->argv[i++] = strdup(buffer);
--- 522,529 ----
      snprintf(buffer, 1024, "-nojoystick");	/* annoying... */
      instance->td->argv[i++] = strdup(buffer);
!     if (instance->noconsolecontrols) {
! 	snprintf(buffer, 1024, "-noconsolecontrols");
! 	instance->td->argv[i++] = strdup(buffer);
!     }
  //    snprintf(buffer, 1024, "-nofs");  /* no full screen */
  //    instance->td->argv[i++] = strdup(buffer);
***************
*** 1081,1085 ****
  	pthread_testcancel();
  	if (strstr(buffer, "nomouseinput") != NULL) {
! 	    *nomouseinput = 1;
  	    tryagain = TRYAGAIN_TRUE;
  	    break;
--- 1084,1088 ----
  	pthread_testcancel();
  	if (strstr(buffer, "nomouseinput") != NULL) {
! 	    *nomouseinput = 0;
  	    tryagain = TRYAGAIN_TRUE;
  	    break;
***************
*** 1409,1413 ****
  
  	usefps = 0;
! 	nomouseinput = 0;
  	maybeplaylist = 0;
  
--- 1412,1416 ----
  
  	usefps = 0;
! 	nomouseinput = local_td->instance->nomouseinput;
  	maybeplaylist = 0;
  
***************
*** 1453,1460 ****
  	    }
  
! 	    if (nomouseinput == 0) {
  		local_td->argv[argc++] = strdup("-nomouseinput");
! 	    } else {
! 		nomouseinput = 1;
  	    }
  
--- 1456,1463 ----
  	    }
  
! 	    if (nomouseinput) {
  		local_td->argv[argc++] = strdup("-nomouseinput");
! //          } else {
! //              nomouseinput = 0;
  	    }
  

Index: plugin.cpp
===================================================================
RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin.cpp,v
retrieving revision 1.187
retrieving revision 1.188
diff -C2 -d -r1.187 -r1.188
*** plugin.cpp	9 May 2005 22:36:24 -0000	1.187
--- plugin.cpp	7 Jun 2005 15:11:34 -0000	1.188
***************
*** 204,207 ****
--- 204,209 ----
      DPMSEnabled = 0;
      black_background = 0;
+     nomouseinput = 1;
+     noconsolecontrols = 1;
  
  #ifdef GTK_ENABLED

[Mplayerplug-in-cvs] mplayerplug-in ChangeLog,1.237,1.238

[Kevin DeKorte <kdekorte@us...>]

Update of /cvsroot/mplayerplug-in/mplayerplug-in
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22183

Modified Files:
	ChangeLog 
Log Message:
	Added options nomouseinput and noconsolecontrols to config file to disable (set to 0) or enable (set to 1 [default])


Index: ChangeLog
===================================================================
RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/ChangeLog,v
retrieving revision 1.237
retrieving revision 1.238
diff -C2 -d -r1.237 -r1.238
*** ChangeLog	27 May 2005 23:18:12 -0000	1.237
--- ChangeLog	7 Jun 2005 15:11:33 -0000	1.238
***************
*** 21,24 ****
--- 21,25 ----
  	Spanish translation by Azael Avalos
  	getTime and getPercent patches from anonymous
+ 	Added options nomouseinput and noconsolecontrols to config file to disable (set to 0) or enable (set to 1 [default])
  2.80
  	Fix DPMS value on quit