Changeset 06b4737cfb1ad8d5e1bd95c426e33cfb10fefed5

Show
Ignore:
Timestamp:
09/11/03 19:52:29 (5 years ago)
Author:
Jean-Paul Saman <jpsaman@videolan.org>
git-committer:
Jean-Paul Saman <jpsaman@videolan.org> 1068403949 +0000
git-parent:

[9af94c5ad9bf92435142a9c7275e6dd2155649e7]

git-author:
Jean-Paul Saman <jpsaman@videolan.org> 1068403949 +0000
Message:

PDA interface:
* improvements on Camera tabpage

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/gui/pda/pda_callbacks.c

    r21c8b34 r06b4737  
    33 ***************************************************************************** 
    44 * Copyright (C) 2000, 2001 VideoLAN 
    5  * $Id: pda_callbacks.c,v 1.10 2003/11/09 15:55:23 jpsaman Exp $ 
     5 * $Id: pda_callbacks.c,v 1.11 2003/11/09 18:52:29 jpsaman Exp $ 
    66 * 
    77 * Authors: Jean-Paul Saman <jpsaman@wxs.nl> 
    …… 
    4747#include "pda_support.h" 
    4848#include "pda.h" 
     49 
     50#define VLC_MAX_MRL     256 
    4951 
    5052static char* get_file_stat(const char *path, uid_t *uid, gid_t *gid, off_t *size); 
    …… 
    583585    const gchar   *mrlProtocol; 
    584586    gint           mrlPort; 
    585 #define VLC_MAX_MRL     256 
    586587    char           text[VLC_MAX_MRL]; 
    587588    int            pos = 0; 
    …… 
    594595    networkProtocol = (GtkEntry*) lookup_widget( GTK_WIDGET(editable), "entryNetworkProtocolType" ); 
    595596 
    596     mrlNetworkType = gtk_entry_get_text(GTK_ENTRY(networkType)); 
     597    mrlNetworkType = gtk_entry_get_text(GTK_ENTRY(networkType)); 
    597598    mrlAddress     = gtk_entry_get_text(GTK_ENTRY(networkAddress)); 
    598599    mrlPort        = gtk_spin_button_get_value_as_int(networkPort); 
    …… 
    611612 
    612613    gtk_entry_set_text(entryMRL,text); 
    613 #undef VLC_MAX_MRL 
    614614} 
    615615 
    …… 
    754754                                        gpointer         user_data) 
    755755{ 
    756 //    GtkSpinButton *networkPort = NULL; 
    757 //    GtkEntry      *entryMRL = NULL; 
    758  
     756    GtkSpinButton *entryV4LChannel = NULL; 
     757    GtkSpinButton *entryV4LFrequency = NULL; 
     758    GtkSpinButton *entryV4LSampleRate = NULL; 
     759    GtkSpinButton *entryV4LQuality = NULL; 
     760    GtkSpinButton *entryV4LTuner = NULL; 
     761    gint    i_v4l_channel; 
     762    gint    i_v4l_frequency; 
     763    gint    i_v4l_samplerate; 
     764    gint    i_v4l_quality; 
     765    gint    i_v4l_tuner; 
     766 
     767    GtkEntry      *entryV4LVideoDevice = NULL; 
     768    GtkEntry      *entryV4LAudioDevice = NULL; 
     769    GtkEntry      *entryV4LNorm = NULL; 
     770    GtkEntry      *entryV4LSize = NULL; 
     771    GtkEntry      *entryV4LSoundDirection = NULL; 
     772    const gchar   *p_v4l_video_device; 
     773    const gchar   *p_v4l_audio_device; 
     774    const gchar   *p_v4l_norm; 
     775    const gchar   *p_v4l_size; 
     776    const gchar   *p_v4l_sound_direction; 
     777 
     778    /* MJPEG only */ 
     779    GtkCheckButton *checkV4LMJPEG = NULL; 
     780    GtkSpinButton  *entryV4LDecimation = NULL; 
     781    gboolean        b_v4l_mjpeg; 
     782    gint            i_v4l_decimation; 
     783    /* end MJPEG only */ 
     784 
     785    char v4l_mrl[VLC_MAX_MRL]; 
     786    int pos; 
     787 
     788    pos = snprintf( &v4l_mrl[0], VLC_MAX_MRL, "v4l://"); 
     789 
     790    entryV4LChannel    = (GtkSpinButton*) lookup_widget( GTK_WIDGET(editable), "entryV4LChannel" ); 
     791    entryV4LFrequency  = (GtkSpinButton*) lookup_widget( GTK_WIDGET(editable), "entryV4LFrequency" ); 
     792    entryV4LSampleRate = (GtkSpinButton*) lookup_widget( GTK_WIDGET(editable), "entryV4LSampleRate" ); 
     793    entryV4LQuality    = (GtkSpinButton*) lookup_widget( GTK_WIDGET(editable), "entryV4LQuality" ); 
     794    entryV4LTuner      = (GtkSpinButton*) lookup_widget( GTK_WIDGET(editable), "entryV4LTuner" ); 
     795 
     796    entryV4LVideoDevice  = (GtkEntry*) lookup_widget( GTK_WIDGET(editable), "entryV4LVideoDevice" ); 
     797    entryV4LAudioDevice  = (GtkEntry*) lookup_widget( GTK_WIDGET(editable), "entryV4LAudioDevice" ); 
     798    entryV4LNorm  = (GtkEntry*) lookup_widget( GTK_WIDGET(editable), "entryV4LNorm" ); 
     799    entryV4LSize  = (GtkEntry*) lookup_widget( GTK_WIDGET(editable), "entryV4LSize" ); 
     800    entryV4LSoundDirection  = (GtkEntry*) lookup_widget( GTK_WIDGET(editable), "entryV4LSoundDirection" ); 
     801     
     802    i_v4l_channel = gtk_spin_button_get_value_as_int(entryV4LChannel); 
     803    i_v4l_frequency = gtk_spin_button_get_value_as_int(entryV4LFrequency); 
     804    i_v4l_samplerate = gtk_spin_button_get_value_as_int(entryV4LSampleRate); 
     805    i_v4l_quality = gtk_spin_button_get_value_as_int(entryV4LQuality); 
     806    i_v4l_tuner = gtk_spin_button_get_value_as_int(entryV4LTuner); 
     807 
     808    p_v4l_video_device = gtk_entry_get_text(GTK_ENTRY(entryV4LVideoDevice)); 
     809    p_v4l_audio_device = gtk_entry_get_text(GTK_ENTRY(entryV4LAudioDevice)); 
     810    p_v4l_norm = gtk_entry_get_text(GTK_ENTRY(entryV4LNorm)); 
     811    p_v4l_size  = gtk_entry_get_text(GTK_ENTRY(entryV4LSize)); 
     812    p_v4l_sound_direction = gtk_entry_get_text(GTK_ENTRY(entryV4LSoundDirection)); 
     813 
     814    pos += snprintf( &v4l_mrl[pos], VLC_MAX_MRL - pos, ":%s", (char*)p_v4l_video_device ); 
     815    pos += snprintf( &v4l_mrl[pos], VLC_MAX_MRL - pos, ":adev=%s", (char*)p_v4l_audio_device ); 
     816    pos += snprintf( &v4l_mrl[pos], VLC_MAX_MRL - pos, ":norm=%s", (char*)p_v4l_norm ); 
     817    pos += snprintf( &v4l_mrl[pos], VLC_MAX_MRL - pos, ":size=%s", (char*)p_v4l_size ); 
     818    pos += snprintf( &v4l_mrl[pos], VLC_MAX_MRL - pos, ":%s", (char*)p_v4l_sound_direction ); 
     819 
     820    pos += snprintf( &v4l_mrl[pos], VLC_MAX_MRL - pos, ":channel=%d", (int)i_v4l_channel ); 
     821    pos += snprintf( &v4l_mrl[pos], VLC_MAX_MRL - pos, ":frequency=%d", (int)i_v4l_frequency ); 
     822    pos += snprintf( &v4l_mrl[pos], VLC_MAX_MRL - pos, ":samplerate=%d", (int)i_v4l_samplerate ); 
     823    pos += snprintf( &v4l_mrl[pos], VLC_MAX_MRL - pos, ":quality=%d", (int)i_v4l_quality ); 
     824    pos += snprintf( &v4l_mrl[pos], VLC_MAX_MRL - pos, ":tuner=%d", (int)i_v4l_tuner ); 
     825 
     826    /* MJPEG only */ 
     827    checkV4LMJPEG      = (GtkCheckButton*) lookup_widget( GTK_WIDGET(editable), "checkV4LMJPEG" ); 
     828    b_v4l_mjpeg = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(checkV4LMJPEG)); 
     829    if (b_v4l_mjpeg) 
     830    { 
     831        entryV4LDecimation = (GtkSpinButton*) lookup_widget( GTK_WIDGET(editable), "entryV4LDecimation" ); 
     832        i_v4l_decimation = gtk_spin_button_get_value_as_int(entryV4LDecimation); 
     833        pos += snprintf( &v4l_mrl[pos], VLC_MAX_MRL - pos, ":mjpeg:%d", (int)i_v4l_decimation ); 
     834    } 
     835    /* end MJPEG only */ 
     836 
     837    if (pos >= VLC_MAX_MRL) 
     838        v4l_mrl[VLC_MAX_MRL-1]='\0'; 
     839 
     840    g_print( "%s\n", v4l_mrl ); 
    759841} 
    760842