[Mplayer-cvslog] CVS: main fifo.c,NONE,1.1 codecctrl.c,1.3,1.4

[GEREOFFY]

Update of /cvsroot/mplayer/main
In directory usw-pr-cvs1:/tmp/cvs-serv23518

Modified Files:
	codecctrl.c 
Added Files:
	fifo.c 
Log Message:
common FIFO code moved to fifo.c

--- NEW FILE ---

// keyboard:
static int keyb_fifo_put=-1;
static int keyb_fifo_get=-1;

static void make_pipe(int* pr,int* pw){
  int temp[2];
  if(pipe(temp)!=0) printf("Cannot make PIPE!\n");
  *pr=temp[0];
  *pw=temp[1];
}

static inline int my_write(int fd,unsigned char* mem,int len){
  int total=0;
  int len2;
  while(len>0){
    len2=write(fd,mem+total,len); if(len2<=0) break;
    total+=len2;len-=len2;
//    printf("%d bytes received, %d left\n",len2,len);
  }
  return total;
}

static inline int my_read(int fd,unsigned char* mem,int len){
  int total=0;
  int len2;
  while(len>0){
    len2=read(fd,mem+total,len); if(len2<=0) break;
    total+=len2;len-=len2;
//    printf("%d bytes received, %d left\n",len2,len);
  }
  return total;
}


void send_cmd(int fd,int cmd){
  int fifo_cmd=cmd;
  write(fd,&fifo_cmd,4);
//  fflush(control_fifo);
}


void mplayer_put_key(int code){
           fd_set rfds;
           struct timeval tv;

           /* Watch stdin (fd 0) to see when it has input. */
           FD_ZERO(&rfds);
           FD_SET(keyb_fifo_put, &rfds);
           tv.tv_sec = 0;
           tv.tv_usec = 0;

           //retval = select(keyb_fifo_put+1, &rfds, NULL, NULL, &tv);
           if(select(keyb_fifo_put+1, NULL, &rfds, NULL, &tv)){
             write(keyb_fifo_put,&code,4);
//             printf("*** key event %d sent ***\n",code);
           } else {
//             printf("*** key event dropped (FIFO is full) ***\n");
           }
}

int mplayer_get_key(){
           fd_set rfds;
           struct timeval tv;
           int code=-1;

           /* Watch stdin (fd 0) to see when it has input. */
           FD_ZERO(&rfds);
           FD_SET(keyb_fifo_get, &rfds);
           tv.tv_sec = 0;
           tv.tv_usec = 0;

           //retval = select(keyb_fifo_put+1, &rfds, NULL, NULL, &tv);
           if(select(keyb_fifo_put+1, &rfds, NULL, NULL, &tv)){
             read(keyb_fifo_get,&code,4);
//             printf("*** key event %d read ***\n",code);
           }
           return code;
}


Index: codecctrl.c
===================================================================
RCS file: /cvsroot/mplayer/main/codecctrl.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** codecctrl.c	2001/03/15 19:38:34	1.3
--- codecctrl.c	2001/03/16 00:06:50	1.4
***************
*** 21,27 ****
  static int data_fifo2=-1;
  static int control_fifo2=-1;
- // keyboard:
- static int keyb_fifo_put=-1;
- static int keyb_fifo_get=-1;
  
  
--- 21,24 ----
***************
*** 55,101 ****
  }
  
- 
- static void make_pipe(int* pr,int* pw){
-   int temp[2];
-   if(pipe(temp)!=0) printf("Cannot make PIPE!\n");
-   *pr=temp[0];
-   *pw=temp[1];
- }
- 
- static inline int my_write(int fd,unsigned char* mem,int len){
-   int total=0;
-   int len2;
-   while(len>0){
-     len2=write(fd,mem+total,len); if(len2<=0) break;
-     total+=len2;len-=len2;
- //    printf("%d bytes received, %d left\n",len2,len);
-   }
-   return total;
- }
- 
- static inline int my_read(int fd,unsigned char* mem,int len){
-   int total=0;
-   int len2;
-   while(len>0){
-     len2=read(fd,mem+total,len); if(len2<=0) break;
-     total+=len2;len-=len2;
- //    printf("%d bytes received, %d left\n",len2,len);
-   }
-   return total;
- }
- 
- 
- void send_cmd(int fd,int cmd){
-   int fifo_cmd=cmd;
-   write(fd,&fifo_cmd,4);
- //  fflush(control_fifo);
- }
- 
- static const int frameratecode2framerate[16] = {
-    0, 24000*10000/1001, 24*10000,25*10000, 30000*10000/1001, 30*10000,50*10000,60000*10000/1001,
-   60*10000, 0,0,0,0,0,0,0
- };
- 
- 
  void mpeg_codec_controller(vo_functions_t *video_out){
  //================== CODEC Controller: ==========================
--- 52,55 ----
***************
*** 163,204 ****
      }
      exit(0);
- }
- 
- void mplayer_put_key(int code){
-            fd_set rfds;
-            struct timeval tv;
- 
-            /* Watch stdin (fd 0) to see when it has input. */
-            FD_ZERO(&rfds);
-            FD_SET(keyb_fifo_put, &rfds);
-            tv.tv_sec = 0;
-            tv.tv_usec = 0;
- 
-            //retval = select(keyb_fifo_put+1, &rfds, NULL, NULL, &tv);
-            if(select(keyb_fifo_put+1, NULL, &rfds, NULL, &tv)){
-              write(keyb_fifo_put,&code,4);
- //             printf("*** key event %d sent ***\n",code);
-            } else {
- //             printf("*** key event dropped (FIFO is full) ***\n");
-            }
- }
- 
- int mplayer_get_key(){
-            fd_set rfds;
-            struct timeval tv;
-            int code=-1;
- 
-            /* Watch stdin (fd 0) to see when it has input. */
-            FD_ZERO(&rfds);
-            FD_SET(keyb_fifo_get, &rfds);
-            tv.tv_sec = 0;
-            tv.tv_usec = 0;
- 
-            //retval = select(keyb_fifo_put+1, &rfds, NULL, NULL, &tv);
-            if(select(keyb_fifo_put+1, &rfds, NULL, NULL, &tv)){
-              read(keyb_fifo_get,&code,4);
- //             printf("*** key event %d read ***\n",code);
-            }
-            return code;
  }
  
--- 117,120 ----


_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog